X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Flttng-kernel.h;h=8d87539a47ac25b05a8e86d239422a1af8a81dc2;hp=cbeed1b1982c057d944d64c5ba2496a4f411e492;hb=e9404c27e7cc9d841785e6c4292c1add19fbc1cc;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76

diff --git a/src/common/lttng-kernel.h b/src/common/lttng-kernel.h
index cbeed1b19..8d87539a4 100644
--- a/src/common/lttng-kernel.h
+++ b/src/common/lttng-kernel.h
@@ -21,6 +21,7 @@
 #define _LTTNG_KERNEL_H
 
 #include <stdint.h>
+#include <common/macros.h>
 
 #define LTTNG_KERNEL_SYM_NAME_LEN  256
 
@@ -42,7 +43,7 @@ enum lttng_kernel_instrumentation {
 
 enum lttng_kernel_context_type {
 	LTTNG_KERNEL_CONTEXT_PID            = 0,
-	LTTNG_KERNEL_CONTEXT_PERF_COUNTER   = 1,
+	LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER = 1,
 	LTTNG_KERNEL_CONTEXT_PROCNAME       = 2,
 	LTTNG_KERNEL_CONTEXT_PRIO           = 3,
 	LTTNG_KERNEL_CONTEXT_NICE           = 4,
@@ -51,6 +52,12 @@ enum lttng_kernel_context_type {
 	LTTNG_KERNEL_CONTEXT_VTID           = 7,
 	LTTNG_KERNEL_CONTEXT_PPID           = 8,
 	LTTNG_KERNEL_CONTEXT_VPPID          = 9,
+	LTTNG_KERNEL_CONTEXT_HOSTNAME       = 10,
+	LTTNG_KERNEL_CONTEXT_CPU_ID         = 11,
+	LTTNG_KERNEL_CONTEXT_INTERRUPTIBLE  = 12,
+	LTTNG_KERNEL_CONTEXT_PREEMPTIBLE    = 13,
+	LTTNG_KERNEL_CONTEXT_NEED_RESCHEDULE = 14,
+	LTTNG_KERNEL_CONTEXT_MIGRATABLE     = 15,
 };
 
 /* Perf counter attributes */
@@ -58,7 +65,7 @@ struct lttng_kernel_perf_counter_ctx {
 	uint32_t type;
 	uint64_t config;
 	char name[LTTNG_KERNEL_SYM_NAME_LEN];
-};
+} LTTNG_PACKED;
 
 /* Event/Channel context */
 #define LTTNG_KERNEL_CONTEXT_PADDING1  16
@@ -71,14 +78,14 @@ struct lttng_kernel_context {
 		struct lttng_kernel_perf_counter_ctx perf_counter;
 		char padding[LTTNG_KERNEL_CONTEXT_PADDING2];
 	} u;
-};
+} LTTNG_PACKED;
 
 struct lttng_kernel_kretprobe {
 	uint64_t addr;
 
 	uint64_t offset;
 	char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
-};
+} LTTNG_PACKED;
 
 /*
  * Either addr is used, or symbol_name and offset.
@@ -88,12 +95,12 @@ struct lttng_kernel_kprobe {
 
 	uint64_t offset;
 	char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
-};
+} 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_PADDING2    LTTNG_KERNEL_SYM_NAME_LEN + 32
@@ -109,20 +116,45 @@ struct lttng_kernel_event {
 		struct lttng_kernel_function ftrace;
 		char padding[LTTNG_KERNEL_EVENT_PADDING2];
 	} u;
-};
+} LTTNG_PACKED;
 
 struct lttng_kernel_tracer_version {
 	uint32_t major;
 	uint32_t minor;
 	uint32_t patchlevel;
-};
+} LTTNG_PACKED;
 
-enum lttng_kernel_calibrate_type {
-	LTTNG_KERNEL_CALIBRATE_KRETPROBE,
-};
+struct lttng_kernel_tracer_abi_version {
+	uint32_t major;
+	uint32_t minor;
+} LTTNG_PACKED;
 
-struct lttng_kernel_calibrate {
-	enum lttng_kernel_calibrate_type type;	/* type (input) */
-};
+struct lttng_kernel_syscall_mask {
+	uint32_t len;	/* in bits */
+	char mask[];
+} LTTNG_PACKED;
+
+/*
+ * kernel channel
+ */
+#define LTTNG_KERNEL_CHANNEL_PADDING1 LTTNG_SYMBOL_NAME_LEN + 32
+struct lttng_kernel_channel {
+	uint64_t subbuf_size;               /* bytes */
+	uint64_t num_subbuf;                /* power of 2 */
+	unsigned int switch_timer_interval; /* usec */
+	unsigned int read_timer_interval;   /* usec */
+	enum lttng_event_output output;     /* splice, mmap */
+
+	int overwrite;                      /* 1: overwrite, 0: discard */
+	char padding[LTTNG_KERNEL_CHANNEL_PADDING1];
+} LTTNG_PACKED;
+
+#define KERNEL_FILTER_BYTECODE_MAX_LEN		65536
+struct lttng_kernel_filter_bytecode {
+	uint32_t len;
+	uint32_t reloc_offset;
+	uint64_t seqnum;
+	char data[0];
+} LTTNG_PACKED;
 
 #endif /* _LTTNG_KERNEL_H */