X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=402a386ceff788be501386df7bc155c40203e62e;hp=5a6825e6ef8a7412ec679bbb9f0c67cb95b12e7b;hb=025faf73cdb6942ebf437dc4c4f6631f0134b128;hpb=6bd8707a9f610a6214a90047781e52fdbb13fb48

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 5a6825e6e..402a386ce 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -32,6 +32,29 @@
 #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)
+{
+	struct cds_lfht_node *node_ptr;
+	struct ltt_ust_ht_key key;
+
+	assert(ht);
+	assert(ht->ht);
+	assert(event);
+
+	key.name = event->attr.name;
+	key.filter = (struct lttng_filter_bytecode *) event->filter;
+	key.loglevel = event->attr.loglevel;
+
+	node_ptr = cds_lfht_add_unique(ht->ht,
+			ht->hash_fct(event->node.key, lttng_ht_seed),
+			trace_ust_ht_match_event, &key, &event->node.node);
+	assert(node_ptr == &event->node.node);
+}
+
 /*
  * Setup a lttng_event used to enable *all* syscall tracing.
  */
@@ -56,20 +79,20 @@ int event_kernel_disable_tracepoint(struct ltt_kernel_session *ksession,
 
 	kevent = trace_kernel_get_event_by_name(event_name, kchan);
 	if (kevent == NULL) {
-		ret = LTTCOMM_NO_EVENT;
+		ret = LTTNG_ERR_NO_EVENT;
 		goto error;
 	}
 
 	ret = kernel_disable_event(kevent);
 	if (ret < 0) {
-		ret = LTTCOMM_KERN_DISABLE_FAIL;
+		ret = LTTNG_ERR_KERN_DISABLE_FAIL;
 		goto error;
 	}
 
 	DBG("Kernel event %s disable for channel %s.",
 			kevent->event->name, kchan->channel->name);
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 
 error:
 	return ret;
@@ -92,7 +115,7 @@ int event_kernel_disable_all_tracepoints(struct ltt_kernel_session *ksession,
 			continue;
 		}
 	}
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 	return ret;
 }
 
@@ -103,7 +126,7 @@ int event_kernel_disable_all_syscalls(struct ltt_kernel_session *ksession,
 		struct ltt_kernel_channel *kchan)
 {
 	ERR("Cannot disable syscall tracing for existing session. Please destroy session instead.");
-	return LTTCOMM_OK;	/* Return OK so disable all succeeds */
+	return LTTNG_OK;	/* Return OK so disable all succeeds */
 }
 
 /*
@@ -115,7 +138,7 @@ int event_kernel_disable_all(struct ltt_kernel_session *ksession,
 	int ret;
 
 	ret = event_kernel_disable_all_tracepoints(ksession, kchan);
-	if (ret != LTTCOMM_OK)
+	if (ret != LTTNG_OK)
 		return ret;
 	ret = event_kernel_disable_all_syscalls(ksession, kchan);
 	return ret;
@@ -136,13 +159,13 @@ int event_kernel_enable_tracepoint(struct ltt_kernel_session *ksession,
 		if (ret < 0) {
 			switch (-ret) {
 			case EEXIST:
-				ret = LTTCOMM_KERN_EVENT_EXIST;
+				ret = LTTNG_ERR_KERN_EVENT_EXIST;
 				break;
 			case ENOSYS:
-				ret = LTTCOMM_KERN_EVENT_ENOSYS;
+				ret = LTTNG_ERR_KERN_EVENT_ENOSYS;
 				break;
 			default:
-				ret = LTTCOMM_KERN_ENABLE_FAIL;
+				ret = LTTNG_ERR_KERN_ENABLE_FAIL;
 				break;
 			}
 			goto end;
@@ -150,16 +173,16 @@ int event_kernel_enable_tracepoint(struct ltt_kernel_session *ksession,
 	} else if (kevent->enabled == 0) {
 		ret = kernel_enable_event(kevent);
 		if (ret < 0) {
-			ret = LTTCOMM_KERN_ENABLE_FAIL;
+			ret = LTTNG_ERR_KERN_ENABLE_FAIL;
 			goto end;
 		}
 	} else {
 		/* At this point, the event is considered enabled */
