Use lttng-modules ABI version ioctl

[lttng-tools.git] / src / common / lttng-kernel.h

diff --git a/src/common/lttng-kernel.h b/src/common/lttng-kernel.h
index dbeb6aa0a9a7a4489fcc5d91adbdaf9d635f44e5..abd22c99b5a42c011f5d9915ed73340bbe41bac6 100644 (file)
--- 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,
@@ -59,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
@@ -72,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.
@@ -89,12 +90,16 @@ 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;
+
+struct lttng_kernel_syscall {
+       char enable;
+} __attribute__((packed));
 
 #define LTTNG_KERNEL_EVENT_PADDING1    16
 #define LTTNG_KERNEL_EVENT_PADDING2    LTTNG_KERNEL_SYM_NAME_LEN + 32
@@ -108,15 +113,21 @@ struct lttng_kernel_event {
                struct lttng_kernel_kretprobe kretprobe;
                struct lttng_kernel_kprobe kprobe;
                struct lttng_kernel_function ftrace;
+               struct lttng_kernel_syscall syscall;
                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;
+
+struct lttng_kernel_tracer_abi_version {
+       uint32_t major;
+       uint32_t minor;
+} LTTNG_PACKED;
 
 enum lttng_kernel_calibrate_type {
        LTTNG_KERNEL_CALIBRATE_KRETPROBE,
@@ -124,6 +135,26 @@ enum lttng_kernel_calibrate_type {
 
 struct lttng_kernel_calibrate {
        enum lttng_kernel_calibrate_type type;  /* type (input) */
-};
+} LTTNG_PACKED;
+
+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;
 
 #endif /* _LTTNG_KERNEL_H */