Add utils.c and recursive mkdir function

[lttng-tools.git] / ltt-sessiond / kernel-ctl.c

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index e42ab872e487890b8c01072aa1784bb10b9ffb19..02b01414a4f76296cb4a9b97a2fd7661dbe9aab7 100644 (file)
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -29,6 +29,68 @@
 #include "libkernelctl.h"
 #include "kernel-ctl.h"
 
+/*
+ *  kernel_add_channel_context
+ *
+ *  Add context on a kernel channel.
+ */
+int kernel_add_channel_context(struct ltt_kernel_channel *chan,
+               struct lttng_kernel_context *ctx)
+{
+       int ret;
+
+       DBG("Adding context to channel %s", chan->channel->name);
+       ret = kernctl_add_context(chan->fd, ctx);
+       if (ret < 0) {
+               perror("add context ioctl");
+               goto error;
+       }
+
+       chan->ctx = malloc(sizeof(struct lttng_kernel_context));
+       if (chan->ctx == NULL) {
+               perror("malloc event context");
+               goto error;
+       }
+
+       memcpy(chan->ctx, ctx, sizeof(struct lttng_kernel_context));
+
+       return 0;
+
+error:
+       return ret;
+}
+
+/*
+ *  kernel_add_event_context
+ *
+ *  Add context on a kernel event.
+ */
+int kernel_add_event_context(struct ltt_kernel_event *event,
+               struct lttng_kernel_context *ctx)
+{
+       int ret;
+
+       DBG("Adding context to event %s", event->event->name);
+       ret = kernctl_add_context(event->fd, ctx);
+       if (ret < 0) {
+               perror("add context ioctl");
+               goto error;
+       }
+
+       event->ctx = malloc(sizeof(struct lttng_kernel_context));
+       if (event->ctx == NULL) {
+               perror("malloc event context");
+               goto error;
+       }
+
+       memcpy(event->ctx, ctx, sizeof(struct lttng_kernel_context));
+
+       return 0;
+
+error:
+       return ret;
+}
+
 /*
  *  kernel_create_session
  *
@@ -429,8 +491,8 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
                        perror("fcntl session fd");
                }
 
-               ret = asprintf(&lks->pathname, "%s/trace_%d",
-                               channel->pathname, channel->stream_count);
+               ret = asprintf(&lks->pathname, "%s/%s_%d",
+                               channel->pathname, channel->channel->name, channel->stream_count);
                if (ret < 0) {
                        perror("asprintf kernel create stream");
                        goto error;