-		ret = LTTCOMM_KERN_EVENT_EXIST;
+		ret = LTTNG_ERR_KERN_EVENT_EXIST;
 		goto end;
 	}
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 end:
 	return ret;
 }
@@ -187,7 +210,7 @@ int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession,
 
 	size = kernel_list_events(kernel_tracer_fd, &event_list);
 	if (size < 0) {
-		ret = LTTCOMM_KERN_LIST_FAIL;
+		ret = LTTNG_ERR_KERN_LIST_FAIL;
 		goto end;
 	}
 
@@ -205,7 +228,7 @@ int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession,
 	}
 	free(event_list);
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 end:
 	return ret;
 
@@ -227,14 +250,14 @@ int event_kernel_enable_all_syscalls(struct ltt_kernel_session *ksession,
 	ret = kernel_create_event(&event, kchan);
 	if (ret < 0) {
 		if (ret == -EEXIST) {
-			ret = LTTCOMM_KERN_EVENT_EXIST;
+			ret = LTTNG_ERR_KERN_EVENT_EXIST;
 		} else {
-			ret = LTTCOMM_KERN_ENABLE_FAIL;
+			ret = LTTNG_ERR_KERN_ENABLE_FAIL;
 		}
 		goto end;
 	}
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 end:
 	return ret;
 }
@@ -248,7 +271,7 @@ int event_kernel_enable_all(struct ltt_kernel_session *ksession,
 	int tp_ret;
 
 	tp_ret = event_kernel_enable_all_tracepoints(ksession, kchan, kernel_tracer_fd);
-	if (tp_ret != LTTCOMM_OK) {
+	if (tp_ret != LTTNG_OK) {
 		goto end;
 	}
 
@@ -277,14 +300,15 @@ 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)
+		struct ltt_ust_channel *uchan, struct lttng_filter_bytecode *filter)
 {
-	int ret, i;
-	size_t size;
+	int ret, i, size;
 	struct lttng_ht_iter iter;
 	struct ltt_ust_event *uevent = NULL;
 	struct lttng_event *events = NULL;
 
+	rcu_read_lock();
+
 	switch (domain) {
 	case LTTNG_DOMAIN_UST:
 	{
@@ -303,7 +327,7 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain,
 		/* Get all UST available events */
 		size = ust_app_list_events(&events);
 		if (size < 0) {
-			ret = LTTCOMM_UST_LIST_FAIL;
+			ret = LTTNG_ERR_UST_LIST_FAIL;
 			goto error;
 		}
 
@@ -312,14 +336,14 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain,
 			 * Check if event exist and if so, continue since it was enable
 			 * previously.
 			 */
-			uevent = trace_ust_find_event_by_name(uchan->events,
-					events[i].name);
+			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 != -EEXIST) {
-						ret = LTTCOMM_UST_ENABLE_FAIL;
+					if (ret != -LTTNG_UST_ERR_EXIST) {
+						ret = LTTNG_ERR_UST_ENABLE_FAIL;
 						goto error;
 					}
 				}
@@ -327,9 +351,9 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain,
 			}
 
 			/* Create ust event */
-			uevent = trace_ust_create_event(&events[i]);
+			uevent = trace_ust_create_event(&events[i], filter);
 			if (uevent == NULL) {
-				ret = LTTCOMM_FATAL;
+				ret = LTTNG_ERR_FATAL;
 				goto error_destroy;
 			}
 
@@ -337,11 +361,11 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain,
 			ret = ust_app_enable_event_pid(usess, uchan, uevent,
 					events[i].pid);
 			if (ret < 0) {
-				if (ret == -EEXIST) {
-					ret = LTTCOMM_UST_EVENT_EXIST;
+				if (ret == -LTTNG_UST_ERR_EXIST) {
+					ret = LTTNG_ERR_UST_EVENT_EXIST;
 					goto error;
 				} else {
-					ret = LTTCOMM_UST_ENABLE_FAIL;
+					ret = LTTNG_ERR_UST_ENABLE_FAIL;
 					goto error_destroy;
 				}
 			}
@@ -349,7 +373,7 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain,
 			uevent->enabled = 1;
 			/* Add ltt ust event to channel */
 			rcu_read_lock();
-			lttng_ht_add_unique_str(uchan->events, &uevent->node);
+			add_unique_ust_event(uchan->events, uevent);
 			rcu_read_unlock();
 		}
 
@@ -362,17 +386,19 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain,
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 #endif
 	default:
-		ret = LTTCOMM_UND;
+		ret = LTTNG_ERR_UND;
 		goto error;
 	}
 
