projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lttng-sessiond: do not call ustctl_register_done()
[lttng-tools.git]
/
lttng
/
lttng.c
diff --git
a/lttng/lttng.c
b/lttng/lttng.c
index 455b18c58108963ef725a35037418d3ffbf0d338..d0f23579d4af38db63ba9ec2e9f76aaa7155b299 100644
(file)
--- a/
lttng/lttng.c
+++ b/
lttng/lttng.c
@@
-23,6
+23,7
@@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <config.h>
#include <lttng/lttng.h>
#include <lttng/lttng.h>
@@
-71,6
+72,7
@@
static struct cmd_struct commands[] = {
{ "add-context", cmd_add_context},
{ "set-session", cmd_set_session},
{ "version", cmd_version},
{ "add-context", cmd_add_context},
{ "set-session", cmd_set_session},
{ "version", cmd_version},
+ { "calibrate", cmd_calibrate},
{ NULL, NULL} /* Array closure */
};
{ NULL, NULL} /* Array closure */
};
@@
-91,6
+93,7
@@
static void usage(FILE *ofp)
fprintf(ofp, "\n");
fprintf(ofp, "Commands:\n");
fprintf(ofp, " add-context Add context to event or/and channel\n");
fprintf(ofp, "\n");
fprintf(ofp, "Commands:\n");
fprintf(ofp, " add-context Add context to event or/and channel\n");
+ fprintf(ofp, " calibrate Quantify LTTng overhead\n");
fprintf(ofp, " create Create tracing session\n");
fprintf(ofp, " destroy Teardown tracing session\n");
fprintf(ofp, " enable-channel Enable tracing channel\n");
fprintf(ofp, " create Create tracing session\n");
fprintf(ofp, " destroy Teardown tracing session\n");
fprintf(ofp, " enable-channel Enable tracing channel\n");
@@
-284,7
+287,7
@@
static int spawn_sessiond(char *pathname)
* Spawn session daemon and tell
* it to signal us when ready.
*/
* Spawn session daemon and tell
* it to signal us when ready.
*/
- execlp(pathname, "ltt-sessiond", "--sig-parent", "--quiet", NULL);
+ execlp(pathname, "ltt
ng
-sessiond", "--sig-parent", "--quiet", NULL);
/* execlp only returns if error happened */
if (errno == ENOENT) {
ERR("No session daemon found. Use --sessiond-path.");
/* execlp only returns if error happened */
if (errno == ENOENT) {
ERR("No session daemon found. Use --sessiond-path.");
@@
-294,7
+297,7
@@
static int spawn_sessiond(char *pathname)
kill(getppid(), SIGTERM); /* unpause parent */
exit(EXIT_FAILURE);
} else if (pid > 0) {
kill(getppid(), SIGTERM); /* unpause parent */
exit(EXIT_FAILURE);
} else if (pid > 0) {
- /* Wait for ltt-sessiond to start */
+ /* Wait for ltt
ng
-sessiond to start */
pause();
goto end;
} else {
pause();
goto end;
} else {
@@
-336,8
+339,9
@@
static int check_sessiond(void)
/* Let's rock and roll */
if (pathname == NULL) {
/* Let's rock and roll */
if (pathname == NULL) {
- ret = asprintf(&alloc_pathname,
"ltt
-sessiond");
+ ret = asprintf(&alloc_pathname,
INSTALL_BIN_PATH "/lttng
-sessiond");
if (ret < 0) {
if (ret < 0) {
+ perror("asprintf spawn sessiond");
goto end;
}
pathname = alloc_pathname;
goto end;
}
pathname = alloc_pathname;
@@
-376,7
+380,7
@@
static int parse_args(int argc, char **argv)
usage(stderr);
goto error;
case 'v':
usage(stderr);
goto error;
case 'v':
- opt_verbose = 1;
+ opt_verbose
+
= 1;
break;
case 'q':
opt_quiet = 1;
break;
case 'q':
opt_quiet = 1;
@@
-429,7
+433,7
@@
static int parse_args(int argc, char **argv)
if (ret == -1) {
usage(stderr);
} else {
if (ret == -1) {
usage(stderr);
} else {
- ERR("%s", lttng_
get_readable_code
(ret));
+ ERR("%s", lttng_
strerror
(ret));
}
goto error;
}
}
goto error;
}
This page took
0.029968 seconds
and
5
git commands to generate.