X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.c;h=27e7d029c9e452bccd5874239fcb68c7767f6364;hb=9977104c16cb87b262dafafbf9f4be8342b91133;hp=10e8b1f3a89ca859478a95c6855223ba5e069ced;hpb=36c63cc406addb741983ae42684110b332b837ec;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index 10e8b1f3a..27e7d029c 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -89,6 +89,12 @@ static int ht_match_event(struct cds_lfht_node *node,
 		goto no_match;
 	}
 
+	/* Filter expression */
+	if (strncmp(event->filter_expression, key->filter_expression,
+			strlen(event->filter_expression)) != 0) {
+		goto no_match;
+	}
+
 	return 1;
 
 no_match:
@@ -111,6 +117,7 @@ static void add_unique_agent_event(struct lttng_ht *ht,
 	key.name = event->name;
 	key.loglevel_value = event->loglevel_value;
 	key.loglevel_type = event->loglevel_type;
+	key.filter_expression = event->filter_expression;
 
 	node_ptr = cds_lfht_add_unique(ht->ht,
 			ht->hash_fct(event->node.key, lttng_ht_seed),
@@ -292,8 +299,11 @@ static ssize_t list_events(struct agent_app *app, struct lttng_event **events)
 
 	for (i = 0; i < nb_event; i++) {
 		offset += len;
-		strncpy(tmp_events[i].name, reply->payload + offset,
-				sizeof(tmp_events[i].name));
+		if (lttng_strncpy(tmp_events[i].name, reply->payload + offset,
+				sizeof(tmp_events[i].name))) {
+			ret = LTTNG_ERR_INVALID;
+			goto error;
+		}
 		tmp_events[i].pid = app->pid;
 		tmp_events[i].enabled = -1;
 		len = strlen(reply->payload + offset) + 1;
@@ -396,14 +406,17 @@ static int disable_event(struct agent_app *app, struct agent_event *event)
 			app->pid, app->sock->fd);
 
 	data_size = sizeof(msg);
+	memset(&msg, 0, sizeof(msg));
+	if (lttng_strncpy(msg.name, event->name, sizeof(msg.name))) {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
 
 	ret = send_header(app->sock, data_size, AGENT_CMD_DISABLE, 0);
 	if (ret < 0) {
 		goto error_io;
 	}
 
-	memset(&msg, 0, sizeof(msg));
-	strncpy(msg.name, event->name, sizeof(msg.name));
 	ret = send_payload(app->sock, &msg, sizeof(msg));
 	if (ret < 0) {
 		goto error_io;
@@ -798,8 +811,10 @@ struct agent_event *agent_create_event(const char *name,
 {
 	struct agent_event *event = NULL;
 
-	DBG3("Agent create new event with name %s, loglevel type %d and loglevel value %d",
-		name, loglevel_type, loglevel_value);
+	DBG3("Agent create new event with name %s, loglevel type %d, \
+			loglevel value %d and filter %s",
+			name, loglevel_type, loglevel_value,
+			filter_expression ? filter_expression : "NULL");
 
 	if (!name) {
 		ERR("Failed to create agent event; no name provided.");
@@ -841,44 +856,51 @@ 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);
 }
 
 /*
- * Find a agent event in the given agent using name and loglevel.
+ * Find a agent event in the given agent using name, loglevel and filter.
  *
  * RCU read side lock MUST be acquired.
  *
@@ -886,7 +908,7 @@ error:
  */
 struct agent_event *agent_find_event(const char *name,
 		enum lttng_loglevel_type loglevel_type, int loglevel_value,
-		struct agent *agt)
+		char *filter_expression, struct agent *agt)
 {
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
@@ -901,6 +923,7 @@ struct agent_event *agent_find_event(const char *name,
 	key.name = name;
 	key.loglevel_value = loglevel_value;
 	key.loglevel_type = loglevel_type;
+	key.filter_expression = filter_expression;
 
 	cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed),
 			ht_match_event, &key, &iter.iter);