X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=3db3089b66f203d0afbf0aec432933d6a772d3e0;hp=0af7b4cb2f944288a1107b7b6ea50ff2383dcf76;hb=6c1c0768320135c6936c371b09731851b508c023;hpb=7972aab22f74b18faa168c0482216a3dd711a075

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 0af7b4cb2..3db3089b6 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <errno.h>
 #include <urcu/list.h>
 #include <string.h>
@@ -27,6 +28,7 @@
 #include "channel.h"
 #include "event.h"
 #include "kernel.h"
+#include "lttng-sessiond.h"
 #include "ust-ctl.h"
 #include "ust-app.h"
 #include "trace-kernel.h"
@@ -48,6 +50,7 @@ static void add_unique_ust_event(struct lttng_ht *ht,
 	key.name = event->attr.name;
 	key.filter = (struct lttng_filter_bytecode *) event->filter;
 	key.loglevel = event->attr.loglevel;
+	key.exclusion = event->exclusion;
 
 	node_ptr = cds_lfht_add_unique(ht->ht,
 			ht->hash_fct(event->node.key, lttng_ht_seed),
@@ -55,21 +58,6 @@ static void add_unique_ust_event(struct lttng_ht *ht,
 	assert(node_ptr == &event->node.node);
 }
 
-/*
- * Setup a lttng_event used to enable *all* syscall tracing.
- */
-static void init_syscalls_kernel_event(struct lttng_event *event)
-{
-	assert(event);
-
-	event->name[0] = '\0';
-	/*
-	 * We use LTTNG_EVENT* here since the trace kernel creation will make the
-	 * right changes for the kernel.
-	 */
-	event->type = LTTNG_EVENT_SYSCALL;
-}
-
 /*
  * Disable kernel tracepoint event for a channel from the kernel session.
  */
@@ -102,6 +90,57 @@ error:
 	return ret;
 }
 
+/*
+ * Enable kernel system call for a channel from the kernel session.
+ */
+int event_kernel_enable_syscall(struct ltt_kernel_channel *kchan,
+		char *syscall_name)
+{
+	int ret;
+
+	assert(kchan);
+
+	ret = kernel_enable_syscall(syscall_name, kchan);
+	if (ret < 0) {
+		ret = LTTNG_ERR_KERN_ENABLE_FAIL;
+		goto error;
+	}
+
+	DBG("Kernel event %s enable for channel %s.",
+			syscall_name, kchan->channel->name);
+
+	ret = LTTNG_OK;
+
+error:
+	return ret;
+}
+
+/*
+ * Disable kernel system call for a channel from the kernel session.
+ */
+int event_kernel_disable_syscall(struct ltt_kernel_channel *kchan,
+		char *syscall_name)
+{
+	int ret;
+
+	assert(kchan);
+
+	ret = kernel_disable_syscall(syscall_name, kchan);
+	if (ret < 0) {
+		ret = LTTNG_ERR_KERN_DISABLE_FAIL;
+		goto error;
+	}
+
+	DBG("Kernel syscall %s disable for channel %s.",
+			syscall_name[0] == '\0' ? "<all>" : syscall_name,
+			kchan->channel->name);
+
+	ret = LTTNG_OK;
+
+error:
+	return ret;
+}
+
 /*
  * Disable kernel tracepoint events for a channel from the kernel session.
  */
@@ -124,15 +163,6 @@ int event_kernel_disable_all_tracepoints(struct ltt_kernel_channel *kchan)
 	return ret;
 }
 
-/*
- * Disable kernel syscall events for a channel from the kernel session.
- */
-int event_kernel_disable_all_syscalls(struct ltt_kernel_channel *kchan)
-{
-	ERR("Cannot disable syscall tracing for existing session. Please destroy session instead.");
-	return LTTNG_OK;	/* Return OK so disable all succeeds */
-}
-
 /*
  * Disable all kernel event for a channel from the kernel session.
  */
@@ -145,7 +175,7 @@ int event_kernel_disable_all(struct ltt_kernel_channel *kchan)
 	ret = event_kernel_disable_all_tracepoints(kchan);
 	if (ret != LTTNG_OK)
 		return ret;
