X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=d1e8b8dae117a4369d35681a0e6d7462b0f136c3;hp=cd1660d593dbf16a96c662a3bf0a7a143653cb9a;hb=a4b92340642035d1eafeb1eead0ad01f64d2007d;hpb=00e2e675d54dc726a7c8f8887c889cc8ef022003 diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c index cd1660d59..d1e8b8dae 100644 --- a/src/bin/lttng-sessiond/trace-ust.c +++ b/src/bin/lttng-sessiond/trace-ust.c @@ -111,7 +111,7 @@ struct ltt_ust_session *trace_ust_create_session(char *path, lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL); if (lus->consumer == NULL) { - goto error; + goto error_free_session; } /* @@ -123,17 +123,21 @@ struct ltt_ust_session *trace_ust_create_session(char *path, lus->tmp_consumer = NULL; /* Use the default consumer output which is the tracing session path. */ - ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX, "%s/ust", path); - if (ret < 0) { - PERROR("snprintf UST consumer trace path"); - goto error; - } + if (path && strlen(path) > 0) { + ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX, + "%s" DEFAULT_UST_TRACE_DIR, path); + if (ret < 0) { + PERROR("snprintf UST consumer trace path"); + goto error; + } - /* Set session path */ - ret = snprintf(lus->pathname, PATH_MAX, "%s/ust", path); - if (ret < 0) { - PERROR("snprintf kernel traces path"); - goto error_free_session; + /* Set session path */ + ret = snprintf(lus->pathname, PATH_MAX, "%s" DEFAULT_UST_TRACE_DIR, + path); + if (ret < 0) { + PERROR("snprintf kernel traces path"); + goto error_free_session; + } } DBG2("UST trace session create successful"); @@ -410,7 +414,7 @@ void trace_ust_destroy_event(struct ltt_ust_event *event) { DBG2("Trace destroy UST event %s", event->attr.name); destroy_contexts(event->ctx); - + free(event->filter); free(event); }