-	return LTTCOMM_OK;
+	rcu_read_unlock();
+	return LTTNG_OK;
 
 error_destroy:
 	trace_ust_destroy_event(uevent);
 
 error:
 	free(events);
+	rcu_read_unlock();
 	return ret;
 }
 
@@ -380,24 +406,30 @@ error:
  * 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)
+		struct ltt_ust_channel *uchan, struct lttng_event *event,
+		struct lttng_filter_bytecode *filter)
 {
-	int ret = LTTCOMM_OK, to_create = 0;
+	int ret = LTTNG_OK, to_create = 0;
 	struct ltt_ust_event *uevent;
 
-	uevent = trace_ust_find_event_by_name(uchan->events, event->name);
+	rcu_read_lock();
+
+	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 = LTTCOMM_FATAL;
+			ret = LTTNG_ERR_UST_ENABLE_FAIL;
 			goto error;
 		}
+
 		/* Valid to set it after the goto error since uevent is still NULL */
 		to_create = 1;
 	}
 
 	if (uevent->enabled) {
 		/* It's already enabled so everything is OK */
+		ret = LTTNG_OK;
 		goto end;
 	}
 
@@ -415,11 +447,11 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, int domain,
 		}
 
 		if (ret < 0) {
-			if (ret == -EEXIST) {
-				ret = LTTCOMM_UST_EVENT_EXIST;
+			if (ret == -LTTNG_UST_ERR_EXIST) {
+				ret = LTTNG_ERR_UST_EVENT_EXIST;
 				goto end;
 			} else {
-				ret = LTTCOMM_UST_ENABLE_FAIL;
+				ret = LTTNG_ERR_UST_ENABLE_FAIL;
 				goto error;
 			}
 		}
@@ -431,23 +463,22 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, int domain,
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 #endif
 	default:
-		ret = LTTCOMM_UND;
+		ret = LTTNG_ERR_UND;
 		goto end;
 	}
 
 	if (to_create) {
-		rcu_read_lock();
 		/* Add ltt ust event to channel */
-		lttng_ht_add_unique_str(uchan->events, &uevent->node);
-		rcu_read_unlock();
+		add_unique_ust_event(uchan->events, uevent);
 	}
 
 	DBG("Event UST %s %s in channel %s", uevent->attr.name,
 			to_create ? "created" : "enabled", uchan->name);
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 
 end:
+	rcu_read_unlock();
 	return ret;
 
 error:
@@ -462,6 +493,7 @@ error:
 		/* In this code path, the uevent was not added to the hash table */
 		trace_ust_destroy_event(uevent);
 	}
+	rcu_read_unlock();
 	return ret;
 }
 
