X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.c;h=c438191658b848a98ea8ff6172b7a6b3c873b36a;hb=51755dc8c7607233c5f62b7931326d7d95df7910;hp=0821630865106182365cd404fecaf0cd9bcb64cc;hpb=46414153463abe07cd1c4a2a1855a63a60af8aa5;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index 082163086..c43819165 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -820,33 +820,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;
 }
@@ -951,6 +955,7 @@ void agent_destroy_event(struct agent_event *event)
 
 	free(event->filter);
 	free(event->filter_expression);
+	free(event->exclusion);
 	free(event);
 }
 
@@ -967,14 +972,6 @@ void agent_destroy(struct agent *agt)
 
 	DBG3("Agent destroy");
 
-	/*
-	 * Just ignore if no events hash table exists. This is possible if for
-	 * instance an agent object was allocated but not initialized.
-	 */
-	if (!agt->events) {
-		return;
-	}
-
 	rcu_read_lock();
 	cds_lfht_for_each_entry(agt->events->ht, &iter.iter, node, node) {
 		int ret;