X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=0af7b4cb2f944288a1107b7b6ea50ff2383dcf76;hb=3295105b7e92bbfa6a21dc9c5d71ad5458540ac9;hp=70f6fe62d1d73f20de2e35985c4063d24bfc7bb0;hpb=18eace3ba4aeaa6b869c8ad9ec1273381b4cbdee;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 70f6fe62d..0af7b4cb2 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -32,6 +32,9 @@
 #include "trace-kernel.h"
 #include "trace-ust.h"
 
+/*
+ * Add unique UST event based on the event name, filter bytecode and loglevel.
+ */
 static void add_unique_ust_event(struct lttng_ht *ht,
 		struct ltt_ust_event *event)
 {
@@ -57,6 +60,8 @@ static void add_unique_ust_event(struct lttng_ht *ht,
  */
 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
@@ -65,41 +70,17 @@ static void init_syscalls_kernel_event(struct lttng_event *event)
 	event->type = LTTNG_EVENT_SYSCALL;
 }
 
-/*
- * Return 1 if loglevels match or 0 on failure.
- */
-static int loglevel_match(struct ltt_ust_event *uevent,
-		enum lttng_ust_loglevel_type log_type, int loglevel)
-{
-	/*
-	 * For the loglevel type ALL, the loglevel is set to -1 but the event
-	 * received by the session daemon is 0 which does not match the negative
-	 * value in the existing event.
-	 */
-	if (log_type == LTTNG_UST_LOGLEVEL_ALL) {
-		loglevel = -1;
-	}
-
-	if (uevent == NULL || uevent->attr.loglevel_type != log_type ||
-			uevent->attr.loglevel != loglevel) {
-		goto no_match;
-	}
-
-	return 1;
-
-no_match:
-	return 0;
-}
-
 /*
  * Disable kernel tracepoint event for a channel from the kernel session.
  */
-int event_kernel_disable_tracepoint(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan, char *event_name)
+int event_kernel_disable_tracepoint(struct ltt_kernel_channel *kchan,
+		char *event_name)
 {
 	int ret;
 	struct ltt_kernel_event *kevent;
 
+	assert(kchan);
+
 	kevent = trace_kernel_get_event_by_name(event_name, kchan);
 	if (kevent == NULL) {
 		ret = LTTNG_ERR_NO_EVENT;
@@ -124,12 +105,13 @@ error:
 /*
  * Disable kernel tracepoint events for a channel from the kernel session.
  */
-int event_kernel_disable_all_tracepoints(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan)
+int event_kernel_disable_all_tracepoints(struct ltt_kernel_channel *kchan)
 {
 	int ret;
 	struct ltt_kernel_event *kevent;
 
+	assert(kchan);
+
 	/* For each event in the kernel session */
 	cds_list_for_each_entry(kevent, &kchan->events_list.head, list) {
 		ret = kernel_disable_event(kevent);
@@ -145,8 +127,7 @@ int event_kernel_disable_all_tracepoints(struct ltt_kernel_session *ksession,
 /*
  * Disable kernel syscall events for a channel from the kernel session.
  */
-int event_kernel_disable_all_syscalls(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan)
+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 */
@@ -155,27 +136,31 @@ int event_kernel_disable_all_syscalls(struct ltt_kernel_session *ksession,
 /*
  * Disable all kernel event for a channel from the kernel session.
  */
-int event_kernel_disable_all(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan)
+int event_kernel_disable_all(struct ltt_kernel_channel *kchan)
 {
 	int ret;
 
-	ret = event_kernel_disable_all_tracepoints(ksession, kchan);
+	assert(kchan);
+
+	ret = event_kernel_disable_all_tracepoints(kchan);
 	if (ret != LTTNG_OK)
 		return ret;
-	ret = event_kernel_disable_all_syscalls(ksession, kchan);
+	ret = event_kernel_disable_all_syscalls(kchan);
 	return ret;
 }
 
 /*
  * Enable kernel tracepoint event for a channel from the kernel session.
  */
-int event_kernel_enable_tracepoint(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan, struct lttng_event *event)
+int event_kernel_enable_tracepoint(struct ltt_kernel_channel *kchan,
+		struct lttng_event *event)
 {
 	int ret;
 	struct ltt_kernel_event *kevent;
 
+	assert(kchan);
+	assert(event);
+
 	kevent = trace_kernel_get_event_by_name(event->name, kchan);
 	if (kevent == NULL) {
 		ret = kernel_create_event(event, kchan);
@@ -213,13 +198,15 @@ end:
 /*
  * Enable all kernel tracepoint events of a channel of the kernel session.
  */
-int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan, int kernel_tracer_fd)
+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) {
@@ -254,18 +241,19 @@ int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession,
 	ret = LTTNG_OK;
 end:
 	return ret;
-
 }
 
 /*
  * Enable all kernel tracepoint events of a channel of the kernel session.
  */
-int event_kernel_enable_all_syscalls(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan, int kernel_tracer_fd)
+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");
@@ -288,12 +276,14 @@ end:
 /*
  * Enable all kernel events of a channel of the kernel session.
  */
-int event_kernel_enable_all(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan, int kernel_tracer_fd)
+int event_kernel_enable_all(struct ltt_kernel_channel *kchan,
+		int kernel_tracer_fd)
 {
 	int tp_ret;
 
-	tp_ret = event_kernel_enable_all_tracepoints(ksession, kchan, kernel_tracer_fd);
+	assert(kchan);
+
+	tp_ret = event_kernel_enable_all_tracepoints(kchan, kernel_tracer_fd);
 	if (tp_ret != LTTNG_OK) {
 		goto end;
 	}
@@ -307,7 +297,7 @@ int event_kernel_enable_all(struct ltt_kernel_session *ksession,
 	 * 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(ksession, kchan, kernel_tracer_fd);
+	(void) event_kernel_enable_all_syscalls(kchan, kernel_tracer_fd);
 
 end:
 	return tp_ret;
@@ -322,95 +312,86 @@ end:
 /*
  * Enable all UST tracepoints for a channel from a UST session.
  */
-int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain,
-		struct ltt_ust_channel *uchan)
+int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
+		struct ltt_ust_channel *uchan, struct lttng_filter_bytecode *filter)
 {
 	int ret, i, size;
 	struct lttng_ht_iter iter;
 	struct ltt_ust_event *uevent = NULL;
 	struct lttng_event *events = NULL;
 
-	switch (domain) {
-	case LTTNG_DOMAIN_UST:
-	{
-		/* Enable existing events */
-		cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent,
-				node.node) {
-			if (uevent->enabled == 0) {
-				ret = ust_app_enable_event_glb(usess, uchan, uevent);
-				if (ret < 0) {
-					continue;
-				}
-				uevent->enabled = 1;
-			}
-		}
+	assert(usess);
+	assert(uchan);
 
-		/* Get all UST available events */
-		size = ust_app_list_events(&events);
-		if (size < 0) {
-			ret = LTTNG_ERR_UST_LIST_FAIL;
-			goto error;
-		}
+	rcu_read_lock();
 
-		for (i = 0; i < size; i++) {
-			/*
-			 * Check if event exist and if so, continue since it was enable
-			 * previously.
-			 */
-			uevent = trace_ust_find_event(uchan->events, events[i].name, NULL,
-					events[i].loglevel);
-			if (uevent != NULL) {
-				ret = ust_app_enable_event_pid(usess, uchan, uevent,
-						events[i].pid);
-				if (ret < 0) {
-					if (ret != -LTTNG_UST_ERR_EXIST) {
-						ret = LTTNG_ERR_UST_ENABLE_FAIL;
-						goto error;
-					}
-				}
+	/* Enable existing events */
+	cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent,
+			node.node) {
+		if (uevent->enabled == 0) {
+			ret = ust_app_enable_event_glb(usess, uchan, uevent);
+			if (ret < 0) {
 				continue;
 			}
+			uevent->enabled = 1;
+		}
+	}
 
-			/* Create ust event */
-			uevent = trace_ust_create_event(&events[i]);
-			if (uevent == NULL) {
-				ret = LTTNG_ERR_FATAL;
-				goto error_destroy;
-			}
+	/* Get all UST available events */
+	size = ust_app_list_events(&events);
+	if (size < 0) {
+		ret = LTTNG_ERR_UST_LIST_FAIL;
+		goto error;
+	}
 
-			/* Create event for the specific PID */
+	for (i = 0; i < size; i++) {
+		/*
+		 * Check if event exist and if so, continue since it was enable
+		 * previously.
+		 */
+		uevent = trace_ust_find_event(uchan->events, events[i].name, filter,
+				events[i].loglevel);
+		if (uevent != NULL) {
 			ret = ust_app_enable_event_pid(usess, uchan, uevent,
 					events[i].pid);
 			if (ret < 0) {
-				if (ret == -LTTNG_UST_ERR_EXIST) {
-					ret = LTTNG_ERR_UST_EVENT_EXIST;
-					goto error;
-				} else {
+				if (ret != -LTTNG_UST_ERR_EXIST) {
 					ret = LTTNG_ERR_UST_ENABLE_FAIL;
-					goto error_destroy;
+					goto error;
 				}
 			}
+			continue;
+		}
 
-			uevent->enabled = 1;
-			/* Add ltt ust event to channel */
-			rcu_read_lock();
-			add_unique_ust_event(uchan->events, uevent);
-			rcu_read_unlock();
+		/* Create ust event */
+		uevent = trace_ust_create_event(&events[i], filter);
+		if (uevent == NULL) {
+			ret = LTTNG_ERR_FATAL;
+			goto error_destroy;
 		}
 
-		free(events);
-		break;
-	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
-	default:
-		ret = LTTNG_ERR_UND;
-		goto error;
+		/* Create event for the specific PID */
+		ret = ust_app_enable_event_pid(usess, uchan, uevent,
+				events[i].pid);
+		if (ret < 0) {
+			if (ret == -LTTNG_UST_ERR_EXIST) {
+				ret = LTTNG_ERR_UST_EVENT_EXIST;
+				goto error;
+			} else {
+				ret = LTTNG_ERR_UST_ENABLE_FAIL;
+				goto error_destroy;
+			}
+		}
+
+		uevent->enabled = 1;
+		/* Add ltt ust event to channel */
+		rcu_read_lock();
+		add_unique_ust_event(uchan->events, uevent);
+		rcu_read_unlock();
 	}
+	free(events);
 
+	rcu_read_unlock();
 	return LTTNG_OK;
 
 error_destroy:
@@ -418,86 +399,63 @@ error_destroy:
 
 error:
 	free(events);
+	rcu_read_unlock();
 	return ret;
 }
 
 /*
  * Enable UST tracepoint event for a channel from a UST session.
  */
-int event_ust_enable_tracepoint(struct ltt_ust_session *usess, int domain,
-		struct ltt_ust_channel *uchan, struct lttng_event *event)
+int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
+		struct ltt_ust_channel *uchan, struct lttng_event *event,
+		struct lttng_filter_bytecode *filter)
 {
 	int ret = LTTNG_OK, to_create = 0;
 	struct ltt_ust_event *uevent;
 
-	DBG3("Enable ust: %s l:%d f:%p", event->name, event->loglevel, NULL);
+	assert(usess);
+	assert(uchan);
+	assert(event);
 
 	rcu_read_lock();
 
-	uevent = trace_ust_find_event(uchan->events, event->name, NULL,
+	uevent = trace_ust_find_event(uchan->events, event->name, filter,
 			event->loglevel);
 	if (uevent == NULL) {
-		uevent = trace_ust_create_event(event);
+		uevent = trace_ust_create_event(event, filter);
 		if (uevent == NULL) {
 			ret = LTTNG_ERR_UST_ENABLE_FAIL;
 			goto error;
 		}
+
 		/* Valid to set it after the goto error since uevent is still NULL */
 		to_create = 1;
 	}
 
-	/* Check loglevels */
-	ret = loglevel_match(uevent, event->loglevel_type, event->loglevel);
-	if (ret == 0) {
-		/*
-		 * No match meaning that the user tried to enable a known event but
-		 * with a different loglevel.
-		 */
-		DBG("Enable event %s does not match existing event %s with loglevel "
-				"respectively of %d and %d", event->name, uevent->attr.name,
-				uevent->attr.loglevel, event->loglevel);
-		ret = LTTNG_ERR_EVENT_EXIST_LOGLEVEL;
-		goto error;
-	}
-
 	if (uevent->enabled) {
 		/* It's already enabled so everything is OK */
-		ret = LTTNG_OK;
+		ret = LTTNG_ERR_UST_EVENT_ENABLED;
 		goto end;
 	}
 
 	uevent->enabled = 1;
 
-	switch (domain) {
-	case LTTNG_DOMAIN_UST:
-	{
-		if (to_create) {
-			/* Create event on all UST registered apps for session */
-			ret = ust_app_create_event_glb(usess, uchan, uevent);
-		} else {
-			/* Enable event on all UST registered apps for session */
-			ret = ust_app_enable_event_glb(usess, uchan, uevent);
-		}
+	if (to_create) {
+		/* Create event on all UST registered apps for session */
+		ret = ust_app_create_event_glb(usess, uchan, uevent);
+	} else {
+		/* Enable event on all UST registered apps for session */
+		ret = ust_app_enable_event_glb(usess, uchan, uevent);
+	}
 
-		if (ret < 0) {
-			if (ret == -LTTNG_UST_ERR_EXIST) {
-				ret = LTTNG_ERR_UST_EVENT_EXIST;
-				goto end;
-			} else {
-				ret = LTTNG_ERR_UST_ENABLE_FAIL;
-				goto error;
-			}
+	if (ret < 0) {
+		if (ret == -LTTNG_UST_ERR_EXIST) {
+			ret = LTTNG_ERR_UST_EVENT_EXIST;
+			goto end;
+		} else {
+			ret = LTTNG_ERR_UST_ENABLE_FAIL;
+			goto error;
 		}
-		break;
-	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
-	default:
-		ret = LTTNG_ERR_UND;
-		goto end;
 	}
 
 	if (to_create) {
@@ -533,24 +491,29 @@ error:
 /*
  * Disable UST tracepoint of a channel from a UST session.
  */
-int event_ust_disable_tracepoint(struct ltt_ust_session *usess, int domain,
+int event_ust_disable_tracepoint(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, char *event_name)
 {
 	int ret;
 	struct ltt_ust_event *uevent;
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
-	void *orig_match_fct;
 	struct lttng_ht *ht;
 
-	ht = uchan->events;
+	assert(usess);
+	assert(uchan);
+	assert(event_name);
 
-	/* Save match function so we can use the event by name match. */
-	orig_match_fct = (void *) ht->match_fct;
-	ht->match_fct = trace_ust_ht_match_event_by_name;
+	ht = uchan->events;
 
 	rcu_read_lock();
-	lttng_ht_lookup(ht, (void *) event_name, &iter);
+
+	/*
+	 * We use a custom lookup since we need the iterator for the next_duplicate
+	 * call in the do while loop below.
+	 */
+	cds_lfht_lookup(ht->ht, ht->hash_fct((void *) event_name, lttng_ht_seed),
+			trace_ust_ht_match_event_by_name, event_name, &iter.iter);
 	node = lttng_ht_iter_get_node_str(&iter);
 	if (node == NULL) {
 		DBG2("Trace UST event NOT found by name %s", event_name);
@@ -560,32 +523,24 @@ int event_ust_disable_tracepoint(struct ltt_ust_session *usess, int domain,
 
 	do {
 		uevent = caa_container_of(node, struct ltt_ust_event, node);
+		assert(uevent);
+
 		if (uevent->enabled == 0) {
 			/* It's already disabled so everything is OK */
 			ret = LTTNG_OK;
 			continue;
 		}
 
-		switch (domain) {
-		case LTTNG_DOMAIN_UST:
-			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;
-			}
-			break;
-#if 0
-		case LTTNG_DOMAIN_UST_EXEC_NAME:
-		case LTTNG_DOMAIN_UST_PID:
-		case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
-		default:
-			ret = LTTNG_ERR_UND;
+		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;
 		}
-
 		uevent->enabled = 0;
 
+		DBG2("Event UST %s disabled in channel %s", uevent->attr.name,
+				uchan->name);
+
 		/* Get next duplicate event by name. */
 		cds_lfht_next_duplicate(ht->ht, trace_ust_ht_match_event_by_name,
 				event_name, &iter.iter);
@@ -594,10 +549,7 @@ int event_ust_disable_tracepoint(struct ltt_ust_session *usess, int domain,
 
 	ret = LTTNG_OK;
 
-	DBG2("Event UST %s disabled in channel %s", uevent->attr.name,
-			uchan->name);
 error:
-	ht->match_fct = orig_match_fct;
 	rcu_read_unlock();
 	return ret;
 }
@@ -605,7 +557,7 @@ error:
 /*
  * Disable all UST tracepoints for a channel from a UST session.
  */
-int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, int domain,
+int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan)
 {
 	int ret, i, size;
@@ -613,53 +565,45 @@ int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, int domain,
 	struct ltt_ust_event *uevent = NULL;
 	struct lttng_event *events = NULL;
 
-	switch (domain) {
-	case LTTNG_DOMAIN_UST:
-	{
-		/* Disabling existing events */
-		cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent,
-				node.node) {
-			if (uevent->enabled == 1) {
-				ret = ust_app_disable_event_glb(usess, uchan, uevent);
-				if (ret < 0) {
-					continue;
-				}
-				uevent->enabled = 0;
-			}
-		}
+	assert(usess);
+	assert(uchan);
 
-		/* Get all UST available events */
-		size = ust_app_list_events(&events);
-		if (size < 0) {
-			ret = LTTNG_ERR_UST_LIST_FAIL;
-			goto error;
-		}
+	rcu_read_lock();
 
-		for (i = 0; i < size; i++) {
-			ret = event_ust_disable_tracepoint(usess, domain, uchan,
-					events[i].name);
-			if (ret != LTTNG_OK) {
-				/* Continue to disable the rest... */
+	/* Disabling existing events */
+	cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent,
+			node.node) {
+		if (uevent->enabled == 1) {
+			ret = event_ust_disable_tracepoint(usess, uchan,
+					uevent->attr.name);
+			if (ret < 0) {
 				continue;
 			}
 		}
-
-		free(events);
-		break;
 	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
-	default:
-		ret = LTTNG_ERR_UND;
+
+	/* Get all UST available events */
+	size = ust_app_list_events(&events);
+	if (size < 0) {
+		ret = LTTNG_ERR_UST_LIST_FAIL;
 		goto error;
 	}
 
+	for (i = 0; i < size; i++) {
+		ret = event_ust_disable_tracepoint(usess, uchan,
+				events[i].name);
+		if (ret != LTTNG_OK) {
+			/* Continue to disable the rest... */
+			continue;
+		}
+	}
+	free(events);
+
+	rcu_read_unlock();
 	return LTTNG_OK;
 
 error:
 	free(events);
+	rcu_read_unlock();
 	return ret;
 }