*/
static int create_session()
{
- int ret;
+ int ret, have_name = 0;
char datetime[16];
char *session_name, *traces_path = NULL, *alloc_path = NULL;
time_t rawtime;
/* Auto session name creation */
if (opt_session_name == NULL) {
- ret = asprintf(&session_name, "auto");
+ ret = asprintf(&session_name, "auto-%s", datetime);
if (ret < 0) {
perror("asprintf session name");
- ret = CMD_ERROR;
goto error;
}
DBG("Auto session name set to %s", session_name);
} else {
session_name = opt_session_name;
+ have_name = 1;
}
/* Auto output path */
if (opt_output_path == NULL) {
alloc_path = strdup(config_get_default_path());
if (alloc_path == NULL) {
- ERR("Home path not found.\n"
- "Please specify an output path using -o, --output PATH\n");
+ ERR("Home path not found.\n \
+ Please specify an output path using -o, --output PATH");
ret = CMD_FATAL;
goto error;
}
- ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME "/%s-%s",
- alloc_path, session_name, datetime);
+ if (have_name) {
+ ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
+ "/%s-%s", alloc_path, session_name, datetime);
+ } else {
+ ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
+ "/%s", alloc_path, session_name);
+ }
+
if (ret < 0) {
perror("asprintf trace dir name");
- ret = CMD_ERROR;
goto error;
}
} else {
if (!opt_kernel && !opt_userspace) {
ret = list_sessions(NULL);
if (ret < 0) {
- ret = CMD_ERROR;
goto end;
}
}
if (opt_kernel) {
ret = list_kernel_events();
if (ret < 0) {
- ret = CMD_ERROR;
goto end;
}
}
if (opt_userspace) {
ret = list_ust_events();
if (ret < 0) {
- ret = CMD_ERROR;
goto end;
}
}
/* List session attributes */
ret = list_sessions(session_name);
if (ret < 0) {
- ret = CMD_ERROR;
goto end;
}
/* Domain listing */
if (opt_domain) {
ret = list_domains(session_name);
- if (ret < 0) {
- ret = CMD_ERROR;
- }
goto end;
}
/* Channel listing */
ret = list_channels(opt_channel);
if (ret < 0) {
- ret = CMD_ERROR;
goto end;
}
} else {
/* We want all domain(s) */
nb_domain = lttng_list_domains(session_name, &domains);
if (nb_domain < 0) {
- ret = CMD_ERROR;
+ ret = nb_domain;
goto end;
}
ret = list_channels(opt_channel);
if (ret < 0) {
- ret = CMD_ERROR;
goto end;
}
}
strncmp(argv[i], "--h", sizeof("--h")) == 0 ||
strncmp(argv[i], "--list-options", sizeof("--list-options")) == 0 ||
strncmp(argv[i], "--list-commands", sizeof("--list-commands")) == 0 ||
- strncmp(argv[i], "version", sizeof("version"))) {
+ strncmp(argv[i], "version", sizeof("version")) == 0) {
return 1;
}
}