X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=c7bcc85f5e0b8fed7ef9aeff108f3fb630517e95;hp=ab08ac0e4d04ccf409c8d02e358e11f0033a0520;hb=d28f6a948209434945e785f2ad3b89aaa67897e4;hpb=535b8ff4d115dfc5be97d9d90fd36ca772b10e87

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index ab08ac0e4..c7bcc85f5 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2817,14 +2817,6 @@ error:
 	return ret;
 }
 
-/*
- * Return pointer to traceable apps list.
- */
-struct lttng_ht *ust_app_get_ht(void)
-{
-	return ust_app_ht;
-}
-
 /*
  * Return ust app pointer or NULL if not found. RCU read side lock MUST be
  * acquired before calling this function.
@@ -3087,20 +3079,6 @@ void ust_app_unregister(int sock)
 	return;
 }
 
-/*
- * Return traceable_app_count
- */
-unsigned long ust_app_list_count(void)
-{
-	unsigned long count;
-
-	rcu_read_lock();
-	count = lttng_ht_get_count(ust_app_ht);
-	rcu_read_unlock();
-
-	return count;
-}
-
 /*
  * Fill events array with all events name of all registered apps.
  */
@@ -3538,65 +3516,6 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess,
 	return ret;
 }
 
-/*
- * For a specific UST session and UST channel, the event for all
- * registered apps.
- */
-int ust_app_disable_all_event_glb(struct ltt_ust_session *usess,
-		struct ltt_ust_channel *uchan)
-{
-	int ret = 0;
-	struct lttng_ht_iter iter, uiter;
-	struct lttng_ht_node_str *ua_chan_node;
-	struct ust_app *app;
-	struct ust_app_session *ua_sess;
-	struct ust_app_channel *ua_chan;
-	struct ust_app_event *ua_event;
-
-	DBG("UST app disabling all event for all apps in channel "
-			"%s for session id %" PRIu64, uchan->name, usess->id);
-
-	rcu_read_lock();
-
-	/* For all registered applications */
-	cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
-		if (!app->compatible) {
-			/*
-			 * TODO: In time, we should notice the caller of this error by
-			 * telling him that this is a version error.
-			 */
-			continue;
-		}
-		ua_sess = lookup_session_by_app(usess, app);
-		if (!ua_sess) {
-			/* The application has problem or is probably dead. */
-			continue;
-		}
-
-		/* Lookup channel in the ust app session */
-		lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter);
-		ua_chan_node = lttng_ht_iter_get_node_str(&uiter);
-		/* If the channel is not found, there is a code flow error */
-		assert(ua_chan_node);
-
-		ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
-
-		/* Disable each events of channel */
-		cds_lfht_for_each_entry(ua_chan->events->ht, &uiter.iter, ua_event,
-				node.node) {
-			ret = disable_ust_app_event(ua_sess, ua_event, app);
-			if (ret < 0) {
-				/* XXX: Report error someday... */
-				continue;
-			}
-		}
-	}
-
-	rcu_read_unlock();
-
-	return ret;
-}
-
 /*
  * For a specific UST session, create the channel for all registered apps.
  */
@@ -4476,69 +4395,6 @@ end:
 	return ret;
 }
 
-/*
- * Disable event for a channel from a UST session for a specific PID.
- */
-int ust_app_disable_event_pid(struct ltt_ust_session *usess,
-		struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent, pid_t pid)
-{
-	int ret = 0;
-	struct lttng_ht_iter iter;
-	struct lttng_ht_node_str *ua_chan_node, *ua_event_node;
-	struct ust_app *app;
-	struct ust_app_session *ua_sess;
-	struct ust_app_channel *ua_chan;
-	struct ust_app_event *ua_event;
-
-	DBG("UST app disabling event %s for PID %d", uevent->attr.name, pid);
-
-	rcu_read_lock();
-
-	app = ust_app_find_by_pid(pid);
-	if (app == NULL) {
-		ERR("UST app disable event per PID %d not found", pid);
-		ret = -1;
-		goto error;
-	}
-
-	if (!app->compatible) {
-		ret = 0;
-		goto error;
-	}
-
-	ua_sess = lookup_session_by_app(usess, app);
-	if (!ua_sess) {
-		/* The application has problem or is probably dead. */
-		goto error;
-	}
-
-	/* Lookup channel in the ust app session */
-	lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &iter);
-	ua_chan_node = lttng_ht_iter_get_node_str(&iter);
-	if (ua_chan_node == NULL) {
-		/* Channel does not exist, skip disabling */
-		goto error;
-	}
-	ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
-
-	lttng_ht_lookup(ua_chan->events, (void *)uevent->attr.name, &iter);
-	ua_event_node = lttng_ht_iter_get_node_str(&iter);
-	if (ua_event_node == NULL) {
-		/* Event does not exist, skip disabling */
-		goto error;
-	}
-	ua_event = caa_container_of(ua_event_node, struct ust_app_event, node);
-
-	ret = disable_ust_app_event(ua_sess, ua_event, app);
-	if (ret < 0) {
-		goto error;
-	}
-
-error:
-	rcu_read_unlock();
-	return ret;
-}
-
 /*
  * Calibrate registered applications.
  */