X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=0ae2b10968456adc54d4df7f4985458268c4e8f7;hp=94c1c61836f5edd61dc5c4b8784d346875d0284b;hb=8d5841ea483139d3ab2f2b4dd39263dad63832b1;hpb=92360082fd291a95695fb612d773ae1bb991c256 diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c index 94c1c6183..0ae2b1096 100644 --- a/src/bin/lttng/commands/create.c +++ b/src/bin/lttng/commands/create.c @@ -15,7 +15,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE #define _LGPL_SOURCE #include #include @@ -28,6 +27,7 @@ #include #include #include +#include #include @@ -80,80 +80,7 @@ static struct poptOption long_options[] = { * why this declaration exists and used ONLY in for this command. */ extern int _lttng_create_session_ext(const char *name, const char *url, - const char *datetime, int live_timer); - -/* - * usage - */ -static void usage(FILE *ofp) -{ - fprintf(ofp, "usage: lttng create [NAME] [OPTIONS] \n"); - fprintf(ofp, "\n"); - fprintf(ofp, "Without a given NAME, the default is 'auto--'\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "Options:\n"); - fprintf(ofp, " -h, --help Show this help\n"); - fprintf(ofp, " --list-options Simple listing of options\n"); - fprintf(ofp, " -o, --output PATH Specify output path for traces\n"); - fprintf(ofp, " --no-output Traces will not be outputted\n"); - fprintf(ofp, " --snapshot Set the session in snapshot mode.\n"); - fprintf(ofp, " Created in no-output mode and uses the URL,\n"); - fprintf(ofp, " if one, as the default snapshot output.\n"); - fprintf(ofp, " Every channel will be set in overwrite mode\n"); - fprintf(ofp, " and with mmap output (splice not supported).\n"); - fprintf(ofp, " --live [USEC] Set the session in live-reading mode.\n"); - fprintf(ofp, " The delay parameter in micro-seconds is the\n"); - fprintf(ofp, " maximum time the user can wait for the data\n"); - fprintf(ofp, " to be flushed. Can be set with a network\n"); - fprintf(ofp, " URL (-U or -C/-D) and must have a relayd listening.\n"); - fprintf(ofp, " By default, %u is used for the timer and the\n", - DEFAULT_LTTNG_LIVE_TIMER); - fprintf(ofp, " network URL is set to net://127.0.0.1.\n"); - fprintf(ofp, " --shm-path PATH Path where shared memory holding buffers\n"); - fprintf(ofp, " should be created. Useful when used with pramfs\n"); - fprintf(ofp, " to extract trace data after crash.\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "Extended Options:\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "Using these options, each API call can be controlled individually.\n"); - fprintf(ofp, "\n"); - fprintf(ofp, " -U, --set-url=URL Set URL destination of the trace data.\n"); - fprintf(ofp, " It is persistent for the session lifetime.\n"); - fprintf(ofp, " This will set both data and control URL.\n"); - fprintf(ofp, " -C, --ctrl-url=URL Set control path URL. (Must use -D also)\n"); - fprintf(ofp, " -D, --data-url=URL Set data path URL. (Must use -C also)\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "Please refer to the man page (lttng(1)) for more information on network\n"); - fprintf(ofp, "streaming mechanisms and explanation of the control and data port\n"); - fprintf(ofp, "You must have a running remote lttng-relayd for network streaming\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "URL format is has followed:\n"); - fprintf(ofp, "\n"); - fprintf(ofp, " proto://[HOST|IP][:PORT1[:PORT2]][/TRACE_PATH]\n"); - fprintf(ofp, "\n"); - fprintf(ofp, " Supported protocols are (proto):\n"); - fprintf(ofp, " > file://...\n"); - fprintf(ofp, " Local filesystem full path.\n"); - fprintf(ofp, "\n"); - fprintf(ofp, " > net[6]://...\n"); - fprintf(ofp, " This will use the default network transport layer which is\n"); - fprintf(ofp, " TCP for both control (PORT1) and data port (PORT2).\n"); - fprintf(ofp, " The default ports are respectively 5342 and 5343.\n"); - fprintf(ofp, "\n"); - fprintf(ofp, " > tcp[6]://...\n"); - fprintf(ofp, " Can only be used with -C and -D together\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "NOTE: IPv6 address MUST be enclosed in brackets '[]' (rfc2732)\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "Examples:\n"); - fprintf(ofp, " # lttng create -U net://192.168.1.42\n"); - fprintf(ofp, " Uses TCP and default ports for the given destination.\n"); - fprintf(ofp, " # lttng create -U net6://[fe80::f66d:4ff:fe53:d220]\n"); - fprintf(ofp, " Uses TCP, default ports and IPv6.\n"); - fprintf(ofp, " # lttng create s1 -U net://myhost.com:3229\n"); - fprintf(ofp, " Set the consumer to the remote HOST on port 3229 for control.\n"); - fprintf(ofp, "\n"); -} + const char *datetime); /* * Retrieve the created session and mi output it based on provided argument @@ -214,18 +141,15 @@ static int set_consumer_url(const char *session_name, const char *ctrl_url, { int ret; struct lttng_handle *handle; - struct lttng_domain dom; assert(session_name); /* - * Set handle with the session name and the domain set to 0. This means to - * the session daemon that the next action applies on the tracing session - * rather then the domain specific session. + * Set handle with the session_name, but no domain. This implies that + * the actions taken with this handle apply on the tracing session + * rather then the domain-specific session. */ - memset(&dom, 0, sizeof(dom)); - - handle = lttng_create_handle(session_name, &dom); + handle = lttng_create_handle(session_name, NULL); if (handle == NULL) { ret = CMD_FATAL; goto error; @@ -459,7 +383,7 @@ static int create_session(void) } ret = lttng_create_session_live(session_name, url, opt_live_timer); } else { - ret = _lttng_create_session_ext(session_name, url, datetime, -1); + ret = _lttng_create_session_ext(session_name, url, datetime); } if (ret < 0) { /* Don't set ret so lttng can interpret the sessiond error. */ @@ -515,7 +439,7 @@ static int create_session(void) MSG("Default snapshot output set to: %s", print_str_url); } MSG("Snapshot mode set. Every channel enabled for that session will " - "be set in overwrite mode and mmap output."); + "be set to mmap output, and default to overwrite mode."); } if (opt_shm_path) { MSG("Session %s set to shm_path: %s.", session_name, @@ -562,14 +486,13 @@ static int spawn_sessiond(char *pathname) pid_t pid; MSG("Spawning a session daemon"); - recv_child_signal = 0; pid = fork(); if (pid == 0) { /* - * Spawn session daemon and tell - * it to signal us when ready. + * Spawn session daemon in daemon mode. */ - execlp(pathname, "lttng-sessiond", "--sig-parent", "--quiet", NULL); + execlp(pathname, "lttng-sessiond", + "--daemonize", NULL); /* execlp only returns if error happened */ if (errno == ENOENT) { ERR("No session daemon found. Use --sessiond-path."); @@ -579,25 +502,42 @@ static int spawn_sessiond(char *pathname) kill(getppid(), SIGTERM); /* wake parent */ exit(EXIT_FAILURE); } else if (pid > 0) { - sessiond_pid = pid; /* - * Wait for lttng-sessiond to start. We need to use a flag to check if - * the signal has been sent to us, because the child can be scheduled - * before the parent, and thus send the signal before this check. In - * the signal handler, we set the recv_child_signal flag, so anytime we - * check it after the fork is fine. Note that sleep() is interrupted - * before the 1 second delay as soon as the signal is received, so it - * will not cause visible delay for the user. + * In daemon mode (--daemonize), sessiond only exits when + * it's ready to accept commands. */ - while (!recv_child_signal) { - sleep(1); - } - /* - * The signal handler will nullify sessiond_pid on SIGCHLD - */ - if (!sessiond_pid) { - exit(EXIT_FAILURE); + for (;;) { + int status; + pid_t wait_pid_ret = waitpid(pid, &status, 0); + + if (wait_pid_ret < 0) { + if (errno == EINTR) { + continue; + } + PERROR("waitpid"); + ret = -errno; + goto end; + } + + if (WIFSIGNALED(status)) { + ERR("Session daemon was killed by signal %d", + WTERMSIG(status)); + ret = -1; + goto end; + } else if (WIFEXITED(status)) { + DBG("Session daemon terminated normally (exit status: %d)", + WEXITSTATUS(status)); + + if (WEXITSTATUS(status) != 0) { + ERR("Session daemon terminated with an error (exit status: %d)", + WEXITSTATUS(status)); + ret = -1; + goto end; + } + break; + } } + goto end; } else { PERROR("fork"); @@ -658,10 +598,11 @@ static int launch_sessiond(void) } ret = spawn_sessiond(pathname); - if (ret < 0) { - ERR("Problem occurred when starting %s", pathname); - } end: + if (ret) { + ERR("Problem occurred while launching session daemon (%s)", + pathname); + } return ret; } @@ -682,7 +623,7 @@ int cmd_create(int argc, const char **argv) while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { case OPT_HELP: - usage(stdout); + SHOW_HELP(); goto end; case OPT_LIST_OPTIONS: list_cmd_options(stdout, long_options); @@ -722,7 +663,6 @@ int cmd_create(int argc, const char **argv) break; } default: - usage(stderr); ret = CMD_UNDEFINED; goto end; }