X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=bedaa2e2f4e220e63c6458a1c7947aaa9081b3a3;hp=80721a78848ef7850fb2162cb11157119fb58ffa;hb=a969e1019813f1e2354fe57c8393f6268d943414;hpb=022d91ba14053d6093a6d6a1af02a345c6fd42d2

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 80721a788..bedaa2e2f 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>
@@ -57,25 +58,10 @@ 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.
  */
-int event_kernel_disable_tracepoint(struct ltt_kernel_channel *kchan,
+int event_kernel_disable_event(struct ltt_kernel_channel *kchan,
 		char *event_name)
 {
 	int ret;
@@ -83,7 +69,8 @@ int event_kernel_disable_tracepoint(struct ltt_kernel_channel *kchan,
 
 	assert(kchan);
 
-	kevent = trace_kernel_get_event_by_name(event_name, kchan);
+	kevent = trace_kernel_get_event_by_name(event_name, kchan,
+			LTTNG_EVENT_ALL);
 	if (kevent == NULL) {
 		ret = LTTNG_ERR_NO_EVENT;
 		goto error;
@@ -107,7 +94,8 @@ error:
 /*
  * Disable kernel tracepoint events for a channel from the kernel session.
  */
-int event_kernel_disable_all_tracepoints(struct ltt_kernel_channel *kchan)
+int event_kernel_disable_event_type(struct ltt_kernel_channel *kchan,
+		enum lttng_event_type type)
 {
 	int ret;
 	struct ltt_kernel_event *kevent;
@@ -116,6 +104,8 @@ int event_kernel_disable_all_tracepoints(struct ltt_kernel_channel *kchan)
 
 	/* For each event in the kernel session */
 	cds_list_for_each_entry(kevent, &kchan->events_list.head, list) {
+		if (type != LTTNG_EVENT_ALL && kevent->type != type)
+			continue;
 		ret = kernel_disable_event(kevent);
 		if (ret < 0) {
 			/* We continue disabling the rest */
@@ -126,36 +116,21 @@ 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.
  */
-int event_kernel_disable_all(struct ltt_kernel_channel *kchan)
+int event_kernel_disable_event_all(struct ltt_kernel_channel *kchan)
 {
-	int ret;
-
-	assert(kchan);
-
-	ret = event_kernel_disable_all_tracepoints(kchan);
-	if (ret != LTTNG_OK)
-		return ret;
-	ret = event_kernel_disable_all_syscalls(kchan);
-	return ret;
+	return event_kernel_disable_event_type(kchan, LTTNG_EVENT_ALL);
 }
 
 /*
  * Enable kernel tracepoint event for a channel from the kernel session.
+ * We own filter_expression and filter.
  */
-int event_kernel_enable_tracepoint(struct ltt_kernel_channel *kchan,
-		struct lttng_event *event)
+int event_kernel_enable_event(struct ltt_kernel_channel *kchan,
+		struct lttng_event *event, char *filter_expression,
+		struct lttng_filter_bytecode *filter)
 {
 	int ret;
 	struct ltt_kernel_event *kevent;
@@ -163,9 +138,14 @@ int event_kernel_enable_tracepoint(struct ltt_kernel_channel *kchan,
 	assert(kchan);
 	assert(event);
 
-	kevent = trace_kernel_get_event_by_name(event->name, kchan);
+	kevent = trace_kernel_find_event(event->name, kchan,
+			event->type, filter);
 	if (kevent == NULL) {
-		ret = kernel_create_event(event, kchan);
+		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:
@@ -194,117 +174,11 @@ int event_kernel_enable_tracepoint(struct ltt_kernel_channel *kchan,
 
 	ret = LTTNG_OK;
 end:
+	free(filter_expression);
+	free(filter);
 	return ret;
 }
 
-/*
- * Enable all kernel tracepoint events of a channel of the kernel session.
- */
-int event_kernel_enable_all_tracepoints(struct ltt_kernel_channel *kchan,
-		int kernel_tracer_fd)
-{
-	int size, i, ret;
-	struct ltt_kernel_event *kevent;
-	struct lttng_event *event_list = NULL;
-
-	assert(kchan);
-
-	/* For each event in the kernel session */
-	cds_list_for_each_entry(kevent, &kchan->events_list.head, list) {
-		if (kevent->enabled == 0) {
-			ret = kernel_enable_event(kevent);
-			if (ret < 0) {
-				/* Enable failed but still continue */
-				continue;
-			}
-		}
-	}
-
-	size = kernel_list_events(kernel_tracer_fd, &event_list);
-	if (size < 0) {
-		ret = LTTNG_ERR_KERN_LIST_FAIL;
-		goto end;
-	}
-
-	for (i = 0; i < size; i++) {
-		kevent = trace_kernel_get_event_by_name(event_list[i].name, kchan);
-		if (kevent == NULL) {
-			/* Default event type for enable all */
-			event_list[i].type = LTTNG_EVENT_TRACEPOINT;
-			/* Enable each single tracepoint event */
-			ret = kernel_create_event(&event_list[i], kchan);
-			if (ret < 0) {
-				/* Ignore error here and continue */
-			}
-		}
-	}
-	free(event_list);
-
-	ret = LTTNG_OK;
-end:
-	return ret;
-}
-
-/*
- * Enable all kernel sycalls 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.
- */
-int event_kernel_enable_all(struct ltt_kernel_channel *kchan,
-		int kernel_tracer_fd)
-{
-	int tp_ret;
-
-	assert(kchan);
-
-	tp_ret = event_kernel_enable_all_tracepoints(kchan, kernel_tracer_fd);
-	if (tp_ret != LTTNG_OK) {
-		goto end;
-	}
-
-	/*
-	 * Reaching this code path means that all tracepoints were enabled without
-	 * errors so we ignore the error value of syscalls.
-	 *
-	 * At the moment, failing to enable syscalls on "lttng enable-event -a -k"
-	 * is not considered an error that need to be returned to the client since
-	 * 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);
-
-end:
-	return tp_ret;
-}
-
 /*
  * ============================
  * UST : The Ultimate Frontier!
@@ -410,6 +284,7 @@ error:
 
 /*
  * Enable UST tracepoint event for a channel from a UST session.
+ * We own filter_expression, filter, and exclusion.
  */
 int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct lttng_event *event,
@@ -431,6 +306,10 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 	if (uevent == NULL) {
 		uevent = trace_ust_create_event(event, filter_expression,
 			filter, exclusion);
+		/* We have passed ownership */
+		filter_expression = NULL;
+		filter = NULL;
+		exclusion = NULL;
 		if (uevent == NULL) {
 			ret = LTTNG_ERR_UST_ENABLE_FAIL;
 			goto error;
@@ -478,6 +357,9 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 
 end:
 	rcu_read_unlock();
+	free(filter_expression);
+	free(filter);
+	free(exclusion);
 	return ret;
 
 error:
@@ -493,6 +375,9 @@ error:
 		trace_ust_destroy_event(uevent);
 	}
 	rcu_read_unlock();
+	free(filter_expression);
+	free(filter);
+	free(exclusion);
 	return ret;
 }
 
@@ -622,10 +507,11 @@ error:
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
 int event_agent_enable_all(struct ltt_ust_session *usess,
-		struct lttng_event *event, struct lttng_filter_bytecode *filter)
+		struct agent *agt, struct lttng_event *event,
+		struct lttng_filter_bytecode *filter)
 {
 	int ret;
-	struct agent_event *jevent;
+	struct agent_event *aevent;
 	struct lttng_ht_iter iter;
 
 	assert(usess);
@@ -633,16 +519,16 @@ int event_agent_enable_all(struct ltt_ust_session *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, event, filter);
+	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(usess->agent.events->ht, &iter.iter, jevent,
+	cds_lfht_for_each_entry(agt->events->ht, &iter.iter, aevent,
 			node.node) {
-		jevent->enabled = 1;
+		aevent->enabled = 1;
 	}
 	rcu_read_unlock();
 
@@ -657,44 +543,46 @@ error:
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int event_agent_enable(struct ltt_ust_session *usess, struct lttng_event *event,
+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 *jevent;
+	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);
 
-	jevent = agent_find_event(event->name, event->loglevel, &usess->agent);
-	if (!jevent) {
-		jevent = agent_create_event(event->name, filter);
-		if (!jevent) {
+	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;
 		}
-		jevent->loglevel = event->loglevel;
-		jevent->loglevel_type = event->loglevel_type;
+		aevent->loglevel = event->loglevel;
+		aevent->loglevel_type = event->loglevel_type;
 		created = 1;
 	}
 
 	/* Already enabled? */
-	if (jevent->enabled) {
+	if (aevent->enabled) {
 		goto end;
 	}
 
-	ret = agent_enable_event(jevent);
+	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(jevent, &usess->agent);
+		agent_add_event(aevent, agt);
 	}
 
 end:
@@ -702,55 +590,101 @@ end:
 
 error:
 	if (created) {
-		agent_destroy_event(jevent);
+		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, char *event_name)
+int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt,
+		char *event_name)
 {
 	int ret;
-	struct agent_event *jevent;
+	struct agent_event *aevent;
 	struct ltt_ust_event *uevent = NULL;
 	struct ltt_ust_channel *uchan = NULL;
-	char *ust_event_name;
+	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);
 
-	jevent = agent_find_event_by_name(event_name, &usess->agent);
-	if (!jevent) {
+	aevent = agent_find_event_by_name(event_name, agt);
+	if (!aevent) {
 		ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
 		goto error;
 	}
 
 	/* Already disabled? */
-	if (!jevent->enabled) {
+	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,
-			DEFAULT_JUL_CHANNEL_NAME);
+			(char *) ust_channel_name);
 	if (!uchan) {
 		ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
 		goto error;
 	}
 
-	if (is_root) {
-		ust_event_name = DEFAULT_SYS_JUL_EVENT_NAME;
-	} else {
-		ust_event_name = DEFAULT_USER_JUL_EVENT_NAME;
+	ust_event_name = event_get_default_agent_ust_name(agt->domain);
+	if (!ust_event_name) {
+		ret = LTTNG_ERR_FATAL;
+		goto error;
 	}
 
 	/*
@@ -758,8 +692,8 @@ int event_agent_disable(struct ltt_ust_session *usess, char *event_name)
 	 * 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, ust_event_name,
-			jevent->filter, 0, NULL);
+	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);
 
@@ -769,7 +703,13 @@ int event_agent_disable(struct ltt_ust_session *usess, char *event_name)
 		goto error;
 	}
 
-	ret = agent_disable_event(jevent);
+	/*
+	 * 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;
 	}
@@ -785,41 +725,38 @@ error:
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int event_agent_disable_all(struct ltt_ust_session *usess)
+int event_agent_disable_all(struct ltt_ust_session *usess,
+		struct agent *agt)
 {
-	int ret, do_disable = 0;
-	struct agent_event *jevent;
+	int ret;
+	struct agent_event *aevent;
 	struct lttng_ht_iter iter;
 
+	assert(agt);
 	assert(usess);
 
-	/* Enable event on agent application through TCP socket. */
-	ret = event_agent_disable(usess, "*");
-	if (ret != LTTNG_OK) {
-		if (ret == LTTNG_ERR_UST_EVENT_NOT_FOUND) {
-			/*
-			 * This means that no enable all was done before but still a user
-			 * could want to disable everything even though the * wild card
-			 * event does not exists.
-			 */
-			do_disable = 1;
-		} else {
-			goto error;
-		}
+	/*
+	 * 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(usess->agent.events->ht, &iter.iter, jevent,
+	cds_lfht_for_each_entry(agt->events->ht, &iter.iter, aevent,
 			node.node) {
-		if (jevent->enabled && do_disable) {
-			ret = event_agent_disable(usess, jevent->name);
-			if (ret != LTTNG_OK) {
-				rcu_read_unlock();
-				goto error;
-			}
+		if (!aevent->enabled) {
+			continue;
+		}
+
+		ret = event_agent_disable(usess, agt, aevent->name);
+		if (ret != LTTNG_OK) {
+			rcu_read_unlock();
+			goto error;
 		}
-		jevent->enabled = 0;
 	}
 	rcu_read_unlock();