X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Flttng-kernel.h;h=aeab89d98affaa2ab8e4b26d178335a37856c517;hp=fc2a1e25944f26cd8273353d5dd6ce49dce92e9e;hb=4062406e2a957323852dca73a41e0239f6b9df03;hpb=d37ac3cdc4fe21f117edfb829db4d0eb7cf914a1

diff --git a/src/common/lttng-kernel.h b/src/common/lttng-kernel.h
index fc2a1e259..aeab89d98 100644
--- a/src/common/lttng-kernel.h
+++ b/src/common/lttng-kernel.h
@@ -129,28 +129,140 @@ struct lttng_kernel_event_callsite {
 	} u;
 } LTTNG_PACKED;
 
+enum lttng_kernel_syscall_entryexit {
+	LTTNG_KERNEL_SYSCALL_ENTRYEXIT	= 0,
+	LTTNG_KERNEL_SYSCALL_ENTRY	= 1,
+	LTTNG_KERNEL_SYSCALL_EXIT	= 2,
+};
+
+enum lttng_kernel_syscall_abi {
+	LTTNG_KERNEL_SYSCALL_ABI_ALL	= 0,
+	LTTNG_KERNEL_SYSCALL_ABI_NATIVE = 1,
+	LTTNG_KERNEL_SYSCALL_ABI_COMPAT = 2,
+};
+
+enum lttng_kernel_syscall_match {
+	LTTNG_KERNEL_SYSCALL_MATCH_NAME = 0,
+	LTTNG_KERNEL_SYSCALL_MATCH_NR	= 1,
+};
+
+struct lttng_kernel_syscall {
+	uint8_t entryexit;	/* enum lttng_kernel_syscall_entryexit */
+	uint8_t abi;		/* enum lttng_kernel_syscall_abi */
+	uint8_t match;		/* enum lttng_kernel_syscall_match */
+	uint8_t padding;
+	uint32_t nr;		/* For LTTNG_SYSCALL_MATCH_NR */
+} LTTNG_PACKED;
+
 /* Function tracer */
 struct lttng_kernel_function {
 	char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
 } LTTNG_PACKED;
 
-#define LTTNG_KERNEL_EVENT_PADDING1    16
+#define LTTNG_KERNEL_EVENT_PADDING1    8
 #define LTTNG_KERNEL_EVENT_PADDING2    LTTNG_KERNEL_SYM_NAME_LEN + 32
 struct lttng_kernel_event {
 	char name[LTTNG_KERNEL_SYM_NAME_LEN];
 	enum lttng_kernel_instrumentation instrumentation;
+	uint64_t token;
 	char padding[LTTNG_KERNEL_EVENT_PADDING1];
 
 	/* Per instrumentation type configuration */
 	union {
 		struct lttng_kernel_kretprobe kretprobe;
 		struct lttng_kernel_kprobe kprobe;
-		struct lttng_kernel_uprobe uprobe;
 		struct lttng_kernel_function ftrace;
+		struct lttng_kernel_uprobe uprobe;
+		struct lttng_kernel_syscall syscall;
 		char padding[LTTNG_KERNEL_EVENT_PADDING2];
 	} u;
 } LTTNG_PACKED;
 
+#define LTTNG_KERNEL_EVENT_NOTIFIER_PADDING	32
+struct lttng_kernel_event_notifier {
+	struct lttng_kernel_event event;
+	uint64_t error_counter_idx;
+
+	char padding[LTTNG_KERNEL_EVENT_NOTIFIER_PADDING];
+} LTTNG_PACKED;
+
+#define LTTNG_KERNEL_COUNTER_DIMENSION_MAX      4
+
+enum lttng_kernel_counter_arithmetic {
+	LTTNG_KERNEL_COUNTER_ARITHMETIC_MODULAR = 0,
+};
+
+enum lttng_kernel_counter_bitness {
+	LTTNG_KERNEL_COUNTER_BITNESS_32 = 0,
+	LTTNG_KERNEL_COUNTER_BITNESS_64 = 1,
+};
+
+struct lttng_kernel_counter_dimension {
+	uint64_t size;
+	uint64_t underflow_index;
+	uint64_t overflow_index;
+	uint8_t has_underflow;
+	uint8_t has_overflow;
+} LTTNG_PACKED;
+
+#define LTTNG_KERNEL_COUNTER_CONF_PADDING1      67
+struct lttng_kernel_counter_conf {
+	uint32_t arithmetic;	/* enum lttng_kernel_counter_arithmetic */
+	uint32_t bitness;	/* enum lttng_kernel_counter_bitness */
+	uint32_t number_dimensions;
+	int64_t global_sum_step;
+	struct lttng_kernel_counter_dimension dimensions[LTTNG_KERNEL_COUNTER_DIMENSION_MAX];
+	uint8_t coalesce_hits;
+	char padding[LTTNG_KERNEL_COUNTER_CONF_PADDING1];
+} LTTNG_PACKED;
+
+struct lttng_kernel_counter_index {
+	uint32_t number_dimensions;
+	uint64_t dimension_indexes[LTTNG_KERNEL_COUNTER_DIMENSION_MAX];
+} LTTNG_PACKED;
+
+struct lttng_kernel_counter_value {
+	int64_t value;
+	uint8_t underflow;
+	uint8_t overflow;
+} LTTNG_PACKED;
+
+#define LTTNG_KERNEL_COUNTER_READ_PADDING 32
+struct lttng_kernel_counter_read {
+	struct lttng_kernel_counter_index index;
+	int32_t cpu;	/* -1 for global counter, >= 0 for specific cpu. */
+	struct lttng_kernel_counter_value value;	/* output */
+	char padding[LTTNG_KERNEL_COUNTER_READ_PADDING];
+} LTTNG_PACKED;
+
+#define LTTNG_KERNEL_COUNTER_AGGREGATE_PADDING 32
+struct lttng_kernel_counter_aggregate {
+	struct lttng_kernel_counter_index index;
+	struct lttng_kernel_counter_value value;	/* output */
+	char padding[LTTNG_KERNEL_COUNTER_AGGREGATE_PADDING];
+} LTTNG_PACKED;
+
+#define LTTNG_KERNEL_COUNTER_CLEAR_PADDING 32
+struct lttng_kernel_counter_clear {
+	struct lttng_kernel_counter_index index;
+	char padding[LTTNG_KERNEL_COUNTER_CLEAR_PADDING];
+} LTTNG_PACKED;
+
+#define LTTNG_KERNEL_EVENT_NOTIFIER_NOTIFICATION_PADDING 32
+struct lttng_kernel_event_notifier_notification {
+	uint64_t token;
+	uint16_t capture_buf_size;
+	char padding[LTTNG_KERNEL_EVENT_NOTIFIER_NOTIFICATION_PADDING];
+} LTTNG_PACKED;
+
+#define LTTNG_KERNEL_CAPTURE_BYTECODE_MAX_LEN		65536
+struct lttng_kernel_capture_bytecode {
+	uint32_t len;
+	uint32_t reloc_offset;
+	uint64_t seqnum;
+	char data[0];
+} LTTNG_PACKED;
+
 struct lttng_kernel_tracer_version {
 	uint32_t major;
 	uint32_t minor;