X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=0a46ffb4bc0fb338c7b47af262dc49c14df5ec46;hp=c0e2014aecaf33205da24203d0d03bcf10d305be;hb=3968741092cac3eaf33f7bf558bb2b476189470b;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index c0e2014ae..0a46ffb4b 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2 only,
@@ -23,6 +24,8 @@
 #include <lttng/lttng.h>
 #include <common/error.h>
 #include <common/sessiond-comm/sessiond-comm.h>
+#include <common/filter.h>
+#include <common/context.h>
 
 #include "channel.h"
 #include "event.h"
@@ -116,23 +119,11 @@ int event_kernel_enable_event(struct ltt_kernel_channel *kchan,
 	kevent = trace_kernel_find_event(event->name, kchan,
 			event->type, filter);
 	if (kevent == NULL) {
-		ret = kernel_create_event(event, kchan,
-			filter_expression, filter);
+		ret = kernel_create_event(event, kchan, filter_expression, filter);
 		/* We have passed ownership */
 		filter_expression = NULL;
 		filter = NULL;
-		if (ret < 0) {
-			switch (-ret) {
-			case EEXIST:
-				ret = LTTNG_ERR_KERN_EVENT_EXIST;
-				break;
-			case ENOSYS:
-				ret = LTTNG_ERR_KERN_EVENT_ENOSYS;
-				break;
-			default:
-				ret = LTTNG_ERR_KERN_ENABLE_FAIL;
-				break;
-			}
+		if (ret) {
 			goto end;
 		}
 	} else if (kevent->enabled == 0) {
@@ -171,7 +162,7 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 		struct lttng_event_exclusion *exclusion,
 		bool internal_event)
 {
-	int ret = LTTNG_OK, to_create = 0;
+	int ret, to_create = 0;
 	struct ltt_ust_event *uevent;
 
 	assert(usess);
@@ -183,14 +174,13 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 	uevent = trace_ust_find_event(uchan->events, event->name, filter,
 			event->loglevel_type, event->loglevel, exclusion);
 	if (!uevent) {
-		uevent = trace_ust_create_event(event, filter_expression,
-				filter, exclusion, internal_event);
+		ret = trace_ust_create_event(event, filter_expression,
+				filter, exclusion, internal_event, &uevent);
 		/* We have passed ownership */
 		filter_expression = NULL;
 		filter = NULL;
 		exclusion = NULL;
-		if (uevent == NULL) {
-			ret = LTTNG_ERR_UST_ENABLE_FAIL;
+		if (ret != LTTNG_OK) {
 			goto error;
 		}
 
@@ -416,6 +406,70 @@ error:
 	return ret;
 }
 
+/*
+ * Check if this event's filter requires the activation of application contexts
+ * and enable them in the agent.
+ * TODO: bytecode iterator does not support non-legacy application
+ * contexts yet. Not an issue for now, since they are not generated by
+ * the lttng-ctl library.
+ */
+static int add_filter_app_ctx(struct lttng_filter_bytecode *bytecode,
+		const char *filter_expression, struct agent *agt)
+{
+	int ret = LTTNG_OK;
+	char *provider_name = NULL, *ctx_name = NULL;
+	struct bytecode_symbol_iterator *it =
+			bytecode_symbol_iterator_create(bytecode);
+
+	if (!it) {
+		ret = LTTNG_ERR_NOMEM;
+		goto end;
+	}
+
+	do {
+		struct lttng_event_context ctx;
+		const char *symbol_name =
+				bytecode_symbol_iterator_get_name(it);
+
+		if (parse_application_context(symbol_name, &provider_name,
+				&ctx_name)) {
+			/* Not an application context. */
+			continue;
+		}
+
+		ctx.ctx = LTTNG_EVENT_CONTEXT_APP_CONTEXT;
+		ctx.u.app_ctx.provider_name = provider_name;
+		ctx.u.app_ctx.ctx_name = ctx_name;
+
+		/* Recognized an application context. */
+		DBG("Enabling event with filter expression \"%s\" requires enabling the %s:%s application context.",
+				filter_expression, provider_name, ctx_name);
+
+		ret = agent_add_context(&ctx, agt);
+		if (ret != LTTNG_OK) {
+			ERR("Failed to add application context %s:%s.",
+					provider_name, ctx_name);
+			goto end;
+		}
+
+		ret = agent_enable_context(&ctx, agt->domain);
+		if (ret != LTTNG_OK) {
+			ERR("Failed to enable application context %s:%s.",
+					provider_name, ctx_name);
+			goto end;
+		}
+
+		free(provider_name);
+		free(ctx_name);
+		provider_name = ctx_name = NULL;
+	} while (bytecode_symbol_iterator_next(it) == 0);
+end:
+	free(provider_name);
+	free(ctx_name);
+	bytecode_symbol_iterator_destroy(it);
+	return ret;
+}
+
 /*
  * Enable a single agent event for a given UST session.
  *
@@ -439,7 +493,7 @@ int event_agent_enable(struct ltt_ust_session *usess,
 			filter_expression ? filter_expression : "NULL");
 
 	aevent = agent_find_event(event->name, event->loglevel_type,
-		event->loglevel, agt);
+			event->loglevel, filter_expression, agt);
 	if (!aevent) {
 		aevent = agent_create_event(event->name, event->loglevel_type,
 				event->loglevel, filter,
@@ -448,6 +502,7 @@ int event_agent_enable(struct ltt_ust_session *usess,
 			ret = LTTNG_ERR_NOMEM;
 			goto error;
 		}
+
 		created = 1;
 	}
 
@@ -456,6 +511,13 @@ int event_agent_enable(struct ltt_ust_session *usess,
 		goto end;
 	}
 
+	if (created && filter) {
+		ret = add_filter_app_ctx(filter, filter_expression, agt);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+	}
+
 	ret = agent_enable_event(aevent, agt->domain);
 	if (ret != LTTNG_OK) {
 		goto error;