From: Mathieu Desnoyers Date: Mon, 24 Oct 2011 23:46:01 +0000 (-0400) Subject: Add context to both channel and event X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3039d8edded548ac345187dec8d0834720d3c765;p=ust.git Add context to both channel and event Signed-off-by: Mathieu Desnoyers --- diff --git a/include/ust/lttng-ust-ctl.h b/include/ust/lttng-ust-ctl.h index e05d95b..99478b9 100644 --- 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 27ba0e5..429cc44 100644 --- 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);