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

diff --git a/src/common/lttng-kernel.h b/src/common/lttng-kernel.h
index cbeed1b19..38a9038f6 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
 
@@ -51,6 +52,7 @@ 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,
 };
 
 /* Perf counter attributes */
@@ -58,7 +60,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 +73,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 +90,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,13 +111,13 @@ 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,
@@ -123,6 +125,21 @@ enum lttng_kernel_calibrate_type {
 
 struct lttng_kernel_calibrate {
 	enum lttng_kernel_calibrate_type type;	/* type (input) */
-};
+} 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;
 
 #endif /* _LTTNG_KERNEL_H */