@@ -473,45 +505,70 @@ int event_ust_disable_tracepoint(struct ltt_ust_session *usess, int domain,
 {
 	int ret;
 	struct ltt_ust_event *uevent;
+	struct lttng_ht_node_str *node;
+	struct lttng_ht_iter iter;
+	struct lttng_ht *ht;
 
-	uevent = trace_ust_find_event_by_name(uchan->events, event_name);
-	if (uevent == NULL) {
-		ret = LTTCOMM_UST_EVENT_NOT_FOUND;
+	ht = uchan->events;
+
+	rcu_read_lock();
+
+	/*
+	 * 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);
+		ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
 		goto error;
 	}
 
-	if (uevent->enabled == 0) {
-		/* It's already enabled so everything is OK */
-		ret = LTTCOMM_OK;
-		goto end;
-	}
+	do {
+		uevent = caa_container_of(node, struct ltt_ust_event, node);
+		assert(uevent);
 
-	switch (domain) {
-	case LTTNG_DOMAIN_UST:
-		ret = ust_app_disable_event_glb(usess, uchan, uevent);
-		if (ret < 0 && ret != -EEXIST) {
-			ret = LTTCOMM_UST_DISABLE_FAIL;
-			goto error;
+		if (uevent->enabled == 0) {
+			/* It's already disabled so everything is OK */
+			ret = LTTNG_OK;
+			continue;
 		}
-		break;
+
+		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:
+		case LTTNG_DOMAIN_UST_EXEC_NAME:
+		case LTTNG_DOMAIN_UST_PID:
+		case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 #endif
-	default:
-		ret = LTTCOMM_UND;
-		goto error;
-	}
+		default:
+			ret = LTTNG_ERR_UND;
+			goto error;
+		}
 
-	uevent->enabled = 0;
-	ret = LTTCOMM_OK;
+		uevent->enabled = 0;
 
-end:
-	DBG2("Event UST %s disabled in channel %s", uevent->attr.name,
-			uchan->name);
+		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);
+		node = lttng_ht_iter_get_node_str(&iter);
+	} while (node);
+
+	ret = LTTNG_OK;
 
 error:
+	rcu_read_unlock();
 	return ret;
 }
 
@@ -521,12 +578,13 @@ error:
 int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, int domain,
 		struct ltt_ust_channel *uchan)
 {
-	int ret, i;
-	size_t size;
+	int ret, i, size;
 	struct lttng_ht_iter iter;
 	struct ltt_ust_event *uevent = NULL;
 	struct lttng_event *events = NULL;
 
+	rcu_read_lock();
+
 	switch (domain) {
 	case LTTNG_DOMAIN_UST:
 	{
@@ -534,32 +592,26 @@ int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, int domain,
 		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);
+				ret = event_ust_disable_tracepoint(usess, domain, uchan,
+						uevent->attr.name);
 				if (ret < 0) {
 					continue;
 				}
-				uevent->enabled = 0;
 			}
 		}
 
 		/* Get all UST available events */
 		size = ust_app_list_events(&events);
 		if (size < 0) {
-			ret = LTTCOMM_UST_LIST_FAIL;
+			ret = LTTNG_ERR_UST_LIST_FAIL;
 			goto error;
 		}
 
 		for (i = 0; i < size; i++) {
-			uevent = trace_ust_find_event_by_name(uchan->events,
+			ret = event_ust_disable_tracepoint(usess, domain, uchan,
 					events[i].name);
-			if (uevent != NULL && uevent->enabled == 1) {
-				ret = ust_app_disable_event_pid(usess, uchan, uevent,
-						events[i].pid);
-				if (ret < 0 && ret != -EEXIST) {
-					ret = LTTCOMM_UST_DISABLE_FAIL;
-					goto error;
-				}
-				uevent->enabled = 0;
+			if (ret != LTTNG_OK) {
+				/* Continue to disable the rest... */
 				continue;
 			}
 		}
@@ -573,13 +625,15 @@ int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, int domain,
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 #endif
 	default:
-		ret = LTTCOMM_UND;
+		ret = LTTNG_ERR_UND;
 		goto error;
 	}
 
-	return LTTCOMM_OK;
+	rcu_read_unlock();
+	return LTTNG_OK;
 
 error:
 	free(events);
+	rcu_read_unlock();
 	return ret;
 }