X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.c;h=3815491157a9c9c08cee588c364dcb643fc7d216;hb=695f70446965aeac8b1118bb08d572630c96114d;hp=f9d98ab1ead6cd2ec20467ce8f6f026073b2d0f9;hpb=d602bd6a8ee25d5ca662dde4edb3db3cabf264e1;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index f9d98ab1e..381549115 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -13,10 +13,13 @@
 
 #include <lttng/event-rule/event-rule.h>
 #include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/tracepoint.h>
+#include <lttng/event-rule/jul-logging.h>
+#include <lttng/event-rule/log4j-logging.h>
+#include <lttng/event-rule/python-logging.h>
 #include <lttng/condition/condition.h>
-#include <lttng/condition/event-rule.h>
+#include <lttng/condition/event-rule-matches.h>
 #include <lttng/domain-internal.h>
+#include <lttng/log-level-rule-internal.h>
 
 #include <common/common.h>
 #include <common/sessiond-comm/agent.h>
@@ -30,6 +33,12 @@
 
 #define AGENT_RET_CODE_INDEX(code) (code - AGENT_RET_CODE_SUCCESS)
 
+typedef enum lttng_event_rule_status (*event_rule_logging_get_name_pattern)(
+		const struct lttng_event_rule *rule, const char **pattern);
+typedef enum lttng_event_rule_status (*event_rule_logging_get_log_level_rule)(
+		const struct lttng_event_rule *rule,
+		const struct lttng_log_level_rule **log_level_rule);
+
 /*
  * Agent application context representation.
  */
