X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fust-events-internal.h;h=f116c2e1a8f70cd3e11e861f97ddfb04932a9d2d;hb=f574bfb4d81b26d3cfc0243868d138e33470a950;hp=65023b3f8820de423d2c656fbd0393f2d242403a;hpb=a2e4d05e924d4cb02b47430c2d0f39e6a6a89720;p=lttng-ust.git

diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index 65023b3f..f116c2e1 100644
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -240,9 +240,9 @@ struct lttng_event_notifier_group {
 	int notification_fd;
 	struct cds_list_head node;		/* Event notifier group handle list */
 	struct cds_list_head enablers_head;
-	struct cds_list_head event_notifiers_head;	/* list of event_notifiers */
+	struct cds_list_head event_notifiers_head; /* list of event_notifiers */
 	struct lttng_ust_event_notifier_ht event_notifiers_ht; /* hashtable of event_notifiers */
-	struct lttng_ust_ctx *ctx;			/* contexts for filters. */
+	struct lttng_ust_ctx *ctx;		/* contexts for filters. */
 
 	struct lttng_counter *error_counter;
 	size_t error_counter_len;
@@ -268,7 +268,7 @@ struct lttng_ust_event_common_private {
 	struct lttng_ust_event_desc *desc;
 	/* Backward references: list of lttng_enabler_ref (ref to enablers) */
 	struct cds_list_head enablers_ref_head;
-	int registered;			/* has reg'd tracepoint probe */
+	int registered;				/* has reg'd tracepoint probe */
 	uint64_t user_token;
 
 	int has_enablers_without_filter_bytecode;
@@ -295,7 +295,6 @@ struct lttng_ust_event_notifier_private {
 	struct cds_list_head node;		/* Event notifier list */
 	struct cds_hlist_node hlist;		/* Hash table of event notifiers */
 	struct cds_list_head capture_bytecode_runtime_head;
-
 };
 
 struct lttng_ust_bytecode_runtime {
@@ -305,7 +304,7 @@ struct lttng_ust_bytecode_runtime {
 	int (*interpreter_func)(struct lttng_ust_bytecode_runtime *bytecode_runtime,
 			const char *interpreter_stack_data,
 			void *ctx);
-	struct cds_list_head node;	/* list of bytecode runtime in event */
+	struct cds_list_head node;		/* list of bytecode runtime in event */
 	/*
 	 * Pointer to a URCU-protected pointer owned by an `struct
 	 * lttng_session`or `struct lttng_event_notifier_group`.
@@ -322,28 +321,28 @@ struct lttng_ust_session_private {
 	struct cds_list_head events_head;	/* list of events */
 	struct cds_list_head node;		/* Session list */
 
-	/* New UST 2.1 */
 	/* List of enablers */
 	struct cds_list_head enablers_head;
 	struct lttng_ust_event_ht events_ht;	/* ht of events */
 	void *owner;				/* object owner */
 	int tstate:1;				/* Transient enable state */
 
-	/* New UST 2.4 */
 	int statedump_pending:1;
 
-	/* New UST 2.8 */
 	struct lttng_ust_enum_ht enums_ht;	/* ht of enumerations */
 	struct cds_list_head enums_head;
-	struct lttng_ust_ctx *ctx;			/* contexts for filters. */
+	struct lttng_ust_ctx *ctx;		/* contexts for filters. */
+
+	unsigned char uuid[LTTNG_UST_UUID_LEN];	/* Trace session unique ID */
+	bool uuid_set;				/* Is uuid set ? */
 };
 
 struct lttng_enum {
 	struct lttng_ust_enum_desc *desc;
 	struct lttng_ust_session *session;
-	struct cds_list_head node;	/* Enum list in session */
-	struct cds_hlist_node hlist;	/* Session ht of enums */
-	uint64_t id;			/* Enumeration ID in sessiond */
+	struct cds_list_head node;		/* Enum list in session */
+	struct cds_hlist_node hlist;		/* Session ht of enums */
+	uint64_t id;				/* Enumeration ID in sessiond */
 };
 
 struct lttng_ust_shm_handle;
@@ -377,17 +376,17 @@ struct lttng_ust_channel_ops_private {
 struct lttng_ust_channel_common_private {
 	struct lttng_ust_channel_common *pub;	/* Public channel interface */
 
-	int objd;	/* Object associated with channel. */
-	int tstate:1;			/* Transient enable state */
+	int objd;				/* Object associated with channel. */
+	int tstate:1;				/* Transient enable state */
 };
 
 struct lttng_ust_channel_buffer_private {
 	struct lttng_ust_channel_common_private parent;
 
 	struct lttng_ust_channel_buffer *pub;	/* Public channel buffer interface */
-	struct cds_list_head node;	/* Channel list in session */
-	int header_type;		/* 0: unset, 1: compact, 2: large */
-	unsigned int id;		/* Channel ID */
+	struct cds_list_head node;		/* Channel list in session */
+	int header_type;			/* 0: unset, 1: compact, 2: large */
+	unsigned int id;			/* Channel ID */
 	enum lttng_ust_abi_chan_type type;
 	struct lttng_ust_ctx *ctx;
 	unsigned char uuid[LTTNG_UST_UUID_LEN];	/* Trace session unique ID */
@@ -755,7 +754,7 @@ struct lttng_counter *lttng_ust_counter_create(
 		const char *counter_transport_name,
 		size_t number_dimensions, const struct lttng_counter_dimension *dimensions);
 
-#ifdef HAVE_PERF_EVENT
+#ifdef HAVE_LINUX_PERF_EVENT_H
 
 __attribute__((visibility("hidden")))
 int lttng_add_perf_counter_to_ctx(uint32_t type,
@@ -769,7 +768,7 @@ int lttng_perf_counter_init(void);
 __attribute__((visibility("hidden")))
 void lttng_perf_counter_exit(void);
 
-#else /* #ifdef HAVE_PERF_EVENT */
+#else /* #ifdef HAVE_LINUX_PERF_EVENT_H */
 
 static inline
 int lttng_add_perf_counter_to_ctx(uint32_t type,
@@ -788,7 +787,7 @@ static inline
 void lttng_perf_counter_exit(void)
 {
 }
-#endif /* #else #ifdef HAVE_PERF_EVENT */
+#endif /* #else #ifdef HAVE_LINUX_PERF_EVENT_H */
 
 __attribute__((visibility("hidden")))
 int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list);
@@ -897,4 +896,8 @@ int lttng_ust_interpret_event_filter(struct lttng_ust_event_common *event,
 		const char *interpreter_stack_data,
 		void *filter_ctx);
 
+__attribute__((visibility("hidden")))
+int lttng_ust_session_uuid_validate(struct lttng_ust_session *session,
+		unsigned char *uuid);
+
 #endif /* _LTTNG_UST_EVENTS_INTERNAL_H */