X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=54eb09550ce4000bd20855c0e40f254960ad19cb;hb=218deb69baab57ee2f6728eef18e84697f21197b;hp=867335032214d0d75f3232923e58b3851ca5a95e;hpb=b33b46f7161604cb9168e9bbc854413cf18269be;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 86733503..54eb0955 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -29,6 +29,7 @@
 
 #include <urcu/list.h>
 #include <urcu/hlist.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <lttng/ust-config.h>
 #include <lttng/ust-abi.h>
@@ -39,6 +40,10 @@
 #include <urcu/ref.h>
 #include <pthread.h>
 
+#ifndef LTTNG_PACKED
+#error "LTTNG_PACKED should be defined"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -51,7 +56,7 @@ extern "C" {
  * library, but the opposite is rejected: a newer tracepoint provider is
  * rejected by an older lttng-ust library.
  */
-#define LTTNG_UST_PROVIDER_MAJOR	1
+#define LTTNG_UST_PROVIDER_MAJOR	2
 #define LTTNG_UST_PROVIDER_MINOR	0
 
 struct lttng_channel;
@@ -83,13 +88,17 @@ enum lttng_client_types {
 /* Update the astract_types name table in lttng-types.c along with this enum */
 enum lttng_abstract_types {
 	atype_integer,
-	atype_enum,
-	atype_array,
-	atype_sequence,
+	atype_enum,	/* legacy */
+	atype_array,	/* legacy */
+	atype_sequence,	/* legacy */
 	atype_string,
 	atype_float,
 	atype_dynamic,
-	atype_struct,
+	atype_struct,	/* legacy */
+	atype_enum_nestable,
+	atype_array_nestable,
+	atype_sequence_nestable,
+	atype_struct_nestable,
 	NR_ABSTRACT_TYPES,
 };
 
@@ -127,17 +136,14 @@ struct lttng_enum_entry {
 	  .atype = atype_integer,				\
 	  .u =							\
 		{						\
-		  .basic = 					\
+		  .integer =					\
 			{					\
-			  .integer =				\
-				{				\
-				  .size = sizeof(_type) * CHAR_BIT,		\
-				  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
-				  .signedness = lttng_is_signed_type(_type),	\
-				  .reverse_byte_order = _byte_order != BYTE_ORDER, \
-				  .base = _base,				\
-				  .encoding = lttng_encode_##_encoding,		\
-				}				\
+			  .size = sizeof(_type) * CHAR_BIT,	\
+			  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
+			  .signedness = lttng_is_signed_type(_type), \
+			  .reverse_byte_order = _byte_order != BYTE_ORDER, \
+			  .base = _base,			\
+			  .encoding = lttng_encode_##_encoding,	\
 			}					\
 		},						\
 	}							\
@@ -167,18 +173,15 @@ struct lttng_integer_type {
 	  .atype = atype_float,					\
 	  .u =							\
 		{						\
-		  .basic =					\
+		  ._float =					\
 			{					\
-			  ._float =				\
-				{				\
-				  .exp_dig = sizeof(_type) * CHAR_BIT		\
-						  - _float_mant_dig(_type),	\
-				  .mant_dig = _float_mant_dig(_type),		\
-				  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
-				  .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER,	\
-				}				\
+			  .exp_dig = sizeof(_type) * CHAR_BIT	\
+					  - _float_mant_dig(_type), \
+			  .mant_dig = _float_mant_dig(_type),	\
+			  .alignment = lttng_alignof(_type) * CHAR_BIT, \
+			  .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER,	\
 			}					\
-		},						\
+		}						\
 	}							\
 
 #define LTTNG_UST_FLOAT_TYPE_PADDING	24
@@ -190,20 +193,22 @@ struct lttng_float_type {
 	char padding[LTTNG_UST_FLOAT_TYPE_PADDING];
 };
 
+/* legacy */
 #define LTTNG_UST_BASIC_TYPE_PADDING	128
 union _lttng_basic_type {
-	struct lttng_integer_type integer;
+	struct lttng_integer_type integer;	/* legacy */
 	struct {
 		const struct lttng_enum_desc *desc;	/* Enumeration mapping */
 		struct lttng_integer_type container_type;
-	} enumeration;
+	} enumeration;				/* legacy */
 	struct {
 		enum lttng_string_encodings encoding;
-	} string;
-	struct lttng_float_type _float;
+	} string;				/* legacy */
+	struct lttng_float_type _float;		/* legacy */
 	char padding[LTTNG_UST_BASIC_TYPE_PADDING];
 };
 
