From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 26 Aug 2015 15:37:48 +0000 (-0400)
Subject: Save filter expressions as part of agent events
X-Git-Tag: v2.8.0-rc1~465
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=8404118c67ee01844e0bcee69d05c684689506b0;p=lttng-tools.git

Save filter expressions as part of agent events

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index d1e672333..e68b680c2 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -958,6 +958,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 7faae117e..77c8faf58 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 ffff05809..ac489fa2f 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1769,6 +1769,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 
 		{
 			struct lttng_filter_bytecode *filter_copy = NULL;
+			char *filter_expression_copy = NULL;
 
 			if (filter) {
 				filter_copy = zmalloc(
@@ -1779,16 +1780,28 @@ static int _cmd_enable_event(struct ltt_session *session,
 				}
 
 				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_internal(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) {
@@ -1797,10 +1810,12 @@ static int _cmd_enable_event(struct ltt_session *session,
 
 		/* 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 9f4124ae7..2244503c1 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -359,7 +359,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;
@@ -370,7 +371,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;
 	}
@@ -396,7 +397,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 5f6bf07b7..2cf0d5eb5 100644
--- a/src/bin/lttng-sessiond/event.h
+++ b/src/bin/lttng-sessiond/event.h
@@ -42,9 +42,11 @@ int event_ust_disable_tracepoint(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, char *event_name);
 
 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);