X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-ctl.h;h=f83124d11bbd9276100642dff9a4041a0ac892bc;hb=d6ddec3f8a747381dfb2af999731b83379713960;hp=201782341443d070b2382a8db7f3745873d3e25c;hpb=735ea6a81120f85d94666245f24aac233519568e;p=lttng-ust.git

diff --git a/include/lttng/ust-ctl.h b/include/lttng/ust-ctl.h
index 20178234..f83124d1 100644
--- a/include/lttng/ust-ctl.h
+++ b/include/lttng/ust-ctl.h
@@ -53,6 +53,7 @@ struct ustctl_consumer_channel_attr {
 	enum lttng_ust_output output;		/* splice, mmap */
 	uint32_t chan_id;			/* channel ID */
 	unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
+	int64_t blocking_timeout;			/* Blocking timeout (usec) */
 } LTTNG_PACKED;
 
 /*
@@ -226,6 +227,7 @@ int ustctl_put_next_subbuf(struct ustctl_consumer_stream *stream);
 /* snapshot */
 
 int ustctl_snapshot(struct ustctl_consumer_stream *stream);
+int ustctl_snapshot_sample_positions(struct ustctl_consumer_stream *stream);
 int ustctl_snapshot_get_consumed(struct ustctl_consumer_stream *stream,
 		unsigned long *pos);
 int ustctl_snapshot_get_produced(struct ustctl_consumer_stream *stream,
@@ -330,11 +332,20 @@ struct ustctl_enum_value {
 	char padding[USTCTL_UST_ENUM_VALUE_PADDING];
 } LTTNG_PACKED;
 
+enum ustctl_ust_enum_entry_options {
+	USTCTL_UST_ENUM_ENTRY_OPTION_IS_AUTO = 1U << 0,
+};
+
 #define USTCTL_UST_ENUM_ENTRY_PADDING	32
 struct ustctl_enum_entry {
 	struct ustctl_enum_value start, end; /* start and end are inclusive */
 	char string[LTTNG_UST_SYM_NAME_LEN];
-	char padding[USTCTL_UST_ENUM_ENTRY_PADDING];
+	union {
+		struct {
+			uint32_t options;
+		} LTTNG_PACKED extra;
+		char padding[USTCTL_UST_ENUM_ENTRY_PADDING];
+	} u;
 } LTTNG_PACKED;
 
 #define USTCTL_UST_BASIC_TYPE_PADDING	296