X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.c;h=def13707bdf52fd40149dc0d9705393b4652b618;hp=ca2d4c872931632f4e5d46cb9c6b17b6b3d0d8ed;hb=a0ba721c2d0dd5eccf94bf210a85dcd255385c59;hpb=ab21818442628467073e8d2b303f6d5d78a090f5

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index ca2d4c872..def13707b 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -15,7 +15,6 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <urcu/uatomic.h>
@@ -103,6 +102,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);
@@ -117,14 +117,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:
@@ -145,7 +146,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),
@@ -163,7 +165,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);
 }
 
 /*
@@ -358,7 +360,9 @@ error:
 static int enable_event(struct agent_app *app, struct agent_event *event)
 {
 	int ret;
+	char *bytes_to_send;
 	uint64_t data_size;
+	size_t filter_expression_length;
 	uint32_t reply_ret_code;
 	struct lttcomm_agent_enable msg;
 	struct lttcomm_agent_generic_reply reply;
@@ -370,7 +374,16 @@ static int enable_event(struct agent_app *app, struct agent_event *event)
 	DBG2("Agent enabling event %s for app pid: %d and socket %d", event->name,
 			app->pid, app->sock->fd);
 
-	data_size = sizeof(msg);
+	/*
+	 * Calculate the payload's size, which is the fixed-size struct followed
+	 * by the variable-length filter expression (+1 for the ending \0).
+	 */
+	if (!event->filter_expression) {
+		filter_expression_length = 0;
+	} else {
+		filter_expression_length = strlen(event->filter_expression) + 1;
+	}
+	data_size = sizeof(msg) + filter_expression_length;
 
 	ret = send_header(app->sock, data_size, AGENT_CMD_ENABLE, 0);
 	if (ret < 0) {
@@ -378,10 +391,25 @@ 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));
+	msg.filter_expression_length = filter_expression_length;
+
+	bytes_to_send = zmalloc(data_size);
+	if (!bytes_to_send) {
+		ret = LTTNG_ERR_NOMEM;
+		goto error;
+	}
+
+	memcpy(bytes_to_send, &msg, sizeof(msg));
+	if (filter_expression_length > 0) {
+		memcpy(bytes_to_send + sizeof(msg), event->filter_expression,
+				filter_expression_length);
+	}
+
+	ret = send_payload(app->sock, bytes_to_send, data_size);
+	free(bytes_to_send);
 	if (ret < 0) {
 		goto error_io;
 	}
@@ -802,7 +830,7 @@ struct agent *agent_create(enum lttng_domain_type domain)
 	int ret;
 	struct agent *agt;
 
-	agt = zmalloc(sizeof(*agt));
+	agt = zmalloc(sizeof(struct agent));
 	if (!agt) {
 		goto error;
 	}
@@ -820,33 +848,38 @@ 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)
+		enum lttng_loglevel_type loglevel_type, int loglevel_value,
+		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);
+	DBG3("Agent create new event with name %s, loglevel type %d and loglevel value %d",
+		name, loglevel_type, loglevel_value);
 
-	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_value = loglevel_value;
+	event->loglevel_type = loglevel_type;
+	event->filter = filter;
+	event->filter_expression = filter_expression;
 error:
 	return event;
 }
@@ -861,58 +894,64 @@ void agent_add_event(struct agent_event *event, struct agent *agt)
 	assert(agt->events);
 
 	DBG3("Agent adding event %s", event->name);
-
-	rcu_read_lock();
 	add_unique_agent_event(agt->events, event);
-	rcu_read_unlock();
 	agt->being_used = 1;
 }
 
 /*
- * 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);
 }
 
 /*
  * Find a agent event in the given agent using name and loglevel.
  *
- * RCU read side lock MUST be acquired.
+ * RCU read side lock MUST be acquired. It must be kept for as long as
+ * the returned agent_event is used.
  *
  * 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;
@@ -926,7 +965,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);
@@ -954,12 +994,12 @@ void agent_destroy_event(struct agent_event *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)
 {
@@ -970,14 +1010,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;
@@ -998,6 +1030,7 @@ void agent_destroy(struct agent *agt)
 	rcu_read_unlock();
 
 	ht_cleanup_push(agt->events);
+	free(agt);
 }
 
 /*