Allow LTTNG_KERNEL_SYSCALL_{ENTRY, EXIT}

[deliverable/lttng-modules.git] / include / lttng / abi.h

diff --git a/include/lttng/abi.h b/include/lttng/abi.h
index 086a5834fe764b9e0342b7a4c72c296be1ae1903..3b5cad5d9f5d3206f9c04b6564415c452906b2f4 100644 (file)
--- a/include/lttng/abi.h
+++ b/include/lttng/abi.h
@@ -50,7 +50,7 @@ struct lttng_kernel_channel {
        uint64_t num_subbuf;
        unsigned int switch_timer_interval;     /* usecs */
        unsigned int read_timer_interval;       /* usecs */
-       enum lttng_kernel_output output;        /* splice, mmap */
+       uint32_t output;                        /* enum lttng_kernel_output (splice, mmap) */
        int overwrite;                          /* 1: overwrite, 0: discard */
        char padding[LTTNG_KERNEL_CHANNEL_PADDING];
 } __attribute__((packed));
@@ -91,9 +91,9 @@ struct lttng_kernel_event_callsite {
 } __attribute__((packed));
 
 enum lttng_kernel_syscall_entryexit {
-       LTTNG_KERNEL_SYSCALL_ENTRYEXIT = 0,
-       LTTNG_KERNEL_SYSCALL_ENTRY = 1,         /* Not implemented. */
-       LTTNG_KERNEL_SYSCALL_EXIT = 2,          /* Not implemented. */
+       LTTNG_KERNEL_SYSCALL_ENTRYEXIT  = 0,
+       LTTNG_KERNEL_SYSCALL_ENTRY      = 1,
+       LTTNG_KERNEL_SYSCALL_EXIT       = 2,
 };
 
 enum lttng_kernel_syscall_abi {
@@ -118,11 +118,12 @@ struct lttng_kernel_syscall {
 /*
  * For syscall tracing, name = "*" means "enable all".
  */
-#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];   /* event name */
-       enum lttng_kernel_instrumentation instrumentation;
+       uint32_t instrumentation;               /* enum lttng_kernel_instrumentation */
+       uint64_t token;                         /* User-provided token */
        char padding[LTTNG_KERNEL_EVENT_PADDING1];
 
        /* Per instrumentation type configuration */
@@ -136,6 +137,13 @@ struct lttng_kernel_event {
        } u;
 } __attribute__((packed));
 
+#define LTTNG_KERNEL_EVENT_NOTIFIER_PADDING1   16
+struct lttng_kernel_event_notifier {
+       struct lttng_kernel_event event;
+
+       char padding[LTTNG_KERNEL_EVENT_NOTIFIER_PADDING1];
+} __attribute__((packed));
+
 struct lttng_kernel_tracer_version {
        uint32_t major;
        uint32_t minor;
@@ -160,7 +168,7 @@ enum lttng_kernel_calibrate_type {
 };
 
 struct lttng_kernel_calibrate {
-       enum lttng_kernel_calibrate_type type;  /* type (input) */
+       uint32_t type;  /* enum lttng_kernel_calibrate_type (input) */
 } __attribute__((packed));
 
 struct lttng_kernel_syscall_mask {
@@ -218,7 +226,7 @@ struct lttng_kernel_perf_counter_ctx {
 #define LTTNG_KERNEL_CONTEXT_PADDING1  16
 #define LTTNG_KERNEL_CONTEXT_PADDING2  LTTNG_KERNEL_SYM_NAME_LEN + 32
 struct lttng_kernel_context {
-       enum lttng_kernel_context_type ctx;
+       uint32_t ctx;   /*enum lttng_kernel_context_type */
        char padding[LTTNG_KERNEL_CONTEXT_PADDING1];
 
        union {
@@ -247,7 +255,7 @@ enum lttng_kernel_tracker_type {
 };
 
 struct lttng_kernel_tracker_args {
-       enum lttng_kernel_tracker_type type;
+       uint32_t type;  /* enum lttng_kernel_tracker_type */
        int32_t id;
 };
 
@@ -263,6 +271,7 @@ struct lttng_kernel_tracker_args {
 #define LTTNG_KERNEL_SYSCALL_LIST              _IO(0xF6, 0x4A)
 #define LTTNG_KERNEL_TRACER_ABI_VERSION                \
        _IOR(0xF6, 0x4B, struct lttng_kernel_tracer_abi_version)
+#define LTTNG_KERNEL_EVENT_NOTIFIER_GROUP_CREATE    _IO(0xF6, 0x4C)
 
 /* Session FD ioctl */
 /* lttng/abi-old.h reserve 0x50, 0x51, 0x52, and 0x53. */
@@ -305,12 +314,12 @@ struct lttng_kernel_tracker_args {
 #define LTTNG_KERNEL_CONTEXT                   \
        _IOW(0xF6, 0x71, struct lttng_kernel_context)
 
-/* Event, Channel and Session ioctl */
+/* Event, Event notifier, Channel and Session ioctl */
 /* lttng/abi-old.h reserve 0x80 and 0x81. */
 #define LTTNG_KERNEL_ENABLE                    _IO(0xF6, 0x82)
 #define LTTNG_KERNEL_DISABLE                   _IO(0xF6, 0x83)
 
-/* Event FD ioctl */
+/* Event and Event notifier FD ioctl */
 #define LTTNG_KERNEL_FILTER                    _IO(0xF6, 0x90)
 #define LTTNG_KERNEL_ADD_CALLSITE              _IO(0xF6, 0x91)
 
@@ -322,6 +331,12 @@ struct lttng_kernel_tracker_args {
 #define LTTNG_KERNEL_SESSION_UNTRACK_ID                \
        _IOR(0xF6, 0xA2, struct lttng_kernel_tracker_args)
 
+/* Event notifier group file descriptor ioctl */
+#define LTTNG_KERNEL_EVENT_NOTIFIER_CREATE \
+       _IOW(0xF6, 0xB0, struct lttng_kernel_event_notifier)
+#define LTTNG_KERNEL_EVENT_NOTIFIER_GROUP_NOTIFICATION_FD \
+       _IO(0xF6, 0xB1)
+
 /*
  * LTTng-specific ioctls for the lib ringbuffer.
  *