+/* legacy */
 struct lttng_basic_type {
 	enum lttng_abstract_types atype;
 	union {
@@ -215,19 +220,48 @@ struct lttng_basic_type {
 struct lttng_type {
 	enum lttng_abstract_types atype;
 	union {
-		union _lttng_basic_type basic;
+		/* provider ABI 2.0 */
+		struct lttng_integer_type integer;
+		struct lttng_float_type _float;
 		struct {
-			struct lttng_basic_type elem_type;
-			unsigned int length;		/* num. elems. */
-		} array;
+			enum lttng_string_encodings encoding;
+		} string;
 		struct {
-			struct lttng_basic_type length_type;
-			struct lttng_basic_type elem_type;
-		} sequence;
+			const struct lttng_enum_desc *desc;	/* Enumeration mapping */
+			struct lttng_type *container_type;
+		} enum_nestable;
 		struct {
-			uint32_t nr_fields;
-			struct lttng_event_field *fields;	/* Array of fields. */
-		} _struct;
+			const struct lttng_type *elem_type;
+			unsigned int length;			/* Num. elems. */
+			unsigned int alignment;
+		} array_nestable;
+		struct {
+			const char *length_name;		/* Length field name. */
+			const struct lttng_type *elem_type;
+			unsigned int alignment;			/* Alignment before elements. */
+		} sequence_nestable;
+		struct {
+			unsigned int nr_fields;
+			const struct lttng_event_field *fields;	/* Array of fields. */
+			unsigned int alignment;
+		} struct_nestable;
+
+		union {
+			/* legacy provider ABI 1.0 */
+			union _lttng_basic_type basic;	/* legacy */
+			struct {
+				struct lttng_basic_type elem_type;
+				unsigned int length;		/* Num. elems. */
+			} array;			/* legacy */
+			struct {
+				struct lttng_basic_type length_type;
+				struct lttng_basic_type elem_type;
+			} sequence;			/* legacy */
+			struct {
+				unsigned int nr_fields;
+				struct lttng_event_field *fields;	/* Array of fields. */
+			} _struct;			/* legacy */
+		} legacy;
 		char padding[LTTNG_UST_TYPE_PADDING];
 	} u;
 };
@@ -253,7 +287,12 @@ struct lttng_event_field {
 	const char *name;
 	struct lttng_type type;
 	unsigned int nowrite;	/* do not write into trace */
-	char padding[LTTNG_UST_EVENT_FIELD_PADDING];
+	union {
+		struct {
+			unsigned int nofilter:1;	/* do not consider for filter */
+		} ext;
+		char padding[LTTNG_UST_EVENT_FIELD_PADDING];
+	} u;
 };
 
 enum lttng_ust_dynamic_type {
@@ -361,6 +400,10 @@ struct lttng_enabler {
 
 	struct lttng_ust_event event_param;
 	struct lttng_channel *chan;
+	/*
+	 * Unused, but kept around to make it explicit that the tracer can do
+	 * it.
+	 */
 	struct lttng_ctx *ctx;
 	unsigned int enabled:1;
 };
@@ -494,6 +537,13 @@ struct lttng_channel_ops {
 	void (*channel_destroy)(struct lttng_channel *chan);
 	union {
 		void *_deprecated1;
+		/*
+		 * has_strcpy is needed by probe providers version 1.0 to
+		 * dynamically detect whether the LTTng-UST tracepoint
+		 * provider ABI implements event_strcpy. Starting from
+		 * probe providers version 2.0, the check is not needed,
+		 * but backward compatibility is provided for older versions.
+		 */
 		unsigned long has_strcpy:1;		/* ABI has strcpy */
 	} u;
 	void *_deprecated2;
@@ -674,8 +724,35 @@ int lttng_add_procname_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_ip_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_dyntest_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_vuid_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_veuid_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_vsuid_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_vgid_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_vegid_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_vsgid_to_ctx(struct lttng_ctx **ctx);
 void lttng_context_vtid_reset(void);
 void lttng_context_vpid_reset(void);
+void lttng_context_procname_reset(void);
+void lttng_context_cgroup_ns_reset(void);
+void lttng_context_ipc_ns_reset(void);
+void lttng_context_mnt_ns_reset(void);
+void lttng_context_net_ns_reset(void);
+void lttng_context_pid_ns_reset(void);
+void lttng_context_user_ns_reset(void);
+void lttng_context_uts_ns_reset(void);
+void lttng_context_vuid_reset(void);
+void lttng_context_veuid_reset(void);
+void lttng_context_vsuid_reset(void);
+void lttng_context_vgid_reset(void);
+void lttng_context_vegid_reset(void);
+void lttng_context_vsgid_reset(void);
 
 #ifdef LTTNG_UST_HAVE_PERF_EVENT
 int lttng_add_perf_counter_to_ctx(uint32_t type,
@@ -719,7 +796,6 @@ void lttng_probes_prune_field_list(struct lttng_ust_field_list *list);
 struct lttng_ust_field_iter *
 	lttng_ust_field_list_get_iter_next(struct lttng_ust_field_list *list);
 
-void lttng_filter_event_link_bytecode(struct lttng_event *event);
 void lttng_enabler_event_link_bytecode(struct lttng_event *event,
 		struct lttng_enabler *enabler);
 void lttng_free_event_filter_runtime(struct lttng_event *event);
@@ -742,6 +818,7 @@ void lttng_ust_fixup_fd_tracker_tls(void);
 extern struct lttng_ctx *lttng_static_ctx;
 void lttng_context_init(void);
 void lttng_context_exit(void);
+void lttng_filter_event_link_bytecode(struct lttng_event *event);
 
 #ifdef __cplusplus
 }