X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.c;h=32c261ca7529dba09e20544e8fd0debbbdfe07ab;hb=9c9107228280bcffde8eb79cf8bb34c8208e04a4;hp=e89adbb10941324c8eea3dc920a3a91e954ce894;hpb=77cdfc81210ea4cfca740335af03be732e652e6d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index e89adbb10..32c261ca7 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -125,7 +125,7 @@ static void destroy_event_agent_rcu(struct rcu_head *head)
 	struct agent_event *event =
 		caa_container_of(node, struct agent_event, node);
 
-	free(event);
+	agent_destroy_event(event);
 }
 
 /*
@@ -494,11 +494,14 @@ error:
 int agent_disable_event(struct agent_event *event,
 		enum lttng_domain_type domain)
 {
-	int ret;
+	int ret = LTTNG_OK;
 	struct agent_app *app;
 	struct lttng_ht_iter iter;
 
 	assert(event);
+	if (!event->enabled) {
+		goto end;
+	}
 
 	rcu_read_lock();
 
@@ -516,10 +519,10 @@ int agent_disable_event(struct agent_event *event,
 	}
 
 	event->enabled = 0;
-	ret = LTTNG_OK;
 
 error:
 	rcu_read_unlock();
+end:
 	return ret;
 }
 
@@ -781,33 +784,37 @@ error:
 }
 
 /*
- * Create a newly allocated agent event data structure. If name is valid, it's
- * copied into the created event.
+ * Create a newly allocated agent event data structure.
+ * Ownership of filter_expression is taken.
  *
  * Return a new object else NULL on error.
  */
 struct agent_event *agent_create_event(const char *name,
-		struct lttng_filter_bytecode *filter)
+		int loglevel, enum lttng_loglevel_type loglevel_type,
+		struct lttng_filter_bytecode *filter, char *filter_expression)
 {
-	struct agent_event *event;
+	struct agent_event *event = NULL;
 
 	DBG3("Agent create new event with name %s", name);
 
-	event = zmalloc(sizeof(*event));
-	if (!event) {
+	if (!name) {
+		ERR("Failed to create agent event; no name provided.");
 		goto error;
 	}
 
-	if (name) {
-		strncpy(event->name, name, sizeof(event->name));
-		event->name[sizeof(event->name) - 1] = '\0';
-		lttng_ht_node_init_str(&event->node, event->name);
+	event = zmalloc(sizeof(*event));
+	if (!event) {
+		goto error;
 	}
 
-	if (filter) {
-		event->filter = filter;
-	}
+	strncpy(event->name, name, sizeof(event->name));
+	event->name[sizeof(event->name) - 1] = '\0';
+	lttng_ht_node_init_str(&event->node, event->name);
 
+	event->loglevel = loglevel;
+	event->loglevel_type = loglevel_type;
+	event->filter = filter;
+	event->filter_expression = filter_expression;
 error:
 	return event;
 }
@@ -914,12 +921,13 @@ void agent_destroy_event(struct agent_event *event)
 	assert(event);
 
 	free(event->filter);
+	free(event->filter_expression);
+	free(event->exclusion);
 	free(event);
 }
 
 /*
- * Destroy an agent completely. Note that the given pointer is NOT freed
- * thus a reference to static or stack data can be passed to this function.
+ * Destroy an agent completely.
  */
 void agent_destroy(struct agent *agt)
 {
@@ -958,6 +966,7 @@ void agent_destroy(struct agent *agt)
 	rcu_read_unlock();
 
 	ht_cleanup_push(agt->events);
+	free(agt);
 }
 
 /*