-	ret = event_kernel_disable_all_syscalls(kchan);
+	ret = event_kernel_disable_syscall(kchan, "");
 	return ret;
 }
 
@@ -243,36 +273,6 @@ end:
 	return ret;
 }
 
-/*
- * Enable all kernel tracepoint events of a channel of the kernel session.
- */
-int event_kernel_enable_all_syscalls(struct ltt_kernel_channel *kchan,
-		int kernel_tracer_fd)
-{
-	int ret;
-	struct lttng_event event;
-
-	assert(kchan);
-
-	init_syscalls_kernel_event(&event);
-
-	DBG("Enabling all syscall tracing");
-
-	ret = kernel_create_event(&event, kchan);
-	if (ret < 0) {
-		if (ret == -EEXIST) {
-			ret = LTTNG_ERR_KERN_EVENT_EXIST;
-		} else {
-			ret = LTTNG_ERR_KERN_ENABLE_FAIL;
-		}
-		goto end;
-	}
-
-	ret = LTTNG_OK;
-end:
-	return ret;
-}
-
 /*
  * Enable all kernel events of a channel of the kernel session.
  */
@@ -297,7 +297,7 @@ int event_kernel_enable_all(struct ltt_kernel_channel *kchan,
 	 * tracepoints did not fail. Future work will allow us to send back
 	 * multiple errors to the client in one API call.
 	 */
-	(void) event_kernel_enable_all_syscalls(kchan, kernel_tracer_fd);
+	(void) event_kernel_enable_syscall(kchan, "");
 
 end:
 	return tp_ret;
@@ -313,7 +313,9 @@ end:
  * Enable all UST tracepoints for a channel from a UST session.
  */
 int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
-		struct ltt_ust_channel *uchan, struct lttng_filter_bytecode *filter)
+		struct ltt_ust_channel *uchan,
+		char *filter_expression,
+		struct lttng_filter_bytecode *filter)
 {
 	int ret, i, size;
 	struct lttng_ht_iter iter;
@@ -350,7 +352,7 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
 		 * previously.
 		 */
 		uevent = trace_ust_find_event(uchan->events, events[i].name, filter,
-				events[i].loglevel);
+				events[i].loglevel, NULL);
 		if (uevent != NULL) {
 			ret = ust_app_enable_event_pid(usess, uchan, uevent,
 					events[i].pid);
@@ -364,7 +366,8 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
 		}
 
 		/* Create ust event */
