* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <assert.h>
#include <ctype.h>
#include <time.h>
#include <unistd.h>
#include <signal.h>
+#include <sys/wait.h>
#include <common/mi-lttng.h>
OPT_LIVE_TIMER,
};
+enum {
+ OUTPUT_UNKNOWN = -1,
+ OUTPUT_NONE,
+ OUTPUT_LOCAL,
+ OUTPUT_NET,
+};
+enum {
+ SESSION_UNKNOWN = -1,
+ SESSION_NORMAL,
+ SESSION_LIVE,
+ SESSION_SNAPSHOT,
+};
+
+
static struct mi_writer *writer;
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-<yyyymmdd>-<hhmmss>'\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
{
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;
goto error;
}
- if (ctrl_url) {
- MSG("Control URL %s set for session %s", ctrl_url, session_name);
- }
-
- if (data_url) {
- MSG("Data URL %s set for session %s", data_url, session_name);
- }
-
error:
lttng_destroy_handle(handle);
return ret;
return ret;
}
+/*
+ * Validate the combinations of passed options
+ *
+ * CMD_ERROR on error
+ * CMD_SUCCESS on success
+ */
+static int validate_command_options(void)
+{
+ int ret = CMD_SUCCESS;
+
+ if (opt_snapshot && opt_live_timer) {
+ ERR("Snapshot and live modes are mutually exclusive.");
+ ret = CMD_ERROR;
+ goto error;
+ }
+
+ if ((!opt_ctrl_url && opt_data_url) || (opt_ctrl_url && !opt_data_url)) {
+ ERR("Control and data URLs must both be set.");
+ ret = CMD_ERROR;
+ goto error;
+ }
+
+error:
+ return ret;
+}
+
+/*
+ * Create a session via direct calls to liblttng-ctl.
+ *
+ * Return CMD_SUCCESS on success, negative value on internal lttng errors and positive
+ * value on command errors.
+ */
+static int create_session_basic (const char *session_name,
+ int session_type,
+ int live_timer,
+ int output_type,
+ const char* url,
+ const char* ctrl_url,
+ const char* data_url,
+ const char* shm_path,
+ const char* datetime)
+{
+ /* Create session based on session creation */
+ int ret = CMD_SUCCESS;
+ const char *pathname;
+
+ assert(datetime);
+
+ if (opt_relayd_path) {
+ pathname = opt_relayd_path;
+ } else {
+ pathname = INSTALL_BIN_PATH "/lttng-relayd";
+ }
+
+ switch (session_type) {
+ case SESSION_NORMAL:
+ ret = _lttng_create_session_ext(session_name, url, datetime);
+ break;
+ case SESSION_SNAPSHOT:
+ if (output_type == OUTPUT_NONE) {
+ ERR("--no-output on a snapshot session is invalid");
+ ret = CMD_UNSUPPORTED;
+ goto error;
+ }
+ ret = lttng_create_session_snapshot(session_name, url);
+ break;
+ case SESSION_LIVE:
+ if (output_type == OUTPUT_NONE) {
+ ERR("--no-output on a live session is invalid");
+ ret = CMD_UNSUPPORTED;
+ goto error;
+ }
+
+ if (output_type == OUTPUT_LOCAL) {
+ ERR("Local file output on a live session is invalid");
+ ret = CMD_UNSUPPORTED;
+ goto error;
+ }
+ if (output_type != OUTPUT_NET && !check_relayd() &&
+ spawn_relayd(pathname, 0) < 0) {
+ ret = CMD_FATAL;
+ goto error;
+ }
+ ret = lttng_create_session_live(session_name, url, live_timer);
+ break;
+ default:
+ ERR("Unknown session type");
+ ret = CMD_UNDEFINED;
+ goto error;
+ }
+
+ if (ret < 0) {
+ /* Don't set ret so the sessiond error is propagated. */
+ switch (-ret) {
+ case LTTNG_ERR_EXIST_SESS:
+ WARN("Session %s already exists", session_name);
+ break;
+ default:
+ break;
+ }
+ goto error;
+ }
+
+ /* Configure the session based on the output type */
+ switch (output_type) {
+ case OUTPUT_LOCAL:
+ break;
+ case OUTPUT_NET:
+ if (!ctrl_url || !data_url) {
+ break;
+ }
+
+ if (session_type == SESSION_SNAPSHOT) {
+ ret = add_snapshot_output(session_name, ctrl_url,
+ data_url);
+ } else {
+ /*
+ * Normal sessions and live sessions behave the same way
+ * regarding consumer url.
+ */
+ ret = set_consumer_url(session_name, ctrl_url, data_url);
+ }
+ if (ret < 0) {
+ /* Destroy created session on errors */
+ lttng_destroy_session(session_name);
+ goto error;
+ }
+ break;
+ case OUTPUT_NONE:
+ break;
+ default:
+ ERR("Unknown output type");
+ ret = CMD_UNDEFINED;
+ goto error;
+ }
+
+ /*
+ * Set the session shared memory path
+ */
+ if (shm_path) {
+ ret = lttng_set_session_shm_path(session_name, shm_path);
+ if (ret < 0) {
+ lttng_destroy_session(session_name);
+ goto error;
+ }
+ }
+error:
+ return ret;
+}
+
+static int generate_output(const char *session_name,
+ int session_type,
+ int live_timer,
+ int output_type,
+ const char* url,
+ const char* ctrl_url,
+ const char* data_url,
+ const char* shm_path)
+{
+ int ret = CMD_SUCCESS;
+
+ /*
+ * TODO move this to after session name
+ * for now we only emulate previous behaviour.
+ */
+ if (session_type != SESSION_SNAPSHOT) {
+ if (ctrl_url) {
+ MSG("Control URL %s set for session %s", ctrl_url, session_name);
+ }
+
+ if (data_url) {
+ MSG("Data URL %s set for session %s", data_url, session_name);
+ }
+ }
+
+ if (url && output_type == OUTPUT_LOCAL) {
+ /* Remove the file:// */
+ if (strlen(url) > strlen("file://")){
+ url = url + strlen("file://");
+ }
+ }
+
+ MSG("Session %s created.", session_name);
+ if (url && session_type != SESSION_SNAPSHOT) {
+ MSG("Traces will be written in %s", url);
+
+ if (live_timer) {
+ MSG("Live timer set to %u usec", live_timer);
+ }
+ } else if (session_type == SESSION_SNAPSHOT) {
+ if (url) {
+ MSG("Default snapshot output set to: %s", url);
+ }
+ MSG("Snapshot mode set. Every channel enabled for that session will "
+ "be set to mmap output, and default to overwrite mode.");
+ }
+
+ if (shm_path) {
+ MSG("Session %s set to shm_path: %s.", session_name,
+ shm_path);
+ }
+
+ /* Mi output */
+ if (lttng_opt_mi) {
+ ret = mi_created_session(session_name);
+ if (ret) {
+ ret = CMD_ERROR;
+ goto error;
+ }
+ }
+error:
+ return ret;
+}
+
/*
* Create a tracing session.
* If no name is specified, a default name is generated.
static int create_session(void)
{
int ret;
- char *session_name = NULL, *traces_path = NULL, *alloc_path = NULL;
- char *alloc_url = NULL, *url = NULL, datetime[16];
- char session_name_date[NAME_MAX + 17], *print_str_url = NULL;
+
+ /* Base data */
+ int base_session_type = SESSION_UNKNOWN;
+ int base_output_type = OUTPUT_UNKNOWN;
+ char *base_session_name = NULL;
+ char *base_url = NULL;
+ char *base_ctrl_url = NULL;
+ char *base_data_url = NULL;
+ char *base_shm_path = NULL;
+ int base_live_timer = 0;
+
+ /* Time data */
+ char datetime[16];
time_t rawtime;
- struct tm *timeinfo;
- char shm_path[PATH_MAX] = "";
+ struct tm *timeinfo = NULL;
+
+ /* Temporary variables */
+ char *traces_path = NULL;
+ char *temp_url = NULL;
+ char *session_name_date = NULL;
+ char *tmp_url = NULL;
+ char *tmp_home_path = NULL;
+ struct lttng_uri *uris = NULL;
+ ssize_t uri_array_size = 0;
+
+ /* Option validation */
+ if (validate_command_options() != CMD_SUCCESS) {
+ ret = CMD_ERROR;
+ goto error;
+ }
/* Get date and time for automatic session name/path */
time(&rawtime);
timeinfo = localtime(&rawtime);
strftime(datetime, sizeof(datetime), "%Y%m%d-%H%M%S", timeinfo);
- /* Auto session name creation */
- if (opt_session_name == NULL) {
- ret = snprintf(session_name_date, sizeof(session_name_date),
- DEFAULT_SESSION_NAME "-%s", datetime);
- if (ret < 0) {
- PERROR("snprintf session name");
- goto error;
+ /* Find the session type based on options */
+ if(base_session_type == SESSION_UNKNOWN) {
+ if (opt_snapshot) {
+ base_session_type = SESSION_SNAPSHOT;
+ } else if (opt_live_timer) {
+ base_session_type = SESSION_LIVE;
+ } else {
+ base_session_type = SESSION_NORMAL;
}
- session_name = session_name_date;
- DBG("Auto session name set to %s", session_name_date);
- } else {
+ }
+
+ /*
+ * Session name handling
+ */
+ if (opt_session_name) {
+ /* Override the session name */
if (strlen(opt_session_name) > NAME_MAX) {
ERR("Session name too long. Length must be lower or equal to %d",
NAME_MAX);
ret = LTTNG_ERR_SESSION_FAIL;
+ free(session_name_date);
goto error;
}
/*
* understand why we need to check both here.
*/
if ((strncmp(opt_session_name, DEFAULT_SESSION_NAME "-",
- strlen(DEFAULT_SESSION_NAME) + 1) == 0) ||
- (strncmp(opt_session_name, DEFAULT_SESSION_NAME,
- strlen(DEFAULT_SESSION_NAME)) == 0 &&
- strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME))) {
+ strlen(DEFAULT_SESSION_NAME) + 1) == 0) ||
+ (strncmp(opt_session_name, DEFAULT_SESSION_NAME,
+ strlen(DEFAULT_SESSION_NAME)) == 0 &&
+ strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME))) {
ERR("%s is a reserved keyword for default session(s)",
DEFAULT_SESSION_NAME);
+
+ ret = CMD_ERROR;
+ goto error;
+ }
+
+ base_session_name = strndup(opt_session_name, NAME_MAX);
+ if (!base_session_name) {
+ PERROR("Strdup session name");
ret = CMD_ERROR;
goto error;
}
- session_name = opt_session_name;
- ret = snprintf(session_name_date, sizeof(session_name_date),
- "%s-%s", session_name, datetime);
+
+ ret = asprintf(&session_name_date, "%s-%s", base_session_name, datetime);
+ if (ret < 0) {
+ PERROR("Asprintf session name");
+ goto error;
+ }
+ DBG("Session name from command option set to %s", base_session_name);
+ } else if (base_session_name) {
+ ret = asprintf(&session_name_date, "%s-%s", base_session_name, datetime);
+ if (ret < 0) {
+ PERROR("Asprintf session name");
+ goto error;
+ }
+ } else {
+ /* Generate a name */
+ ret = asprintf(&base_session_name, DEFAULT_SESSION_NAME "-%s", datetime);
if (ret < 0) {
- PERROR("snprintf session name");
+ PERROR("Asprintf session name");
goto error;
}
+ session_name_date = strdup(base_session_name);
+ DBG("Auto session name set to %s", base_session_name);
}
- if ((!opt_ctrl_url && opt_data_url) || (opt_ctrl_url && !opt_data_url)) {
- ERR("You need both control and data URL.");
- ret = CMD_ERROR;
- goto error;
+
+ /*
+ * Output handling
+ */
+
+ /*
+ * If any of those options are present clear all output related data.
+ */
+ if (opt_output_path || opt_url || (opt_ctrl_url && opt_data_url) || opt_no_output) {
+ /* Overwrite output */
+ free(base_url);
+ free(base_ctrl_url);
+ free(base_data_url);
+ base_url = NULL;
+ base_ctrl_url = NULL;
+ base_data_url = NULL;
}
- if (opt_output_path != NULL) {
+ if (opt_output_path) {
+
traces_path = utils_expand_path(opt_output_path);
- if (traces_path == NULL) {
+ if (!traces_path) {
ret = CMD_ERROR;
goto error;
}
/* Create URL string from the local file system path */
- ret = asprintf(&alloc_url, "file://%s", traces_path);
+ ret = asprintf(&temp_url, "file://%s", traces_path);
if (ret < 0) {
PERROR("asprintf url path");
ret = CMD_FATAL;
goto error;
}
- /* URL to use in the lttng_create_session() call */
- url = alloc_url;
- print_str_url = traces_path;
+
+ base_url = temp_url;
} else if (opt_url) { /* Handling URL (-U opt) */
- url = opt_url;
- print_str_url = url;
+ base_url = strdup(opt_url);
} else if (opt_data_url && opt_ctrl_url) {
/*
- * With both control and data, we'll be setting the consumer URL after
- * session creation thus use no URL.
+ * With both control and data, we'll be setting the consumer URL
+ * after session creation thus use no URL.
*/
- url = NULL;
- } else if (!opt_no_output) {
- char *tmp_path;
-
- /* Auto output path */
- tmp_path = utils_get_home_dir();
- if (tmp_path == NULL) {
- ERR("HOME path not found.\n \
- Please specify an output path using -o, --output PATH");
- ret = CMD_FATAL;
- goto error;
- }
- alloc_path = strdup(tmp_path);
- if (!alloc_path) {
- PERROR("allocating alloc_path");
- ret = CMD_FATAL;
- goto error;
- }
- ret = asprintf(&alloc_url,
- "file://%s/" DEFAULT_TRACE_DIR_NAME "/%s",
- alloc_path, session_name_date);
- if (ret < 0) {
- PERROR("asprintf trace dir name");
- ret = CMD_FATAL;
- goto error;
- }
-
- url = alloc_url;
- print_str_url = alloc_url + strlen("file://");
- } else {
- /* No output means --no-output or --snapshot mode. */
- url = NULL;
- }
-
- /* Use default live URL if NO url is/are found. */
- if ((opt_live_timer && !opt_url) && (opt_live_timer && !opt_data_url)) {
- ret = asprintf(&alloc_url, "net://127.0.0.1");
- if (ret < 0) {
- PERROR("asprintf default live URL");
- ret = CMD_FATAL;
- goto error;
- }
- url = alloc_url;
- print_str_url = url;
- }
-
- if (opt_snapshot && opt_live_timer) {
- ERR("Snapshot and live modes are mutually exclusive.");
- ret = CMD_ERROR;
- goto error;
- }
+ base_ctrl_url = strdup(opt_ctrl_url);
+ base_data_url = strdup(opt_data_url);
+ } else if (!(opt_no_output || base_output_type == OUTPUT_NONE ||
+ base_url || base_ctrl_url || base_data_url)) {
+ /* Generate default output depending on the session type */
+ switch (base_session_type) {
+ case SESSION_NORMAL:
+ /* fallthrough */
+ case SESSION_SNAPSHOT:
+ /* Default to a local path */
+ tmp_home_path = utils_get_home_dir();
+ if (tmp_home_path == NULL) {
+ ERR("HOME path not found.\n \
+ Please specify an output path using -o, --output PATH");
+ ret = CMD_FATAL;
+ goto error;
+ }
- if (opt_snapshot) {
- /* No output by default. */
- const char *snapshot_url = NULL;
+ ret = asprintf(&tmp_url,
+ "file://%s/" DEFAULT_TRACE_DIR_NAME "/%s",
+ tmp_home_path, session_name_date);
- if (opt_url) {
- snapshot_url = url;
- } else if (!opt_data_url && !opt_ctrl_url) {
- /* This is the session path that we need to use as output. */
- snapshot_url = url;
- }
- ret = lttng_create_session_snapshot(session_name, snapshot_url);
- } else if (opt_live_timer) {
- const char *pathname;
+ if (ret < 0) {
+ PERROR("asprintf trace dir name");
+ ret = CMD_FATAL;
+ goto error;
+ }
- if (opt_relayd_path) {
- pathname = opt_relayd_path;
- } else {
- pathname = INSTALL_BIN_PATH "/lttng-relayd";
- }
- if (!opt_url && !opt_data_url && !check_relayd() &&
- spawn_relayd(pathname, 0) < 0) {
- goto error;
- }
- ret = lttng_create_session_live(session_name, url, opt_live_timer);
- } else {
- ret = _lttng_create_session_ext(session_name, url, datetime, -1);
- }
- if (ret < 0) {
- /* Don't set ret so lttng can interpret the sessiond error. */
- switch (-ret) {
- case LTTNG_ERR_EXIST_SESS:
- WARN("Session %s already exists", session_name);
+ base_url = tmp_url ;
break;
- default:
+ case SESSION_LIVE:
+ /* Default to a net output */
+ ret = asprintf(&tmp_url, "net://127.0.0.1");
+ if (ret < 0) {
+ PERROR("asprintf default live URL");
+ ret = CMD_FATAL;
+ goto error;
+ }
+ base_url = tmp_url ;
break;
- }
- goto error;
- }
-
- if (opt_ctrl_url && opt_data_url) {
- if (opt_snapshot) {
- ret = add_snapshot_output(session_name, opt_ctrl_url,
- opt_data_url);
- } else {
- /* Setting up control URI (-C or/and -D opt) */
- ret = set_consumer_url(session_name, opt_ctrl_url, opt_data_url);
- }
- if (ret < 0) {
- /* Destroy created session because the URL are not valid. */
- lttng_destroy_session(session_name);
+ default:
+ ERR("Unknown session type");
+ ret = CMD_FATAL;
goto error;
}
}
+ /*
+ * Shared memory path handling
+ */
if (opt_shm_path) {
- ret = snprintf(shm_path, sizeof(shm_path),
- "%s/%s", opt_shm_path, session_name_date);
- if (ret < 0) {
- PERROR("snprintf shm_path");
- goto error;
- }
-
- ret = lttng_set_session_shm_path(session_name, shm_path);
+ ret = asprintf(&base_shm_path, "%s/%s", opt_shm_path, session_name_date);
if (ret < 0) {
- lttng_destroy_session(session_name);
+ PERROR("asprintf shm_path");
goto error;
}
}
- MSG("Session %s created.", session_name);
- if (print_str_url && !opt_snapshot) {
- MSG("Traces will be written in %s", print_str_url);
+ /*
+ * Live timer handling
+ */
+ if (opt_live_timer) {
+ base_live_timer = opt_live_timer;
+ }
- if (opt_live_timer) {
- MSG("Live timer set to %u usec", opt_live_timer);
+ /* Get output type from urls */
+ if (base_url) {
+ /* Get lttng uris from single url */
+ uri_array_size = uri_parse_str_urls(base_url, NULL, &uris);
+ if (uri_array_size < 0) {
+ ret = CMD_ERROR;
+ goto error;
}
- } else if (opt_snapshot) {
- if (print_str_url) {
- MSG("Default snapshot output set to: %s", print_str_url);
+ } else if (base_ctrl_url && base_data_url) {
+ uri_array_size = uri_parse_str_urls(base_ctrl_url, base_data_url, &uris);
+ if (uri_array_size < 0) {
+ ret = CMD_ERROR;
+ goto error;
}
- MSG("Snapshot mode set. Every channel enabled for that session will "
- "be set in overwrite mode and mmap output.");
+ } else {
+ /* --no-output */
+ uri_array_size = 0;
+ }
+
+ switch (uri_array_size) {
+ case 0:
+ base_output_type = OUTPUT_NONE;
+ break;
+ case 1:
+ base_output_type = OUTPUT_LOCAL;
+ break;
+ case 2:
+ base_output_type = OUTPUT_NET;
+ break;
+ default:
+ ret = CMD_ERROR;
+ goto error;
}
- if (opt_shm_path) {
- MSG("Session %s set to shm_path: %s.", session_name,
- shm_path);
+
+ ret = create_session_basic (base_session_name,
+ base_session_type,
+ base_live_timer,
+ base_output_type,
+ base_url,
+ base_ctrl_url,
+ base_data_url,
+ base_shm_path,
+ datetime);
+ if (ret) {
+ goto error;
}
- /* Mi output */
- if (lttng_opt_mi) {
- ret = mi_created_session(session_name);
- if (ret) {
- ret = CMD_ERROR;
- goto error;
- }
+ ret = generate_output (base_session_name,
+ base_session_type,
+ base_live_timer,
+ base_output_type,
+ base_url,
+ base_ctrl_url,
+ base_data_url,
+ base_shm_path);
+ if (ret) {
+ goto error;
}
/* Init lttng session config */
- ret = config_init(session_name);
+ ret = config_init(base_session_name);
if (ret < 0) {
ret = CMD_ERROR;
goto error;
ret = CMD_SUCCESS;
error:
- free(alloc_url);
- free(traces_path);
- free(alloc_path);
+ /* Session temp stuff */
+ free(session_name_date);
+ free(uris);
if (ret < 0) {
ERR("%s", lttng_strerror(ret));
}
+
+ free(base_session_name);
+ free(base_url);
+ free(base_ctrl_url);
+ free(base_data_url);
+ free(base_shm_path);
return ret;
}
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.");
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.
- */
- while (!recv_child_signal) {
- sleep(1);
- }
/*
- * The signal handler will nullify sessiond_pid on SIGCHLD
+ * In daemon mode (--daemonize), sessiond only exits when
+ * it's ready to accept commands.
*/
- 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");
}
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;
}
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);
break;
}
default:
- usage(stderr);
ret = CMD_UNDEFINED;
goto end;
}
opt_session_name = (char*) poptGetArg(pc);
command_ret = create_session();
+
if (command_ret) {
success = 0;
}