From 8a1032bc9f128cbac0de587ae5ea3c536b56d54b Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 26 Aug 2015 11:37:48 -0400 Subject: [PATCH] Save filter expressions as part of agent events MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/agent.c | 1 + src/bin/lttng-sessiond/agent.h | 1 + src/bin/lttng-sessiond/cmd.c | 31 +++++++++++++++++++++++-------- src/bin/lttng-sessiond/event.c | 8 +++++--- src/bin/lttng-sessiond/event.h | 6 ++++-- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c index 50a6a7b1e..29541ac23 100644 --- a/src/bin/lttng-sessiond/agent.c +++ b/src/bin/lttng-sessiond/agent.c @@ -914,6 +914,7 @@ void agent_destroy_event(struct agent_event *event) assert(event); free(event->filter); + free(event->filter_expression); free(event); } diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.h index d08ad6e22..de95b31d9 100644 --- a/src/bin/lttng-sessiond/agent.h +++ b/src/bin/lttng-sessiond/agent.h @@ -92,6 +92,7 @@ struct agent_event { struct lttng_ht_node_str node; /* Bytecode filter associated with the event . NULL if none. */ + char *filter_expression; struct lttng_filter_bytecode *filter; }; diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index bef4aa959..2d49aae2d 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -1609,6 +1609,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain, { struct lttng_filter_bytecode *filter_copy = NULL; + char *filter_expression_copy = NULL; if (filter) { filter_copy = zmalloc( @@ -1619,16 +1620,28 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain, } memcpy(filter_copy, filter, - sizeof(struct lttng_filter_bytecode) - + filter->len); + sizeof(struct lttng_filter_bytecode) + + filter->len); + } + + if (filter_expression) { + filter_expression_copy = + strdup(filter_expression); + if (!filter_expression) { + ret = LTTNG_ERR_NOMEM; + goto error_free_copy; + } } ret = cmd_enable_event(session, &tmp_dom, (char *) default_chan_name, - &uevent, filter_expression, filter_copy, - NULL, wpipe); - /* We have passed ownership */ - filter_expression = NULL; + &uevent, filter_expression_copy, + filter_copy, NULL, wpipe); + filter_copy = NULL; + filter_expression_copy = NULL; +error_free_copy: + free(filter_copy); + free(filter_expression_copy); } if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) { @@ -1637,10 +1650,12 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain, /* The wild card * means that everything should be enabled. */ if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) { - ret = event_agent_enable_all(usess, agt, event, filter); + ret = event_agent_enable_all(usess, agt, event, filter, + filter_expression); filter = NULL; } else { - ret = event_agent_enable(usess, agt, event, filter); + ret = event_agent_enable(usess, agt, event, filter, + filter_expression); filter = NULL; } if (ret != LTTNG_OK) { diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c index a7d437e8a..243937908 100644 --- a/src/bin/lttng-sessiond/event.c +++ b/src/bin/lttng-sessiond/event.c @@ -632,7 +632,8 @@ error: */ int event_agent_enable_all(struct ltt_ust_session *usess, struct agent *agt, struct lttng_event *event, - struct lttng_filter_bytecode *filter) + struct lttng_filter_bytecode *filter, + char *filter_expression) { int ret; struct agent_event *aevent; @@ -643,7 +644,7 @@ int event_agent_enable_all(struct ltt_ust_session *usess, DBG("Event agent enabling ALL events for session %" PRIu64, usess->id); /* Enable event on agent application through TCP socket. */ - ret = event_agent_enable(usess, agt, event, filter); + ret = event_agent_enable(usess, agt, event, filter, filter_expression); if (ret != LTTNG_OK) { goto error; } @@ -669,7 +670,8 @@ error: */ int event_agent_enable(struct ltt_ust_session *usess, struct agent *agt, struct lttng_event *event, - struct lttng_filter_bytecode *filter) + struct lttng_filter_bytecode *filter, + char *filter_expression) { int ret, created = 0; struct agent_event *aevent; diff --git a/src/bin/lttng-sessiond/event.h b/src/bin/lttng-sessiond/event.h index 501ee02d1..c0b37ab8d 100644 --- a/src/bin/lttng-sessiond/event.h +++ b/src/bin/lttng-sessiond/event.h @@ -53,9 +53,11 @@ int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan); int event_agent_enable(struct ltt_ust_session *usess, struct agent *agt, - struct lttng_event *event, struct lttng_filter_bytecode *filter); + struct lttng_event *event, struct lttng_filter_bytecode *filter, + char *filter_expression); int event_agent_enable_all(struct ltt_ust_session *usess, struct agent *agt, - struct lttng_event *event, struct lttng_filter_bytecode *filter); + struct lttng_event *event, struct lttng_filter_bytecode *filter, + char *filter_expression); int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt, char *event_name); -- 2.34.1