Add context to both channel and event

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/ust/lttng-ust-ctl.h b/include/ust/lttng-ust-ctl.h
index e05d95b5d28578efe7370b9e913d8235033acfae..99478b946cd4276cd4b9f7b5006569b5344a7f1f 100644 (file)
--- a/include/ust/lttng-ust-ctl.h
+++ b/include/ust/lttng-ust-ctl.h
@@ -55,7 +55,7 @@ int ustctl_create_event(int sock, struct lttng_ust_event *ev,
                struct object_data *channel_data,
                struct object_data **event_data);
 int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
-               struct object_data *channel_data,
+               struct object_data *obj_data,
                struct object_data **context_data);
 
 int ustctl_enable(int sock, struct object_data *object);

diff --git a/libustctl/ustctl.c b/libustctl/ustctl.c
index 27ba0e5f3fa48f36b6e6c3d32c27237a53d9ca21..429cc445a0333b046eaad68247f188daacf53e1b 100644 (file)
--- a/libustctl/ustctl.c
+++ b/libustctl/ustctl.c
@@ -291,7 +291,7 @@ int ustctl_create_event(int sock, struct lttng_ust_event *ev,
 }
 
 int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
-               struct object_data *channel_data,
+               struct object_data *obj_data,
                struct object_data **_context_data)
 {
        struct ustcomm_ust_msg lum;
@@ -304,7 +304,7 @@ int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
                return -ENOMEM;
        init_object(context_data);
        memset(&lum, 0, sizeof(lum));
-       lum.handle = channel_data->handle;
+       lum.handle = obj_data->handle;
        lum.cmd = LTTNG_UST_CONTEXT;
        lum.u.context.ctx = ctx->ctx;
        ret = ustcomm_send_app_cmd(sock, &lum, &lur);