X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2Ftrace.c;h=25276696a87bcb3ba5300d98a161ae37b66e7153;hb=97b1a726be0f1779f5508543c58521d774312e73;hp=297d04f29484087ad36c693f75f13c8db625d19b;hpb=7d452e122923ade6f4dc7a6e21bef105851d79e3;p=lttng-tools.git diff --git a/ltt-sessiond/trace.c b/ltt-sessiond/trace.c index 297d04f29..25276696a 100644 --- a/ltt-sessiond/trace.c +++ b/ltt-sessiond/trace.c @@ -24,7 +24,6 @@ #include #include "lttngerr.h" -#include "ltt-sessiond.h" #include "trace.h" /* @@ -119,7 +118,7 @@ error: * * Return pointer to structure or NULL. */ -struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan) +struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan, char *path) { int ret; struct ltt_kernel_channel *lkc; @@ -144,7 +143,7 @@ struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *cha CDS_INIT_LIST_HEAD(&lkc->events_list.head); CDS_INIT_LIST_HEAD(&lkc->stream_list.head); /* Set default trace output path */ - ret = asprintf(&lkc->pathname, "%s", DEFAULT_TRACE_OUTPUT); + ret = asprintf(&lkc->pathname, "%s", path); if (ret < 0) { perror("asprintf kernel create channel"); goto error; @@ -217,7 +216,7 @@ error: * * Return pointer to structure or NULL. */ -struct ltt_kernel_metadata *trace_create_kernel_metadata(void) +struct ltt_kernel_metadata *trace_create_kernel_metadata(char *path) { int ret; struct ltt_kernel_metadata *lkm; @@ -242,7 +241,7 @@ struct ltt_kernel_metadata *trace_create_kernel_metadata(void) lkm->fd = 0; lkm->conf = chan; /* Set default metadata path */ - ret = asprintf(&lkm->pathname, "%s/metadata", DEFAULT_TRACE_OUTPUT); + ret = asprintf(&lkm->pathname, "%s/metadata", path); if (ret < 0) { perror("asprintf kernel metadata"); goto error;