X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;fp=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=1f6f534fec96591d6f651dac800a396987f1160f;hp=7d923d5270d6f39b412e18d51a5509b854b7cc85;hb=55c9e7cac24318259d4f2549c97f7577b7b52db4;hpb=a8c3ad3e850d45026f22ecdc7ea963b7e923bd08

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index 7d923d527..1f6f534fe 100644
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -91,11 +91,11 @@ struct ltt_ust_domain_global {
 	struct cds_list_head registry_buffer_uid_list;
 };
 
-struct ust_pid_tracker_node {
+struct ust_id_tracker_node {
 	struct lttng_ht_node_ulong node;
 };
 
-struct ust_pid_tracker {
+struct ust_id_tracker {
 	struct lttng_ht *ht;
 };
 
@@ -138,10 +138,18 @@ struct ltt_ust_session {
 	char root_shm_path[PATH_MAX];
 	char shm_path[PATH_MAX];
 
-	struct ust_pid_tracker pid_tracker;
-
 	/* Current trace chunk of the ltt_session. */
 	struct lttng_trace_chunk *current_trace_chunk;
+
+	/* Trackers used for actual lookup on app registration. */
+	struct ust_id_tracker vpid_tracker;
+	struct ust_id_tracker vuid_tracker;
+	struct ust_id_tracker vgid_tracker;
+
+	/* Tracker list of keys requested by users. */
+	struct lttng_tracker_list *tracker_list_vpid;
+	struct lttng_tracker_list *tracker_list_vuid;
+	struct lttng_tracker_list *tracker_list_vgid;
 };
 
 /*
@@ -219,13 +227,20 @@ void trace_ust_destroy_event(struct ltt_ust_event *event);
 void trace_ust_destroy_context(struct ltt_ust_context *ctx);
 void trace_ust_free_session(struct ltt_ust_session *session);
 
-int trace_ust_track_pid(struct ltt_ust_session *session, int pid);
-int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid);
+int trace_ust_track_id(enum lttng_tracker_type tracker_type,
+		struct ltt_ust_session *session,
+		const struct lttng_tracker_id *id);
+int trace_ust_untrack_id(enum lttng_tracker_type tracker_type,
+		struct ltt_ust_session *session,
+		const struct lttng_tracker_id *id);
 
-int trace_ust_pid_tracker_lookup(struct ltt_ust_session *session, int pid);
+int trace_ust_id_tracker_lookup(enum lttng_tracker_type tracker_type,
+		struct ltt_ust_session *session,
+		int id);
 
-ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session,
-		int32_t **_pids);
+ssize_t trace_ust_list_tracker_ids(enum lttng_tracker_type tracker_type,
+		struct ltt_ust_session *session,
+		struct lttng_tracker_id **_ids);
 
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
@@ -318,24 +333,29 @@ struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
 {
 	return NULL;
 }
-static inline
-int trace_ust_track_pid(struct ltt_ust_session *session, int pid)
+static inline int trace_ust_track_id(enum lttng_tracker_type tracker_type,
+		struct ltt_ust_session *session,
+		const struct lttng_tracker_id *id);
 {
 	return 0;
 }
-static inline
-int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid)
+static inline int trace_ust_untrack_id(enum lttng_tracker_type tracker_type,
+		struct ltt_ust_session *session,
+		const struct lttng_tracker_id *id)
 {
 	return 0;
 }
-static inline
-int trace_ust_pid_tracker_lookup(struct ltt_ust_session *session, int pid)
+static inline int trace_ust_id_tracker_lookup(
+		enum lttng_tracker_type tracker_type,
+		struct ltt_ust_session *session,
+		int pid)
 {
 	return 0;
 }
-static inline
-ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session,
-		int32_t **_pids)
+static inline ssize_t trace_ust_list_tracker_ids(
+		enum lttng_tracker_type tracker_type,
+		struct ltt_ust_session *session,
+		struct lttng_tracker_id **_ids)
 {
 	return -1;
 }