X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=019b0ebb02af5512c893cfe72147963eec88d3cb;hb=35ac38cb4cc188253c600766882b7a833f5a81ee;hp=039b2ccba1b5db86726ec0a4512e8c52e10c6139;hpb=710b8ee36eec50c00e72cb61e146357130e1d94c;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 039b2ccb..019b0ebb 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -106,11 +106,20 @@ struct lttng_enum_value {
 	unsigned int signedness:1;
 };
 
+enum lttng_enum_entry_options {
+	LTTNG_ENUM_ENTRY_OPTION_IS_AUTO = 1U << 0,
+};
+
 #define LTTNG_UST_ENUM_ENTRY_PADDING	16
 struct lttng_enum_entry {
 	struct lttng_enum_value start, end; /* start and end are inclusive */
 	const char *string;
-	char padding[LTTNG_UST_ENUM_ENTRY_PADDING];
+	union {
+		struct {
+			unsigned int options;
+		} LTTNG_PACKED extra;
+		char padding[LTTNG_UST_ENUM_ENTRY_PADDING];
+	} u;
 };
 
 #define __type_integer(_type, _byte_order, _base, _encoding)	\
@@ -333,7 +342,7 @@ struct lttng_probe_desc {
 /* Data structures used by the tracer. */
 
 enum lttng_enabler_type {
-	LTTNG_ENABLER_WILDCARD,
+	LTTNG_ENABLER_STAR_GLOB,
 	LTTNG_ENABLER_EVENT,
 };
 
@@ -480,7 +489,8 @@ struct lttng_channel_ops {
 			unsigned int read_timer_interval,
 			unsigned char *uuid,
 			uint32_t chan_id,
-			const int *stream_fds, int nr_stream_fds);
+			const int *stream_fds, int nr_stream_fds,
+			int64_t blocking_timeout);
 	void (*channel_destroy)(struct lttng_channel *chan);
 	union {
 		void *_deprecated1;
@@ -646,6 +656,7 @@ void synchronize_trace(void);
 
 int lttng_probe_register(struct lttng_probe_desc *desc);
 void lttng_probe_unregister(struct lttng_probe_desc *desc);
+void lttng_probe_provider_unregister_events(struct lttng_probe_desc *desc);
 int lttng_fix_pending_events(void);
 int lttng_probes_init(void);
 void lttng_probes_exit(void);
@@ -723,6 +734,9 @@ struct cds_list_head *_lttng_get_sessions(void);
 struct lttng_enum *lttng_ust_enum_get(struct lttng_session *session,
 		const char *enum_name);
 
+void lttng_ust_dl_update(void *ip);
+void lttng_ust_fixup_fd_tracker_tls(void);
+
 /* For backward compatibility. Leave those exported symbols in place. */
 extern struct lttng_ctx *lttng_static_ctx;
 void lttng_context_init(void);