-		uevent = trace_ust_create_event(&events[i], filter);
+		uevent = trace_ust_create_event(&events[i], filter_expression,
+			filter, NULL);
 		if (uevent == NULL) {
 			ret = LTTNG_ERR_FATAL;
 			goto error_destroy;
@@ -408,7 +411,9 @@ error:
  */
 int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct lttng_event *event,
-		struct lttng_filter_bytecode *filter)
+		char *filter_expression,
+		struct lttng_filter_bytecode *filter,
+		struct lttng_event_exclusion *exclusion)
 {
 	int ret = LTTNG_OK, to_create = 0;
 	struct ltt_ust_event *uevent;
@@ -420,9 +425,10 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 	rcu_read_lock();
 
 	uevent = trace_ust_find_event(uchan->events, event->name, filter,
-			event->loglevel);
+			event->loglevel, exclusion);
 	if (uevent == NULL) {
-		uevent = trace_ust_create_event(event, filter);
+		uevent = trace_ust_create_event(event, filter_expression,
+			filter, exclusion);
 		if (uevent == NULL) {
 			ret = LTTNG_ERR_UST_ENABLE_FAIL;
 			goto error;
@@ -527,8 +533,7 @@ int event_ust_disable_tracepoint(struct ltt_ust_session *usess,
 
 		if (uevent->enabled == 0) {
 			/* It's already disabled so everything is OK */
-			ret = LTTNG_OK;
-			continue;
+			goto next;
 		}
 
 		ret = ust_app_disable_event_glb(usess, uchan, uevent);
@@ -541,6 +546,7 @@ int event_ust_disable_tracepoint(struct ltt_ust_session *usess,
 		DBG2("Event UST %s disabled in channel %s", uevent->attr.name,
 				uchan->name);
 
+next:
 		/* Get next duplicate event by name. */
 		cds_lfht_next_duplicate(ht->ht, trace_ust_ht_match_event_by_name,
 				event_name, &iter.iter);
@@ -607,3 +613,268 @@ error:
 	rcu_read_unlock();
 	return ret;
 }
+
+/*
+ * Enable all agent event for a given UST session.
+ *
+ * Return LTTNG_OK on success or else a LTTNG_ERR* code.
+ */
+int event_agent_enable_all(struct ltt_ust_session *usess,
+		struct agent *agt, struct lttng_event *event,
+		struct lttng_filter_bytecode *filter)
+{
+	int ret;
+	struct agent_event *aevent;
+	struct lttng_ht_iter iter;
+
+	assert(usess);
+
+	DBG("Event agent enabling ALL events for session %" PRIu64, usess->id);
+
+	/* Enable event on agent application through TCP socket. */
+	ret = event_agent_enable(usess, agt, event, filter);
+	if (ret != LTTNG_OK) {
+		goto error;
+	}
+
+	/* Flag every event that they are now enabled. */
+	rcu_read_lock();
+	cds_lfht_for_each_entry(agt->events->ht, &iter.iter, aevent,
+			node.node) {
+		aevent->enabled = 1;
+	}
+	rcu_read_unlock();
+
+	ret = LTTNG_OK;
+
+error:
+	return ret;
+}
+
+/*
+ * Enable a single agent event for a given UST session.
+ *
+ * Return LTTNG_OK on success or else a LTTNG_ERR* code.
+ */
+int event_agent_enable(struct ltt_ust_session *usess,
+		struct agent *agt, struct lttng_event *event,
+		struct lttng_filter_bytecode *filter)
+{
+	int ret, created = 0;
+	struct agent_event *aevent;
+
+	assert(usess);
+	assert(event);
+	assert(agt);
+
+	DBG("Event agent enabling %s for session %" PRIu64 " with loglevel type %d "
+			"and loglevel %d", event->name, usess->id, event->loglevel_type,
+			event->loglevel);
+
+	aevent = agent_find_event(event->name, event->loglevel, agt);
+	if (!aevent) {
+		aevent = agent_create_event(event->name, filter);
+		if (!aevent) {
+			ret = LTTNG_ERR_NOMEM;
+			goto error;
+		}
+		aevent->loglevel = event->loglevel;
+		aevent->loglevel_type = event->loglevel_type;
+		created = 1;
+	}
+
+	/* Already enabled? */
+	if (aevent->enabled) {
+		goto end;
+	}
+
+	ret = agent_enable_event(aevent, agt->domain);
+	if (ret != LTTNG_OK) {
+		goto error;
+	}
+
+	/* If the event was created prior to the enable, add it to the domain. */
+	if (created) {
+		agent_add_event(aevent, agt);
+	}
+
+end:
+	return LTTNG_OK;
+
+error:
+	if (created) {
+		agent_destroy_event(aevent);
+	}
+	return ret;
+}
+
+/*
+ * Return the agent default event name to use by testing if the process is root
+ * or not. Return NULL on error.
+ */
+const char *event_get_default_agent_ust_name(enum lttng_domain_type domain)
+{
+	const char *default_event_name = NULL;
+
+	switch (domain) {
+	case LTTNG_DOMAIN_LOG4J:
+		if (is_root) {
+			default_event_name = DEFAULT_SYS_LOG4J_EVENT_NAME;
+		} else {
+			default_event_name = DEFAULT_USER_LOG4J_EVENT_NAME;
+		}
+		break;
+	case LTTNG_DOMAIN_JUL:
+		if (is_root) {
+			default_event_name = DEFAULT_SYS_JUL_EVENT_NAME;
+		} else {
+			default_event_name = DEFAULT_USER_JUL_EVENT_NAME;
+		}
+		break;
+	case LTTNG_DOMAIN_PYTHON:
+		default_event_name = DEFAULT_USER_PYTHON_EVENT_NAME;
+		break;
+	default:
+		assert(0);
+	}
+
+	return default_event_name;
+}
+
+/*
+ * Disable a single agent event for a given UST session.
+ *
+ * Return LTTNG_OK on success or else a LTTNG_ERR* code.
+ */
+int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt,
+		char *event_name)
+{
+	int ret;
+	struct agent_event *aevent;
+	struct ltt_ust_event *uevent = NULL;
+	struct ltt_ust_channel *uchan = NULL;
+	const char *ust_event_name, *ust_channel_name;
+
+	assert(agt);
+	assert(usess);
+	assert(event_name);
+
+	DBG("Event agent disabling %s for session %" PRIu64, event_name, usess->id);
+
+	aevent = agent_find_event_by_name(event_name, agt);
+	if (!aevent) {
+		ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
+		goto error;
+	}
+
+	/* Already disabled? */
+	if (!aevent->enabled) {
+		goto end;
+	}
+
+	if (agt->domain == LTTNG_DOMAIN_JUL) {
+		ust_channel_name = DEFAULT_JUL_CHANNEL_NAME;
+	} else if (agt->domain == LTTNG_DOMAIN_LOG4J) {
+		ust_channel_name = DEFAULT_LOG4J_CHANNEL_NAME;
+	} else if (agt->domain == LTTNG_DOMAIN_PYTHON) {
+		ust_channel_name = DEFAULT_PYTHON_CHANNEL_NAME;
+	} else {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
+
+	/*
+	 * Disable it on the UST side. First get the channel reference then find
+	 * the event and finally disable it.
+	 */
+	uchan = trace_ust_find_channel_by_name(usess->domain_global.channels,
+			(char *) ust_channel_name);
+	if (!uchan) {
+		ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+		goto error;
+	}
+
+	ust_event_name = event_get_default_agent_ust_name(agt->domain);
+	if (!ust_event_name) {
+		ret = LTTNG_ERR_FATAL;
+		goto error;
+	}
+
+	/*
+	 * The loglevel is hardcoded with 0 here since the agent ust event is set
+	 * with the loglevel type to ALL thus the loglevel stays 0. The event's
+	 * filter is the one handling the loglevel for agent.
+	 */
+	uevent = trace_ust_find_event(uchan->events, (char *) ust_event_name,
+			aevent->filter, 0, NULL);
+	/* If the agent event exists, it must be available on the UST side. */
+	assert(uevent);
+
+	ret = ust_app_disable_event_glb(usess, uchan, uevent);
+	if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) {
+		ret = LTTNG_ERR_UST_DISABLE_FAIL;
+		goto error;
+	}
+
+	/*
+	 * Flag event that it's disabled so the shadow copy on the ust app side
+	 * will disable it if an application shows up.
+	 */
+	uevent->enabled = 0;
+
+	ret = agent_disable_event(aevent, agt->domain);
+	if (ret != LTTNG_OK) {
+		goto error;
+	}
+
+end:
+	return LTTNG_OK;
+
+error:
+	return ret;
+}
+/*
+ * Disable all agent event for a given UST session.
+ *
+ * Return LTTNG_OK on success or else a LTTNG_ERR* code.
+ */
+int event_agent_disable_all(struct ltt_ust_session *usess,
+		struct agent *agt)
+{
+	int ret;
+	struct agent_event *aevent;
+	struct lttng_ht_iter iter;
+
+	assert(agt);
+	assert(usess);
+
+	/*
+	 * Disable event on agent application. Continue to disable all other events
+	 * if the * event is not found.
+	 */
+	ret = event_agent_disable(usess, agt, "*");
+	if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_NOT_FOUND) {
+		goto error;
+	}
+
+	/* Flag every event that they are now enabled. */
+	rcu_read_lock();
+	cds_lfht_for_each_entry(agt->events->ht, &iter.iter, aevent,
+			node.node) {
+		if (!aevent->enabled) {
+			continue;
+		}
+
+		ret = event_agent_disable(usess, agt, aevent->name);
+		if (ret != LTTNG_OK) {
+			rcu_read_unlock();
+			goto error;
+		}
+	}
+	rcu_read_unlock();
+
+	ret = LTTNG_OK;
+
+error:
+	return ret;
+}