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

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 0af7b4cb2..f22b81282 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -244,7 +244,7 @@ end:
 }
 
 /*
- * Enable all kernel tracepoint events of a channel of the kernel session.
+ * 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)
@@ -527,8 +527,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 +540,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 +607,180 @@ error:
 	rcu_read_unlock();
 	return ret;
 }
+
+/*
+ * Enable all JUL event for a given UST session.
+ *
+ * Return LTTNG_OK on success or else a LTTNG_ERR* code.
+ */
+int event_jul_enable_all(struct ltt_ust_session *usess)
+{
+	int ret;
+	struct jul_event *jevent;
+	struct lttng_event event;
+	struct lttng_ht_iter iter;
+
+	assert(usess);
+
+	DBG("Event JUL enabling ALL events for session %" PRIu64, usess->id);
+
+	/* Create the * wildcard event name for the Java agent. */
+	memset(event.name, 0, sizeof(event.name));
+	strncpy(event.name, "*", sizeof(event.name));
+	event.name[sizeof(event.name) - 1] = '\0';
+
+	/* Enable event on JUL application through TCP socket. */
+	ret = event_jul_enable(usess, &event);
+	if (ret != LTTNG_OK) {
+		goto error;
+	}
+
+	/* Flag every event that they are now enabled. */
+	rcu_read_lock();
+	cds_lfht_for_each_entry(usess->domain_jul.events->ht, &iter.iter, jevent,
+			node.node) {
+		jevent->enabled = 1;
+	}
+	rcu_read_unlock();
+
+	ret = LTTNG_OK;
+
+error:
+	return ret;
+}
+
+/*
+ * Enable a single JUL event for a given UST session.
+ *
+ * Return LTTNG_OK on success or else a LTTNG_ERR* code.
+ */
+int event_jul_enable(struct ltt_ust_session *usess, struct lttng_event *event)
+{
+	int ret, created = 0;
+	struct jul_event *jevent;
+
+	assert(usess);
+	assert(event);
+
+	DBG("Event JUL enabling %s for session %" PRIu64, event->name, usess->id);
+
+	jevent = jul_find_by_name(event->name, &usess->domain_jul);
+	if (!jevent) {
+		jevent = jul_create_event(event->name);
+		if (!jevent) {
+			ret = LTTNG_ERR_NOMEM;
+			goto error;
+		}
+		created = 1;
+	}
+
+	/* Already enabled? */
+	if (jevent->enabled) {
+		goto end;
+	}
+
+	ret = jul_enable_event(jevent);
+	if (ret != LTTNG_OK) {
+		goto error;
+	}
+
+	/* If the event was created prior to the enable, add it to the domain. */
+	if (created) {
+		jul_add_event(jevent, &usess->domain_jul);
+	}
+
+end:
+	return LTTNG_OK;
+
+error:
+	if (created) {
+		jul_destroy_event(jevent);
+	}
+	return ret;
+}
+
+/*
+ * Disable a single JUL event for a given UST session.
+ *
+ * Return LTTNG_OK on success or else a LTTNG_ERR* code.
+ */
+int event_jul_disable(struct ltt_ust_session *usess, char *event_name)
+{
+	int ret;
+	struct jul_event *jevent;
+
+	assert(usess);
+	assert(event_name);
+
+	DBG("Event JUL disabling %s for session %" PRIu64, event_name, usess->id);
+
+	jevent = jul_find_by_name(event_name, &usess->domain_jul);
+	if (!jevent) {
+		ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
+		goto error;
+	}
+
+	/* Already disabled? */
+	if (!jevent->enabled) {
+		goto end;
+	}
+
+	ret = jul_disable_event(jevent);
+	if (ret != LTTNG_OK) {
+		goto error;
+	}
+
+end:
+	return LTTNG_OK;
+
+error:
+	return ret;
+}
+/*
+ * Disable all JUL event for a given UST session.
+ *
+ * Return LTTNG_OK on success or else a LTTNG_ERR* code.
+ */
+int event_jul_disable_all(struct ltt_ust_session *usess)
+{
+	int ret, do_disable = 0;
+	struct jul_event *jevent;
+	struct lttng_ht_iter iter;
+
+	assert(usess);
+
+	/* Enable event on JUL application through TCP socket. */
+	ret = event_jul_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;
+		}
+	}
+
+	/* Flag every event that they are now enabled. */
+	rcu_read_lock();
+	cds_lfht_for_each_entry(usess->domain_jul.events->ht, &iter.iter, jevent,
+			node.node) {
+		if (jevent->enabled && do_disable) {
+			ret = event_jul_disable(usess, jevent->name);
+			if (ret != LTTNG_OK) {
+				rcu_read_unlock();
+				goto error;
+			}
+		}
+		jevent->enabled = 0;
+	}
+	rcu_read_unlock();
+
+	ret = LTTNG_OK;
+
+error:
+	return ret;
+}