X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fust-events-internal.h;h=f116c2e1a8f70cd3e11e861f97ddfb04932a9d2d;hb=a4e2c093247d929471eae2f16fa7c4e799eedfe3;hp=ec409457deb8f27086f8518b218865c029337bcc;hpb=0c1264b086ec11b114a15e49b82c7a0b31e87634;p=lttng-ust.git

diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index ec409457..f116c2e1 100644
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -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 {
@@ -333,6 +332,9 @@ struct lttng_ust_session_private {
 	struct lttng_ust_enum_ht enums_ht;	/* ht of enumerations */
 	struct cds_list_head enums_head;
 	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 {
@@ -752,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,
@@ -766,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,
@@ -785,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);
@@ -894,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 */