@@ -676,7 +685,7 @@ int agent_enable_event(struct agent_event *event,
 
 	rcu_read_lock();
 
-	cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, app,
+	cds_lfht_for_each_entry(the_agent_apps_ht_by_sock->ht, &iter.iter, app,
 			node.node) {
 		if (app->domain != domain) {
 			continue;
@@ -751,7 +760,7 @@ int agent_enable_context(const struct lttng_event_context *ctx,
 
 	rcu_read_lock();
 
-	cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, app,
+	cds_lfht_for_each_entry(the_agent_apps_ht_by_sock->ht, &iter.iter, app,
 			node.node) {
 		struct agent_app_ctx *agent_ctx;
 
@@ -811,7 +820,7 @@ int agent_disable_event(struct agent_event *event,
 
 	rcu_read_lock();
 
-	cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, app,
+	cds_lfht_for_each_entry(the_agent_apps_ht_by_sock->ht, &iter.iter, app,
 			node.node) {
 		if (app->domain != domain) {
 			continue;
@@ -851,7 +860,7 @@ static int disable_context(struct agent_app_ctx *ctx,
 	rcu_read_lock();
 	DBG2("Disabling agent application context %s:%s",
 			ctx->provider_name, ctx->ctx_name);
-	cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, app,
+	cds_lfht_for_each_entry(the_agent_apps_ht_by_sock->ht, &iter.iter, app,
 			node.node) {
 		if (app->domain != domain) {
 			continue;
@@ -895,7 +904,7 @@ int agent_list_events(struct lttng_event **events,
 	}
 
 	rcu_read_lock();
-	cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, app,
+	cds_lfht_for_each_entry(the_agent_apps_ht_by_sock->ht, &iter.iter, app,
 			node.node) {
 		ssize_t nb_ev;
 		struct lttng_event *agent_events;
@@ -993,7 +1002,8 @@ struct agent_app *agent_find_app_by_sock(int sock)
 
 	assert(sock >= 0);
 
-	lttng_ht_lookup(agent_apps_ht_by_sock, (void *)((unsigned long) sock), &iter);
+	lttng_ht_lookup(the_agent_apps_ht_by_sock,
+			(void *) ((unsigned long) sock), &iter);
 	node = lttng_ht_iter_get_node_ulong(&iter);
 	if (node == NULL) {
 		goto error;
@@ -1016,7 +1026,7 @@ void agent_add_app(struct agent_app *app)
 	assert(app);
 
 	DBG3("Agent adding app sock: %d and pid: %d to ht", app->sock->fd, app->pid);
-	lttng_ht_add_unique_ulong(agent_apps_ht_by_sock, &app->node);
+	lttng_ht_add_unique_ulong(the_agent_apps_ht_by_sock, &app->node);
 }
 
 /*
@@ -1034,7 +1044,7 @@ void agent_delete_app(struct agent_app *app)
 	DBG3("Agent deleting app pid: %d and sock: %d", app->pid, app->sock->fd);
 
 	iter.iter.node = &app->node.node;
-	ret = lttng_ht_del(agent_apps_ht_by_sock, &iter);
+	ret = lttng_ht_del(the_agent_apps_ht_by_sock, &iter);
 	assert(!ret);
 }
 
@@ -1243,9 +1253,12 @@ struct agent_event *agent_find_event_by_trigger(
 	const struct lttng_event_rule *rule;
 	const char *name;
 	const char *filter_expression;
+	const struct lttng_log_level_rule *log_level_rule;
 	/* Unused when loglevel_type is 'ALL'. */
 	int loglevel_value = 0;
 	enum lttng_loglevel_type loglevel_type;
+	event_rule_logging_get_name_pattern logging_get_name_pattern;
+	event_rule_logging_get_log_level_rule logging_get_log_level_rule;
 
 	assert(agt);
 	assert(agt->events);
@@ -1253,33 +1266,56 @@ struct agent_event *agent_find_event_by_trigger(
 	condition = lttng_trigger_get_const_condition(trigger);
 
 	assert(lttng_condition_get_type(condition) ==
-			LTTNG_CONDITION_TYPE_ON_EVENT);
+			LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
 
-	c_status = lttng_condition_on_event_get_rule(condition, &rule);
+	c_status = lttng_condition_event_rule_matches_get_rule(
+			condition, &rule);
 	assert(c_status == LTTNG_CONDITION_STATUS_OK);
 
-	assert(lttng_event_rule_get_type(rule) ==
-			LTTNG_EVENT_RULE_TYPE_TRACEPOINT);
+	switch (lttng_event_rule_get_type(rule)) {
+	case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+		logging_get_name_pattern =
+				lttng_event_rule_jul_logging_get_name_pattern;
+		logging_get_log_level_rule =
+				lttng_event_rule_jul_logging_get_log_level_rule;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+		logging_get_name_pattern =
+				lttng_event_rule_log4j_logging_get_name_pattern;
+		logging_get_log_level_rule =
+				lttng_event_rule_log4j_logging_get_log_level_rule;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+		logging_get_name_pattern =
+				lttng_event_rule_python_logging_get_name_pattern;
+		logging_get_log_level_rule =
+				lttng_event_rule_python_logging_get_log_level_rule;
+		break;
+	default:
+		abort();
+		break;
+	}
 
 	domain = lttng_event_rule_get_domain_type(rule);
 	assert(domain == LTTNG_DOMAIN_JUL || domain == LTTNG_DOMAIN_LOG4J ||
 			domain == LTTNG_DOMAIN_PYTHON);
 
-	/* Get the event's pattern ('name' in the legacy terminology). */
-	er_status = lttng_event_rule_tracepoint_get_pattern(rule, &name);
+	/* Get the event's pattern name ('name' in the legacy terminology). */
+	er_status = logging_get_name_pattern(rule, &name);
 	assert(er_status == LTTNG_EVENT_RULE_STATUS_OK);
 
 	/* Get the internal filter expression. */
 	filter_expression = lttng_event_rule_get_filter(rule);
 
-	er_status = lttng_event_rule_tracepoint_get_log_level_type(
-			rule, &loglevel_type);
-	assert(er_status == LTTNG_EVENT_RULE_STATUS_OK);
-
-	if (loglevel_type != LTTNG_EVENT_LOGLEVEL_ALL) {
-		er_status = lttng_event_rule_tracepoint_get_log_level(
-				rule, &loglevel_value);
-		assert(er_status == LTTNG_EVENT_RULE_STATUS_OK);
+	/* Map log_level_rule to loglevel value. */
+	er_status = logging_get_log_level_rule(rule, &log_level_rule);
+	if (er_status == LTTNG_EVENT_RULE_STATUS_UNSET) {
+		loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
+		loglevel_value = 0;
+	} else if (er_status == LTTNG_EVENT_RULE_STATUS_OK) {
+		lttng_log_level_rule_to_loglevel(log_level_rule, &loglevel_type, &loglevel_value);
+	} else {
+		abort();
 	}
 
 	return agent_find_event(name, loglevel_type, loglevel_value,
@@ -1419,8 +1455,8 @@ void agent_destroy(struct agent *agt)
  */
 int agent_app_ht_alloc(void)
 {
-	agent_apps_ht_by_sock = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
-	return agent_apps_ht_by_sock ? 0 : -1;
+	the_agent_apps_ht_by_sock = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
+	return the_agent_apps_ht_by_sock ? 0 : -1;
 }
 
 /*
@@ -1457,11 +1493,12 @@ void agent_app_ht_clean(void)
 	struct lttng_ht_node_ulong *node;
 	struct lttng_ht_iter iter;
 
-	if (!agent_apps_ht_by_sock) {
+	if (!the_agent_apps_ht_by_sock) {
 		return;
 	}
 	rcu_read_lock();
-	cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, node, node) {
+	cds_lfht_for_each_entry(
+			the_agent_apps_ht_by_sock->ht, &iter.iter, node, node) {
 		struct agent_app *app;
 
 		app = caa_container_of(node, struct agent_app, node);
@@ -1469,7 +1506,7 @@ void agent_app_ht_clean(void)
 	}
 	rcu_read_unlock();
 
-	lttng_ht_destroy(agent_apps_ht_by_sock);
+	lttng_ht_destroy(the_agent_apps_ht_by_sock);
 }
 
 /*
@@ -1530,8 +1567,8 @@ void agent_update(const struct agent *agt, const struct agent_app *app)
  */
 int agent_by_event_notifier_domain_ht_create(void)
 {
-	trigger_agents_ht_by_domain = lttng_ht_new(0, LTTNG_HT_TYPE_U64);
-	return trigger_agents_ht_by_domain ? 0 : -1;
+	the_trigger_agents_ht_by_domain = lttng_ht_new(0, LTTNG_HT_TYPE_U64);
+	return the_trigger_agents_ht_by_domain ? 0 : -1;
 }
 
 /*
@@ -1542,24 +1579,24 @@ void agent_by_event_notifier_domain_ht_destroy(void)
 	struct lttng_ht_node_u64 *node;
 	struct lttng_ht_iter iter;
 
-	if (!trigger_agents_ht_by_domain) {
+	if (!the_trigger_agents_ht_by_domain) {
 		return;
 	}
 
 	rcu_read_lock();
-	cds_lfht_for_each_entry (trigger_agents_ht_by_domain->ht, &iter.iter,
-			node, node) {
+	cds_lfht_for_each_entry(the_trigger_agents_ht_by_domain->ht,
+			&iter.iter, node, node) {
 		struct agent *agent =
 				caa_container_of(node, struct agent, node);
 		const int ret = lttng_ht_del(
-				trigger_agents_ht_by_domain, &iter);
+				the_trigger_agents_ht_by_domain, &iter);
 
 		assert(ret == 0);
 		agent_destroy(agent);
 	}
 
 	rcu_read_unlock();
-	lttng_ht_destroy(trigger_agents_ht_by_domain);
+	lttng_ht_destroy(the_trigger_agents_ht_by_domain);
 }
 
 struct agent *agent_find_by_event_notifier_domain(
@@ -1570,12 +1607,12 @@ struct agent *agent_find_by_event_notifier_domain(
 	struct lttng_ht_iter iter;
 	const uint64_t key = (uint64_t) domain_type;
 
-	assert(trigger_agents_ht_by_domain);
+	assert(the_trigger_agents_ht_by_domain);
 
 	DBG3("Per-event notifier domain agent lookup for domain '%s'",
 			lttng_domain_type_str(domain_type));
 
-	lttng_ht_lookup(trigger_agents_ht_by_domain, &key, &iter);
+	lttng_ht_lookup(the_trigger_agents_ht_by_domain, &key, &iter);
 	node = lttng_ht_iter_get_node_u64(&iter);
 	if (!node) {
 		goto end;