X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=216bccb80f6bc75f28e88e4891d092d0621d47ed;hp=5e0b3c51866ef579d5b66b25b8d352cd182f9188;hb=4e6581a7740c292be662d108a21a80e478b42a71;hpb=3968741092cac3eaf33f7bf558bb2b476189470b

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index 5e0b3c518..216bccb80 100644
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -27,7 +27,7 @@
 #include <common/defaults.h>
 
 #include "consumer.h"
-#include "ust-ctl.h"
+#include "lttng-ust-ctl.h"
 
 struct agent;
 
@@ -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,7 +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;
 };
 
 /*
@@ -184,7 +195,7 @@ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
 		enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
 		struct lttng_event_exclusion *exclusion);
 struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
-		char *name);
+		const char *name);
 struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
 		enum lttng_domain_type domain_type);
 
@@ -200,9 +211,9 @@ enum lttng_error_code trace_ust_create_event(struct lttng_event *ev,
 		struct lttng_event_exclusion *exclusion,
 		bool internal_event, struct ltt_ust_event **ust_event);
 struct ltt_ust_context *trace_ust_create_context(
-		struct lttng_event_context *ctx);
-int trace_ust_match_context(struct ltt_ust_context *uctx,
-		struct lttng_event_context *ctx);
+		const struct lttng_event_context *ctx);
+int trace_ust_match_context(const struct ltt_ust_context *uctx,
+		const struct lttng_event_context *ctx);
 void trace_ust_delete_channel(struct lttng_ht *ht,
 		struct ltt_ust_channel *channel);
 
@@ -214,14 +225,22 @@ void trace_ust_destroy_session(struct ltt_ust_session *session);
 void trace_ust_destroy_channel(struct ltt_ust_channel *channel);
 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);
+int trace_ust_list_tracker_ids(enum lttng_tracker_type tracker_type,
+		struct ltt_ust_session *session,
+		struct lttng_tracker_ids **_ids);
 
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
@@ -237,7 +256,7 @@ static inline int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node,
 }
 static inline
 struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
-		char *name)
+		const char *name)
 {
 	return NULL;
 }
@@ -276,15 +295,21 @@ static inline
 void trace_ust_destroy_event(struct ltt_ust_event *event)
 {
 }
+
+static inline
+void trace_ust_free_session(struct ltt_ust_session *session)
+{
+}
+
 static inline
 struct ltt_ust_context *trace_ust_create_context(
-		struct lttng_event_context *ctx)
+		const struct lttng_event_context *ctx)
 {
 	return NULL;
 }
 static inline
-int trace_ust_match_context(struct ltt_ust_context *uctx,
-		struct lttng_event_context *ctx)
+int trace_ust_match_context(const struct ltt_ust_context *uctx,
+		const struct lttng_event_context *ctx)
 {
 	return 0;
 }
@@ -308,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 int trace_ust_list_tracker_ids(
+		enum lttng_tracker_type tracker_type,
+		struct ltt_ust_session *session,
+		struct lttng_tracker_ids **_ids)
 {
 	return -1;
 }