X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=d0980220d1519d9e5578b062c7fa1998ea65e8c5;hb=55c9e7cac24318259d4f2549c97f7577b7b52db4;hp=f3e0209014974f54cf547a91162dcb1c40a246e6;hpb=5da88b0f58d7f838068037ea449ddfb25d3e85ad;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index f3e020901..d0980220d 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -4183,9 +4183,22 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess,
 	cds_lfht_for_each_entry(ust_app_ht->ht, &iter, app, pid_n.node) {
 		struct ust_app_session *ua_sess;
 		int session_was_created = 0;
-
-		if (!app->compatible ||
-				!trace_ust_pid_tracker_lookup(usess, app->pid)) {
+		bool present_in_tracker =
+				trace_ust_id_tracker_lookup(LTTNG_TRACKER_VPID,
+						usess, app->pid) &&
+				trace_ust_id_tracker_lookup(LTTNG_TRACKER_VUID,
+						usess, app->uid) &&
+				trace_ust_id_tracker_lookup(LTTNG_TRACKER_VGID,
+						usess, app->gid);
+
+		if (!app->compatible || !(present_in_tracker)) {
+			/*
+			 * This is probably an error this MUST BE TESTED
+			 * Introduced by
+			 * 88e3c2f5610b9ac89b0923d448fee34140fc46fb On app not
+			 * in tracker we should skip it. not sure what to do on
+			 * app !compatible
+			 */
 			goto error_rcu_unlock;
 		}
 
@@ -5184,7 +5197,11 @@ void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app)
 	if (!app->compatible) {
 		return;
 	}
-	if (trace_ust_pid_tracker_lookup(usess, app->pid)) {
+	if (trace_ust_id_tracker_lookup(LTTNG_TRACKER_VPID, usess, app->pid) &&
+			trace_ust_id_tracker_lookup(
+					LTTNG_TRACKER_VUID, usess, app->uid) &&
+			trace_ust_id_tracker_lookup(
+					LTTNG_TRACKER_VGID, usess, app->gid)) {
 		/*
 		 * Synchronize the application's internal tracing configuration
 		 * and start tracing.
@@ -6547,3 +6564,151 @@ error:
 	rcu_read_unlock();
 	return ret;
 }
+
+/*
+ * Clear all the channels of a session.
+ *
+ * Return LTTNG_OK on success or else an LTTng error code.
+ */
+enum lttng_error_code ust_app_clear_session(struct ltt_session *session)
+{
+	int ret;
+	enum lttng_error_code cmd_ret = LTTNG_OK;
+	struct lttng_ht_iter iter;
+	struct ust_app *app;
+	struct ltt_ust_session *usess = session->ust_session;
+
+	assert(usess);
+
+	rcu_read_lock();
+
+	if (usess->active) {
+		ERR("Expecting inactive session %s (%" PRIu64 ")", session->name, session->id);
+		cmd_ret = LTTNG_ERR_FATAL;
+		goto end;
+	}
+
+	switch (usess->buffer_type) {
+	case LTTNG_BUFFER_PER_UID:
+	{
+		struct buffer_reg_uid *reg;
+
+		cds_list_for_each_entry(reg, &usess->buffer_reg_uid_list, lnode) {
+			struct buffer_reg_channel *reg_chan;
+			struct consumer_socket *socket;
+
+			/* Get consumer socket to use to push the metadata.*/
+			socket = consumer_find_socket_by_bitness(reg->bits_per_long,
+					usess->consumer);
+			if (!socket) {
+				cmd_ret = LTTNG_ERR_INVALID;
+				goto error_socket;
+			}
+
+			/* Clear the data channels. */
+			cds_lfht_for_each_entry(reg->registry->channels->ht, &iter.iter,
+					reg_chan, node.node) {
+				ret = consumer_clear_channel(socket,
+						reg_chan->consumer_key);
+				if (ret < 0) {
+					goto error;
+				}
+			}
+
+			(void) push_metadata(reg->registry->reg.ust, usess->consumer);
+
+			/*
+			 * Clear the metadata channel.
+			 * Metadata channel is not cleared per se but we still need to
+			 * perform a rotation operation on it behind the scene.
+			 */
+			ret = consumer_clear_channel(socket,
+					reg->registry->reg.ust->metadata_key);
+			if (ret < 0) {
+				goto error;
+			}
+		}
+		break;
+	}
+	case LTTNG_BUFFER_PER_PID:
+	{
+		cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
+			struct consumer_socket *socket;
+			struct lttng_ht_iter chan_iter;
+			struct ust_app_channel *ua_chan;
+			struct ust_app_session *ua_sess;
+			struct ust_registry_session *registry;
+
+			ua_sess = lookup_session_by_app(usess, app);
+			if (!ua_sess) {
+				/* Session not associated with this app. */
+				continue;
+			}
+
+			/* Get the right consumer socket for the application. */
+			socket = consumer_find_socket_by_bitness(app->bits_per_long,
+					usess->consumer);
+			if (!socket) {
+				cmd_ret = LTTNG_ERR_INVALID;
+				goto error_socket;
+			}
+
+			registry = get_session_registry(ua_sess);
+			if (!registry) {
+				DBG("Application session is being torn down. Skip application.");
+				continue;
+			}
+
+			/* Clear the data channels. */
+			cds_lfht_for_each_entry(ua_sess->channels->ht, &chan_iter.iter,
+					ua_chan, node.node) {
+				ret = consumer_clear_channel(socket, ua_chan->key);
+				if (ret < 0) {
+					/* Per-PID buffer and application going away. */
+					if (ret == -LTTNG_ERR_CHAN_NOT_FOUND) {
+						continue;
+					}
+					goto error;
+				}
+			}
+
+			(void) push_metadata(registry, usess->consumer);
+
+			/*
+			 * Clear the metadata channel.
+			 * Metadata channel is not cleared per se but we still need to
+			 * perform rotation operation on it behind the scene.
+			 */
+			ret = consumer_clear_channel(socket, registry->metadata_key);
+			if (ret < 0) {
+				/* Per-PID buffer and application going away. */
+				if (ret == -LTTNG_ERR_CHAN_NOT_FOUND) {
+					continue;
+				}
+				goto error;
+			}
+		}
+		break;
+	}
+	default:
+		assert(0);
+		break;
+	}
+
+	cmd_ret = LTTNG_OK;
+	goto end;
+
+error:
+	switch (-ret) {
+	case LTTCOMM_CONSUMERD_RELAYD_CLEAR_DISALLOWED:
+		cmd_ret = LTTNG_ERR_CLEAR_RELAY_DISALLOWED;
+		break;
+	default:
+		cmd_ret = LTTNG_ERR_CLEAR_FAIL_CONSUMER;
+	}
+
+error_socket:
+end:
+	rcu_read_unlock();
+	return cmd_ret;
+}