Fix: define _LGPL_SOURCE in C files

[lttng-tools.git] / src / bin / lttng-sessiond / context.c

diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c
index 1b87df2e90ab03a3d95192a5afc102fc21404397..cd4b85f2a9d576ff828617075e1f305120d69659 100644 (file)
--- a/src/bin/lttng-sessiond/context.c
+++ b/src/bin/lttng-sessiond/context.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,7 +35,7 @@
  * Add kernel context to all channel.
  */
 static int add_kctx_all_channels(struct ltt_kernel_session *ksession,
-               struct lttng_kernel_context *kctx)
+               struct ltt_kernel_context *kctx)
 {
        int ret;
        struct ltt_kernel_channel *kchan;
@@ -62,7 +63,7 @@ error:
 /*
  * Add kernel context to a specific channel.
  */
-static int add_kctx_to_channel(struct lttng_kernel_context *kctx,
+static int add_kctx_to_channel(struct ltt_kernel_context *kctx,
                struct ltt_kernel_channel *kchan)
 {
        int ret;
@@ -149,60 +150,67 @@ int context_kernel_add(struct ltt_kernel_session *ksession,
 {
        int ret;
        struct ltt_kernel_channel *kchan;
-       struct lttng_kernel_context kctx;
+       struct ltt_kernel_context *kctx;
 
        assert(ksession);
        assert(ctx);
        assert(channel_name);
 
+       kctx = trace_kernel_create_context(NULL);
+       if (!kctx) {
+               ret = LTTNG_ERR_NOMEM;
+               goto error;
+       }
+
        /* Setup kernel context structure */
        switch (ctx->ctx) {
        case LTTNG_EVENT_CONTEXT_PID:
-               kctx.ctx = LTTNG_KERNEL_CONTEXT_PID;
+               kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PID;
                break;
        case LTTNG_EVENT_CONTEXT_PROCNAME:
-               kctx.ctx = LTTNG_KERNEL_CONTEXT_PROCNAME;
+               kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PROCNAME;
                break;
        case LTTNG_EVENT_CONTEXT_PRIO:
-               kctx.ctx = LTTNG_KERNEL_CONTEXT_PRIO;
+               kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PRIO;
                break;
        case LTTNG_EVENT_CONTEXT_NICE:
-               kctx.ctx = LTTNG_KERNEL_CONTEXT_NICE;
+               kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_NICE;
                break;
        case LTTNG_EVENT_CONTEXT_VPID:
-               kctx.ctx = LTTNG_KERNEL_CONTEXT_VPID;
+               kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VPID;
                break;
        case LTTNG_EVENT_CONTEXT_TID:
-               kctx.ctx = LTTNG_KERNEL_CONTEXT_TID;
+               kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_TID;
                break;
        case LTTNG_EVENT_CONTEXT_VTID:
-               kctx.ctx = LTTNG_KERNEL_CONTEXT_VTID;
+               kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VTID;
                break;
        case LTTNG_EVENT_CONTEXT_PPID:
-               kctx.ctx = LTTNG_KERNEL_CONTEXT_PPID;
+               kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PPID;
                break;
        case LTTNG_EVENT_CONTEXT_VPPID:
-               kctx.ctx = LTTNG_KERNEL_CONTEXT_VPPID;
+               kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VPPID;
                break;
        case LTTNG_EVENT_CONTEXT_HOSTNAME:
-               kctx.ctx = LTTNG_KERNEL_CONTEXT_HOSTNAME;
+               kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_HOSTNAME;
                break;
        case LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER:
        case LTTNG_EVENT_CONTEXT_PERF_COUNTER:
-               kctx.ctx = LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER;
+               kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER;
                break;
        default:
-               return LTTNG_ERR_KERN_CONTEXT_FAIL;
+               ret = LTTNG_ERR_KERN_CONTEXT_FAIL;
+               goto error;
        }
 
-       kctx.u.perf_counter.type = ctx->u.perf_counter.type;
-       kctx.u.perf_counter.config = ctx->u.perf_counter.config;
-       strncpy(kctx.u.perf_counter.name, ctx->u.perf_counter.name,
+       kctx->ctx.u.perf_counter.type = ctx->u.perf_counter.type;
+       kctx->ctx.u.perf_counter.config = ctx->u.perf_counter.config;
+       strncpy(kctx->ctx.u.perf_counter.name, ctx->u.perf_counter.name,
                        LTTNG_SYMBOL_NAME_LEN);
-       kctx.u.perf_counter.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+       kctx->ctx.u.perf_counter.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
 
        if (*channel_name == '\0') {
-               ret = add_kctx_all_channels(ksession, &kctx);
+               ret = add_kctx_all_channels(ksession, kctx);
                if (ret != LTTNG_OK) {
                        goto error;
                }
@@ -214,15 +222,18 @@ int context_kernel_add(struct ltt_kernel_session *ksession,
                        goto error;
                }
 
-               ret = add_kctx_to_channel(&kctx, kchan);
+               ret = add_kctx_to_channel(kctx, kchan);
                if (ret != LTTNG_OK) {
                        goto error;
                }
        }
 
-       ret = LTTNG_OK;
+       return LTTNG_OK;
 
 error:
+       if (kctx) {
+               trace_kernel_destroy_context(kctx);
+       }
        return ret;
 }