X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=9cbc3b999d18a89edb1338608f3d3ded9d4c076d;hb=12bb2edb6ed3e96d3299a979e49b828f2b17dcb2;hp=6aa880f82eb1b8737dad767b0c5e94a23a159888;hpb=3ef5cc037506f5bce971bd66ef2f77310eca6650;p=lttng-modules.git

diff --git a/include/lttng/events.h b/include/lttng/events.h
index 6aa880f8..9cbc3b99 100644
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -23,7 +23,7 @@
 #include <lttng/abi-old.h>
 #include <lttng/endian.h>
 
-#define lttng_is_signed_type(type)	(((type)(-1)) < 0)
+#define lttng_is_signed_type(type)	(((type) -1) < (type) 1)
 
 struct lttng_channel;
 struct lttng_session;
@@ -35,15 +35,15 @@ struct lib_ring_buffer_config;
 
 /* Type description */
 
-enum abstract_types {
-	atype_integer,
-	atype_string,
-	atype_enum_nestable,
-	atype_array_nestable,
-	atype_sequence_nestable,
-	atype_struct_nestable,
-	atype_variant_nestable,
-	NR_ABSTRACT_TYPES,
+enum lttng_kernel_type {
+	lttng_kernel_type_integer,
+	lttng_kernel_type_string,
+	lttng_kernel_type_enum_nestable,
+	lttng_kernel_type_array_nestable,
+	lttng_kernel_type_sequence_nestable,
+	lttng_kernel_type_struct_nestable,
+	lttng_kernel_type_variant_nestable,
+	NR_LTTNG_KERNEL_TYPES,
 };
 
 enum lttng_string_encodings {
@@ -74,7 +74,7 @@ struct lttng_enum_entry {
 #define __type_integer(_type, _size, _alignment, _signedness,	\
 		_byte_order, _base, _encoding)	\
 	{							\
-	    .atype = atype_integer,				\
+	    .type = lttng_kernel_type_integer,				\
 	    .u.integer =					\
 		{						\
 		  .size = (_size) ? : sizeof(_type) * CHAR_BIT,	\
@@ -96,7 +96,7 @@ struct lttng_integer_type {
 };
 
 struct lttng_type {
-	enum abstract_types atype;
+	enum lttng_kernel_type type;
 	union {
 		struct lttng_integer_type integer;
 		struct {
@@ -353,6 +353,10 @@ struct lttng_event {
 	int has_enablers_without_bytecode;
 };
 
+struct lttng_kernel_notifier_ctx {
+	int eval_capture;
+};
+
 // FIXME: Really similar to lttng_event above. Could those be merged ?
 struct lttng_event_notifier {
 	enum lttng_event_type evtype;	/* First field. */
@@ -385,10 +389,12 @@ struct lttng_event_notifier {
 	size_t num_captures;
 	struct list_head capture_bytecode_runtime_head;
 	int has_enablers_without_bytecode;
+	int eval_capture;		/* Should evaluate capture */
 
 	void (*send_notification)(struct lttng_event_notifier *event_notifier,
 			struct lttng_probe_ctx *lttng_probe_ctx,
-			const char *interpreter_stack_data);
+			const char *interpreter_stack_data,
+			struct lttng_kernel_notifier_ctx *notif_ctx);
 	struct lttng_event_notifier_group *group; /* Weak ref */
 };
 
@@ -1353,7 +1359,7 @@ extern const struct file_operations lttng_syscall_list_fops;
 
 static inline bool lttng_is_bytewise_integer(const struct lttng_type *type)
 {
-	if (type->atype != atype_integer)
+	if (type->type != lttng_kernel_type_integer)
 		return false;
 	switch (type->u.integer.size) {
 	case 8:		/* Fall-through. */