Sync lttng-modules ABI in internal kernel-ioctl.h

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

diff --git a/src/common/lttng-kernel-old.h b/src/common/lttng-kernel-old.h
index dd602a37597b608468cb94e413de0546ad2fc61f..14f9cb4702a91c76eea5420cf4b8ccc09be4488a 100644 (file)
--- a/src/common/lttng-kernel-old.h
+++ b/src/common/lttng-kernel-old.h
@@ -20,64 +20,64 @@
  */
 
 /* Perf counter attributes */
-struct lttng_kernel_old_perf_counter_ctx {
+struct lttng_kernel_abi_old_perf_counter_ctx {
        uint32_t type;
        uint64_t config;
-       char name[LTTNG_KERNEL_SYM_NAME_LEN];
+       char name[LTTNG_KERNEL_ABI_SYM_NAME_LEN];
 };
 
 /* Event/Channel context */
-#define LTTNG_KERNEL_OLD_CONTEXT_PADDING1  16
-#define LTTNG_KERNEL_OLD_CONTEXT_PADDING2  LTTNG_KERNEL_SYM_NAME_LEN + 32
-struct lttng_kernel_old_context {
-       enum lttng_kernel_context_type ctx;
-       char padding[LTTNG_KERNEL_OLD_CONTEXT_PADDING1];
+#define LTTNG_KERNEL_ABI_OLD_CONTEXT_PADDING1  16
+#define LTTNG_KERNEL_ABI_OLD_CONTEXT_PADDING2  LTTNG_KERNEL_ABI_SYM_NAME_LEN + 32
+struct lttng_kernel_abi_old_context {
+       enum lttng_kernel_abi_context_type ctx;
+       char padding[LTTNG_KERNEL_ABI_OLD_CONTEXT_PADDING1];
 
        union {
-               struct lttng_kernel_old_perf_counter_ctx perf_counter;
-               char padding[LTTNG_KERNEL_OLD_CONTEXT_PADDING2];
+               struct lttng_kernel_abi_old_perf_counter_ctx perf_counter;
+               char padding[LTTNG_KERNEL_ABI_OLD_CONTEXT_PADDING2];
        } u;
 };
 
-struct lttng_kernel_old_kretprobe {
+struct lttng_kernel_abi_old_kretprobe {
        uint64_t addr;
 
        uint64_t offset;
-       char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
+       char symbol_name[LTTNG_KERNEL_ABI_SYM_NAME_LEN];
 };
 
 /*
  * Either addr is used, or symbol_name and offset.
  */
-struct lttng_kernel_old_kprobe {
+struct lttng_kernel_abi_old_kprobe {
        uint64_t addr;
 
        uint64_t offset;
-       char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
+       char symbol_name[LTTNG_KERNEL_ABI_SYM_NAME_LEN];
 };
 
 /* Function tracer */
-struct lttng_kernel_old_function {
-       char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
+struct lttng_kernel_abi_old_function {
+       char symbol_name[LTTNG_KERNEL_ABI_SYM_NAME_LEN];
 };
 
-#define LTTNG_KERNEL_OLD_EVENT_PADDING1    16
-#define LTTNG_KERNEL_OLD_EVENT_PADDING2    LTTNG_KERNEL_SYM_NAME_LEN + 32
-struct lttng_kernel_old_event {
-       char name[LTTNG_KERNEL_SYM_NAME_LEN];
-       enum lttng_kernel_instrumentation instrumentation;
-       char padding[LTTNG_KERNEL_OLD_EVENT_PADDING1];
+#define LTTNG_KERNEL_ABI_OLD_EVENT_PADDING1    16
+#define LTTNG_KERNEL_ABI_OLD_EVENT_PADDING2    LTTNG_KERNEL_ABI_SYM_NAME_LEN + 32
+struct lttng_kernel_abi_old_event {
+       char name[LTTNG_KERNEL_ABI_SYM_NAME_LEN];
+       enum lttng_kernel_abi_instrumentation instrumentation;
+       char padding[LTTNG_KERNEL_ABI_OLD_EVENT_PADDING1];
 
        /* Per instrumentation type configuration */
        union {
-               struct lttng_kernel_old_kretprobe kretprobe;
-               struct lttng_kernel_old_kprobe kprobe;
-               struct lttng_kernel_old_function ftrace;
-               char padding[LTTNG_KERNEL_OLD_EVENT_PADDING2];
+               struct lttng_kernel_abi_old_kretprobe kretprobe;
+               struct lttng_kernel_abi_old_kprobe kprobe;
+               struct lttng_kernel_abi_old_function ftrace;
+               char padding[LTTNG_KERNEL_ABI_OLD_EVENT_PADDING2];
        } u;
 };
 
-struct lttng_kernel_old_tracer_version {
+struct lttng_kernel_abi_old_tracer_version {
        uint32_t major;
        uint32_t minor;
        uint32_t patchlevel;
@@ -86,8 +86,8 @@ struct lttng_kernel_old_tracer_version {
 /*
  * kernel channel
  */
-#define LTTNG_KERNEL_OLD_CHANNEL_PADDING1 LTTNG_SYMBOL_NAME_LEN + 32
-struct lttng_kernel_old_channel {
+#define LTTNG_KERNEL_ABI_OLD_CHANNEL_PADDING1 LTTNG_SYMBOL_NAME_LEN + 32
+struct lttng_kernel_abi_old_channel {
        int overwrite;                      /* 1: overwrite, 0: discard */
        uint64_t subbuf_size;               /* bytes */
        uint64_t num_subbuf;                /* power of 2 */
@@ -95,7 +95,7 @@ struct lttng_kernel_old_channel {
        unsigned int read_timer_interval;   /* usec */
        enum lttng_event_output output;     /* splice, mmap */
 
-       char padding[LTTNG_KERNEL_OLD_CHANNEL_PADDING1];
+       char padding[LTTNG_KERNEL_ABI_OLD_CHANNEL_PADDING1];
 };
 
 #endif /* _LTTNG_KERNEL_OLD_H */