From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Thu, 10 Sep 2015 20:10:55 +0000 (-0400)
Subject: Bring back event_ust_disable_all_tracepoints
X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=b1e7fe2d0294fc0a37152f2bdbeb48958dadbedb

Bring back event_ust_disable_all_tracepoints

Revert part of be42c96885c522f857f146fa6f7ae53856e3bed2

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 8cca21391..38cbe7925 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -353,6 +353,57 @@ error:
 	return ret;
 }
 
+/*
+ * Disable all UST tracepoints for a channel from a UST session.
+ */
+int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess,
+		struct ltt_ust_channel *uchan)
+{
+	int ret, i, size;
+	struct lttng_ht_iter iter;
+	struct ltt_ust_event *uevent = NULL;
+	struct lttng_event *events = NULL;
+
+	assert(usess);
+	assert(uchan);
+
+	rcu_read_lock();
+
+	/* 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;
+			}
+		}
+	}
+
+	/* 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;
+		}
+	}
+
+	ret = LTTNG_OK;
+error:
+	rcu_read_unlock();
+	free(events);
+	return ret;
+}
+
 /*
  * Enable all agent event for a given UST session.
  *
diff --git a/src/bin/lttng-sessiond/event.h b/src/bin/lttng-sessiond/event.h
index 2cf0d5eb5..7c5231dec 100644
--- a/src/bin/lttng-sessiond/event.h
+++ b/src/bin/lttng-sessiond/event.h
@@ -41,6 +41,9 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 int event_ust_disable_tracepoint(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, char *event_name);
 
+int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess,
+		struct ltt_ust_channel *uchan);
+
 int event_agent_enable(struct ltt_ust_session *usess, struct agent *agt,
 		struct lttng_event *event, struct lttng_filter_bytecode *filter,
 		char *filter_expression);