X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng-sessiond%2Fevent.c;h=4e6ac03bf19f58a4761b63c973ba6bac6bf25a24;hb=76d45b4000137cff321b29800e11cc5d4a299a98;hp=407f8441c60bb7ffd8bae71448498879738b47b3;hpb=edb6738816b442fb81f12ea0079260c96c3a5759;p=lttng-tools.git

diff --git a/lttng-sessiond/event.c b/lttng-sessiond/event.c
index 407f8441c..4e6ac03bf 100644
--- a/lttng-sessiond/event.c
+++ b/lttng-sessiond/event.c
@@ -161,14 +161,16 @@ int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession,
 {
 	int size, i, ret;
 	struct ltt_kernel_event *kevent;
-	struct lttng_event *event_list;
+	struct lttng_event *event_list = NULL;
 
 	/* For each event in the kernel session */
 	cds_list_for_each_entry(kevent, &kchan->events_list.head, list) {
-		ret = kernel_enable_event(kevent);
-		if (ret < 0) {
-			/* Enable failed but still continue */
-			continue;
+		if (kevent->enabled == 0) {
+			ret = kernel_enable_event(kevent);
+			if (ret < 0) {
+				/* Enable failed but still continue */
+				continue;
+			}
 		}
 	}
 
@@ -191,6 +193,7 @@ int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession,
 		}
 	}
 	free(event_list);
+
 	ret = LTTCOMM_OK;
 end:
 	return ret;
@@ -212,8 +215,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;
+		} else {
+			ret = LTTCOMM_KERN_ENABLE_FAIL;
+		}
 		goto end;
 	}
+
 	ret = LTTCOMM_OK;
 end:
 	return ret;
@@ -236,6 +245,102 @@ end:
 	return ret;
 }
 
+/*
+ * 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 ret, i;
+	size_t size;
+	struct cds_lfht_iter iter;
+	struct ltt_ust_event *uevent = NULL;
+	struct lttng_event *events;
+
+	switch (domain) {
+	case LTTNG_DOMAIN_UST:
+	{
+		/* Enable existing events */
+		cds_lfht_for_each_entry(uchan->events, &iter, uevent, node) {
+			if (uevent->enabled == 0) {
+				ret = ust_app_enable_event_glb(usess, uchan, uevent);
+				if (ret < 0) {
+					continue;
+				}
+				uevent->enabled = 1;
+			}
+		}
+
+		/* Get all UST available events */
+		size = ust_app_list_events(&events);
+		if (size < 0) {
+			ret = LTTCOMM_UST_LIST_FAIL;
+			goto error;
+		}
+
+		for (i = 0; i < size; i++) {
+			/*
+			 * 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);
+			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;
+						goto error;
+					}
+				}
+				continue;
+			}
+
+			/* Create ust event */
+			uevent = trace_ust_create_event(&events[i]);
+			if (uevent == NULL) {
+				ret = LTTCOMM_FATAL;
+				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 == -EEXIST) {
+					ret = LTTCOMM_UST_EVENT_EXIST;
+				} else {
+					ret = LTTCOMM_UST_ENABLE_FAIL;
+				}
+				goto error;
+			}
+
+			uevent->enabled = 1;
+			/* Add ltt ust event to channel */
+			rcu_read_lock();
+			hashtable_add_unique(uchan->events, &uevent->node);
+			rcu_read_unlock();
+		}
+
+		free(events);
+		break;
+	}
+	case LTTNG_DOMAIN_UST_EXEC_NAME:
+	case LTTNG_DOMAIN_UST_PID:
+	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+	default:
+		ret = LTTCOMM_NOT_IMPLEMENTED;
+		goto error;
+	}
+
+	return LTTCOMM_OK;
+
+error:
+	trace_ust_destroy_event(uevent);
+	return ret;
+}
+
 /*
  * Enable UST tracepoint event for a channel from a UST session.
  */
@@ -260,10 +365,10 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, int domain,
 	{
 		if (to_create) {
 			/* Create event on all UST registered apps for session */
-			ret = ust_app_create_event_all(usess, uchan, uevent);
+			ret = ust_app_create_event_glb(usess, uchan, uevent);
 		} else {
 			/* Enable event on all UST registered apps for session */
-			ret = ust_app_enable_event_all(usess, uchan, uevent);
+			ret = ust_app_enable_event_glb(usess, uchan, uevent);
 		}
 
 		if (ret < 0) {