X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-ctl.h;h=06de95c25ee12160b8fefcd545ac5eff961341cb;hb=a6f80644ef276de19ba7e018659070b7504d7ca4;hp=78e0cf727feb1a91c150c2a5b308bd8d3750c710;hpb=5ea386c3b8e3566ec0b6710c82aae433de4d944a;p=lttng-ust.git

diff --git a/include/lttng/ust-ctl.h b/include/lttng/ust-ctl.h
index 78e0cf72..06de95c2 100644
--- a/include/lttng/ust-ctl.h
+++ b/include/lttng/ust-ctl.h
@@ -59,6 +59,17 @@ struct ustctl_consumer_channel_attr {
  * API used by sessiond.
  */
 
+struct lttng_ust_context_attr {
+	enum lttng_ust_context_type ctx;
+	union {
+		struct lttng_ust_perf_counter_ctx perf_counter;
+		struct {
+			char *provider_name;
+			char *ctx_name;
+		} app_ctx;
+	} u;
+};
+
 /*
  * Error values: all the following functions return:
  * >= 0: Success (LTTNG_UST_OK)
@@ -69,7 +80,7 @@ int ustctl_create_session(int sock);
 int ustctl_create_event(int sock, struct lttng_ust_event *ev,
 		struct lttng_ust_object_data *channel_data,
 		struct lttng_ust_object_data **event_data);
-int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
+int ustctl_add_context(int sock, struct lttng_ust_context_attr *ctx,
 		struct lttng_ust_object_data *obj_data,
 		struct lttng_ust_object_data **context_data);
 int ustctl_set_filter(int sock, struct lttng_ust_filter_bytecode *bytecode,
@@ -241,6 +252,10 @@ int ustctl_get_stream_id(struct ustctl_consumer_stream *stream,
 		uint64_t *stream_id);
 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);
@@ -255,6 +270,7 @@ enum ustctl_socket_type {
 enum ustctl_notify_cmd {
 	USTCTL_NOTIFY_CMD_EVENT = 0,
 	USTCTL_NOTIFY_CMD_CHANNEL = 1,
+	USTCTL_NOTIFY_CMD_ENUM = 2,
 };
 
 enum ustctl_channel_header {
@@ -272,6 +288,8 @@ enum ustctl_abstract_types {
 	ustctl_atype_sequence,
 	ustctl_atype_string,
 	ustctl_atype_float,
+	ustctl_atype_variant,
+	ustctl_atype_struct,
 	NR_USTCTL_ABSTRACT_TYPES,
 };
 
@@ -302,9 +320,28 @@ 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 {
+	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 {
 	struct ustctl_integer_type integer;
+	struct {
+		char name[LTTNG_UST_SYM_NAME_LEN];
+		struct ustctl_integer_type container_type;
+		uint64_t id;	/* enum ID in sessiond. */
+	} enumeration;
 	struct {
 		enum ustctl_string_encodings encoding;
 	} string;
@@ -332,6 +369,15 @@ struct ustctl_type {
 			struct ustctl_basic_type length_type;
 			struct ustctl_basic_type elem_type;
 		} sequence;
+		struct {
+			uint32_t nr_choices;
+			char tag_name[LTTNG_UST_SYM_NAME_LEN];
+			/* Followed by nr_choices struct ustctl_field. */
+		} variant;
+		struct {
+			uint32_t nr_fields;
+			/* Followed by nr_fields struct ustctl_field. */
+		} _struct;
 		char padding[USTCTL_UST_TYPE_PADDING];
 	} u;
 } LTTNG_PACKED;
@@ -403,6 +449,22 @@ int ustctl_reply_register_event(int sock,
 	uint32_t id,			/* event id (input) */
 	int ret_code);			/* return code. 0 ok, negative error */
 
+/*
+ * Returns 0 on success, negative UST or system error value on error.
+ */
+int ustctl_recv_register_enum(int sock,
+	int *session_objd,
+	char *enum_name,
+	struct ustctl_enum_entry **entries,
+	size_t *nr_entries);
+
+/*
+ * Returns 0 on success, negative error value on error.
+ */
+int ustctl_reply_register_enum(int sock,
+	uint64_t id,			/* enum id (input) */
+	int ret_code);
+
 /*
  * Returns 0 on success, negative UST or system error value on error.
  */