X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.c;h=eed7e68c6d264dfcd2f5a3c33f92d2804cd47def;hb=8bee8347c596eb567bf279010223acb601120f15;hp=4342c94db96adc2955c1070d92cf8d6e81592dd6;hpb=0a3fca4d597b02143affd90d50aa33409709024a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index 4342c94db..eed7e68c6 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -65,6 +65,7 @@ static int ht_match_event(struct cds_lfht_node *node,
 {
 	struct agent_event *event;
 	const struct agent_ht_key *key;
+	int ll_match;
 
 	assert(node);
 	assert(_key);
@@ -79,14 +80,15 @@ static int ht_match_event(struct cds_lfht_node *node,
 		goto no_match;
 	}
 
-	if (event->loglevel != key->loglevel) {
-		if (event->loglevel_type == LTTNG_EVENT_LOGLEVEL_ALL &&
-				key->loglevel == 0 && event->loglevel == -1) {
-			goto match;
-		}
+	/* Event loglevel value and type. */
+	ll_match = loglevels_match(event->loglevel_type,
+		event->loglevel_value, key->loglevel_type,
+		key->loglevel_value, LTTNG_EVENT_LOGLEVEL_ALL);
+
+	if (!ll_match) {
 		goto no_match;
 	}
-match:
+
 	return 1;
 
 no_match:
@@ -107,7 +109,8 @@ static void add_unique_agent_event(struct lttng_ht *ht,
 	assert(event);
 
 	key.name = event->name;
-	key.loglevel = event->loglevel;
+	key.loglevel_value = event->loglevel_value;
+	key.loglevel_type = event->loglevel_type;
 
 	node_ptr = cds_lfht_add_unique(ht->ht,
 			ht->hash_fct(event->node.key, lttng_ht_seed),
@@ -125,7 +128,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);
 }
 
 /*
@@ -338,7 +341,7 @@ static int enable_event(struct agent_app *app, struct agent_event *event)
 	}
 
 	memset(&msg, 0, sizeof(msg));
-	msg.loglevel = event->loglevel;
+	msg.loglevel_value = event->loglevel_value;
 	msg.loglevel_type = event->loglevel_type;
 	strncpy(msg.name, event->name, sizeof(msg.name));
 	ret = send_payload(app->sock, &msg, sizeof(msg));
@@ -790,12 +793,13 @@ error:
  * Return a new object else NULL on error.
  */
 struct agent_event *agent_create_event(const char *name,
-		int loglevel, enum lttng_loglevel_type loglevel_type,
+		enum lttng_loglevel_type loglevel_type, int loglevel_value,
 		struct lttng_filter_bytecode *filter, char *filter_expression)
 {
 	struct agent_event *event = NULL;
 
-	DBG3("Agent create new event with name %s", name);
+	DBG3("Agent create new event with name %s, loglevel type %d and loglevel value %d",
+		name, loglevel_type, loglevel_value);
 
 	if (!name) {
 		ERR("Failed to create agent event; no name provided.");
@@ -811,7 +815,7 @@ struct agent_event *agent_create_event(const char *name,
 	event->name[sizeof(event->name) - 1] = '\0';
 	lttng_ht_node_init_str(&event->node, event->name);
 
-	event->loglevel = loglevel;
+	event->loglevel_value = loglevel_value;
 	event->loglevel_type = loglevel_type;
 	event->filter = filter;
 	event->filter_expression = filter_expression;
@@ -837,40 +841,47 @@ void agent_add_event(struct agent_event *event, struct agent *agt)
 }
 
 /*
- * Find a agent event in the given agent using name.
+ * Find multiple agent events sharing the given name.
  *
- * RCU read side lock MUST be acquired.
+ * RCU read side lock MUST be acquired. It must be held for the
+ * duration of the iteration.
  *
- * Return object if found else NULL.
+ * Sets the given iterator.
  */
-struct agent_event *agent_find_event_by_name(const char *name,
-		struct agent *agt)
+void agent_find_events_by_name(const char *name, struct agent *agt,
+		struct lttng_ht_iter* iter)
 {
-	struct lttng_ht_node_str *node;
-	struct lttng_ht_iter iter;
 	struct lttng_ht *ht;
 	struct agent_ht_key key;
 
 	assert(name);
 	assert(agt);
 	assert(agt->events);
+	assert(iter);
 
 	ht = agt->events;
 	key.name = name;
 
 	cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed),
-			ht_match_event_by_name, &key, &iter.iter);
-	node = lttng_ht_iter_get_node_str(&iter);
-	if (node == NULL) {
-		goto error;
-	}
+			ht_match_event_by_name, &key, &iter->iter);
+}
 
-	DBG3("Agent event found %s by name.", name);
-	return caa_container_of(node, struct agent_event, node);
+/*
+ * Get the next agent event duplicate by name. This should be called
+ * after a call to agent_find_events_by_name() to iterate on events.
+ *
+ * The RCU read lock must be held during the iteration and for as long
+ * as the object the iterator points to remains in use.
+ */
+void agent_event_next_duplicate(const char *name,
+		struct agent *agt, struct lttng_ht_iter* iter)
+{
+	struct agent_ht_key key;
 
-error:
-	DBG3("Agent NOT found by name %s.", name);
-	return NULL;
+	key.name = name;
+
+	cds_lfht_next_duplicate(agt->events->ht, ht_match_event_by_name,
+		&key, &iter->iter);
 }
 
 /*
@@ -880,7 +891,8 @@ error:
  *
  * Return object if found else NULL.
  */
-struct agent_event *agent_find_event(const char *name, int loglevel,
+struct agent_event *agent_find_event(const char *name,
+		enum lttng_loglevel_type loglevel_type, int loglevel_value,
 		struct agent *agt)
 {
 	struct lttng_ht_node_str *node;
@@ -894,7 +906,8 @@ struct agent_event *agent_find_event(const char *name, int loglevel,
 
 	ht = agt->events;
 	key.name = name;
-	key.loglevel = loglevel;
+	key.loglevel_value = loglevel_value;
+	key.loglevel_type = loglevel_type;
 
 	cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed),
 			ht_match_event, &key, &iter.iter);
@@ -927,8 +940,7 @@ void agent_destroy_event(struct agent_event *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)
 {
@@ -967,6 +979,7 @@ void agent_destroy(struct agent *agt)
 	rcu_read_unlock();
 
 	ht_cleanup_push(agt->events);
+	free(agt);
 }
 
 /*