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

diff --git a/include/lttng/ust-ctl.h b/include/lttng/ust-ctl.h
index f62c5022..20178234 100644
--- a/include/lttng/ust-ctl.h
+++ b/include/lttng/ust-ctl.h
@@ -254,10 +254,15 @@ int ustctl_get_current_timestamp(struct ustctl_consumer_stream *stream,
 		uint64_t *ts);
 int ustctl_get_sequence_number(struct ustctl_consumer_stream *stream,
 		uint64_t *seq);
+int ustctl_get_instance_id(struct ustctl_consumer_stream *stream,
+		uint64_t *id);
 
 /* returns whether UST has perf counters support. */
 int ustctl_has_perf_counters(void);
 
+/* Regenerate the statedump. */
+int ustctl_regenerate_statedump(int sock, int handle);
+
 /* event registry management */
 
 enum ustctl_socket_type {
@@ -304,7 +309,7 @@ struct ustctl_integer_type {
 	uint32_t signedness;
 	uint32_t reverse_byte_order;
 	uint32_t base;		/* 2, 8, 10, 16, for pretty print */
-	enum ustctl_string_encodings encoding;
+	int32_t encoding;	/* enum ustctl_string_encodings */
 	uint16_t alignment;	/* in bits */
 	char padding[USTCTL_UST_INTEGER_TYPE_PADDING];
 } LTTNG_PACKED;
@@ -318,12 +323,19 @@ struct ustctl_float_type {
 	char padding[USTCTL_UST_FLOAT_TYPE_PADDING];
 } LTTNG_PACKED;
 
+#define USTCTL_UST_ENUM_VALUE_PADDING	15
+struct ustctl_enum_value {
+	uint64_t value;
+	uint8_t signedness;
+	char padding[USTCTL_UST_ENUM_VALUE_PADDING];
+} LTTNG_PACKED;
+
 #define USTCTL_UST_ENUM_ENTRY_PADDING	32
 struct ustctl_enum_entry {
-	uint64_t start, end;		/* start and end are inclusive */
+	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];
-};
+} LTTNG_PACKED;
 
 #define USTCTL_UST_BASIC_TYPE_PADDING	296
 union _ustctl_basic_type {
@@ -334,7 +346,7 @@ union _ustctl_basic_type {
 		uint64_t id;	/* enum ID in sessiond. */
 	} enumeration;
 	struct {
-		enum ustctl_string_encodings encoding;
+		int32_t encoding;	/* enum ustctl_string_encodings */
 	} string;
 	struct ustctl_float_type _float;
 	char padding[USTCTL_UST_BASIC_TYPE_PADDING];