From 89f26d57d2880f83c9fee7fbc6ec870d1def0d2c Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 12 Nov 2014 18:12:35 -0500 Subject: [PATCH] Cleanup: remove "disabled" flag for new release cycle Signed-off-by: Mathieu Desnoyers --- include/lttng/ust-abi.h | 3 +-- liblttng-ust-ctl/ustctl.c | 1 - liblttng-ust/lttng-events.c | 11 +---------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h index 797a06b6..8c2469e4 100644 --- a/include/lttng/ust-abi.h +++ b/include/lttng/ust-abi.h @@ -98,7 +98,7 @@ struct lttng_ust_stream { */ } LTTNG_PACKED; -#define LTTNG_UST_EVENT_PADDING1 15 +#define LTTNG_UST_EVENT_PADDING1 16 #define LTTNG_UST_EVENT_PADDING2 (LTTNG_UST_SYM_NAME_LEN + 32) struct lttng_ust_event { enum lttng_ust_instrumentation instrumentation; @@ -106,7 +106,6 @@ struct lttng_ust_event { enum lttng_ust_loglevel_type loglevel_type; int loglevel; /* value, -1: all */ - char disabled; char padding[LTTNG_UST_EVENT_PADDING1]; /* Per instrumentation type configuration */ diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c index 195f29c0..49ae3e6c 100644 --- a/liblttng-ust-ctl/ustctl.c +++ b/liblttng-ust-ctl/ustctl.c @@ -200,7 +200,6 @@ int ustctl_create_event(int sock, struct lttng_ust_event *ev, lum.u.event.instrumentation = ev->instrumentation; lum.u.event.loglevel_type = ev->loglevel_type; lum.u.event.loglevel = ev->loglevel; - lum.u.event.disabled = ev->disabled; ret = ustcomm_send_app_cmd(sock, &lum, &lur); if (ret) { free(event_data); diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c index 8bdb743d..939dcd86 100644 --- a/liblttng-ust/lttng-events.c +++ b/liblttng-ust/lttng-events.c @@ -746,16 +746,7 @@ struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_type type, sizeof(enabler->event_param)); enabler->chan = chan; /* ctx left NULL */ - /* - * The "disable" event create comm field has been added to fix a - * race between event creation (of a started trace) and enabling - * filtering. New session daemon always set the "disable" field - * to 1, and are aware that they need to explicitly enable the - * event. Older session daemon (within same ABI) leave it at 0, - * and therefore we need to enable it here, keeping the original - * racy behavior. - */ - enabler->enabled = !event_param->disabled; + enabler->enabled = 0; cds_list_add(&enabler->node, &enabler->chan->session->enablers_head); lttng_session_lazy_sync_enablers(enabler->chan->session); return enabler; -- 2.34.1