X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=5e456c52a38e3e3b3886fbfb7dff2b19637362b1;hb=92bc1e2318d93c9072ae79d7fd6a7c5953cb739e;hp=7fa41ac18d1664b7d409cd287d7202cd6af53418;hpb=3b82c4e1b18900cc7ad4045b9173cabfaa498852;p=lttng-modules.git diff --git a/include/lttng/events.h b/include/lttng/events.h index 7fa41ac1..5e456c52 100644 --- a/include/lttng/events.h +++ b/include/lttng/events.h @@ -10,7 +10,7 @@ #ifndef _LTTNG_EVENTS_H #define _LTTNG_EVENTS_H -#include +#include #include #include #include @@ -23,7 +23,7 @@ #include #include -#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,22 +35,22 @@ 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 { - lttng_encode_none = 0, - lttng_encode_UTF8 = 1, - lttng_encode_ASCII = 2, - NR_STRING_ENCODINGS, +enum lttng_kernel_string_encoding { + lttng_kernel_string_encoding_none = 0, + lttng_kernel_string_encoding_UTF8 = 1, + lttng_kernel_string_encoding_ASCII = 2, + NR_LTTNG_KERNEL_STRING_ENCODING, }; enum channel_type { @@ -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, \ @@ -82,7 +82,7 @@ struct lttng_enum_entry { .signedness = (_signedness) >= 0 ? (_signedness) : lttng_is_signed_type(_type), \ .reverse_byte_order = _byte_order != __BYTE_ORDER, \ .base = _base, \ - .encoding = lttng_encode_##_encoding, \ + .encoding = lttng_kernel_string_encoding_##_encoding, \ }, \ } \ @@ -92,15 +92,15 @@ struct lttng_integer_type { unsigned int signedness:1, reverse_byte_order:1; unsigned int base; /* 2, 8, 10, 16, for pretty print */ - enum lttng_string_encodings encoding; + enum lttng_kernel_string_encoding encoding; }; struct lttng_type { - enum abstract_types atype; + enum lttng_kernel_type type; union { struct lttng_integer_type integer; struct { - enum lttng_string_encodings encoding; + enum lttng_kernel_string_encoding encoding; } string; struct { const struct lttng_enum_desc *desc; /* Enumeration mapping */ @@ -157,7 +157,7 @@ union lttng_ctx_value { * lttng_ctx_field because cpu hotplug needs fixed-location addresses. */ struct lttng_perf_counter_field { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) struct lttng_cpuhp_node cpuhp_prepare; struct lttng_cpuhp_node cpuhp_online; #else @@ -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 */ }; @@ -986,6 +992,8 @@ void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc, struct lttng_ctx *ctx, struct list_head *instance_bytecode_runtime_head, struct list_head *enabler_bytecode_runtime_head); +void lttng_free_event_filter_runtime(struct lttng_event *event); +void lttng_free_event_notifier_filter_runtime(struct lttng_event_notifier *event_notifier); int lttng_probes_init(void); @@ -1039,7 +1047,7 @@ int lttng_add_migratable_to_ctx(struct lttng_ctx **ctx) int lttng_add_callstack_to_ctx(struct lttng_ctx **ctx, int type); #if defined(CONFIG_CGROUPS) && \ - ((LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) || \ + ((LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,6,0)) || \ LTTNG_UBUNTU_KERNEL_RANGE(4,4,0,0, 4,5,0,0)) int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx); #else @@ -1051,7 +1059,7 @@ int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx) #endif #if defined(CONFIG_IPC_NS) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -1062,7 +1070,7 @@ int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx) #endif #if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -1073,7 +1081,7 @@ int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx) #endif #if defined(CONFIG_NET_NS) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -1084,7 +1092,7 @@ int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx) #endif #if defined(CONFIG_PID_NS) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -1095,7 +1103,7 @@ int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx) #endif #if defined(CONFIG_USER_NS) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -1106,7 +1114,7 @@ int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx) #endif #if defined(CONFIG_UTS_NS) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -1117,7 +1125,7 @@ int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx) #endif #if defined(CONFIG_TIME_NS) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0)) int lttng_add_time_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -1351,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. */