X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fabi.h;h=86c0a3cf493e73201c6e56737f317ecd344386fc;hb=8545187afc7f0845b98df04f7bd2629f0b894456;hp=75c2cb087fdb1ea791413c832b0e6c5c18dfae27;hpb=cff6938b5405c9125a5149f03e504d7b1cc4b8a4;p=lttng-modules.git

diff --git a/include/lttng/abi.h b/include/lttng/abi.h
index 75c2cb08..86c0a3cf 100644
--- a/include/lttng/abi.h
+++ b/include/lttng/abi.h
@@ -11,13 +11,14 @@
 #define _LTTNG_ABI_H
 
 #include <linux/fs.h>
+#include <linux/types.h>
 
 /*
  * Major/minor version of ABI exposed to lttng tools. Major number
  * should be increased when an incompatible ABI change is done.
  */
 #define LTTNG_MODULES_ABI_MAJOR_VERSION		2
-#define LTTNG_MODULES_ABI_MINOR_VERSION		5
+#define LTTNG_MODULES_ABI_MINOR_VERSION		6
 
 #define LTTNG_KERNEL_SYM_NAME_LEN	256
 #define LTTNG_KERNEL_SESSION_NAME_LEN	256
@@ -98,8 +99,8 @@ enum lttng_kernel_syscall_entryexit {
 
 enum lttng_kernel_syscall_abi {
 	LTTNG_KERNEL_SYSCALL_ABI_ALL = 0,
-	LTTNG_KERNEL_SYSCALL_ABI_NATIVE = 1,	/* Not implemented. */
-	LTTNG_KERNEL_SYSCALL_ABI_COMPAT = 2,	/* Not implemented. */
+	LTTNG_KERNEL_SYSCALL_ABI_NATIVE = 1,
+	LTTNG_KERNEL_SYSCALL_ABI_COMPAT = 2,
 };
 
 enum lttng_kernel_syscall_match {
@@ -137,11 +138,77 @@ struct lttng_kernel_event {
 	} u;
 } __attribute__((packed));
 
-#define LTTNG_KERNEL_EVENT_NOTIFIER_PADDING1	16
+#define LTTNG_KERNEL_EVENT_NOTIFIER_PADDING	32
 struct lttng_kernel_event_notifier {
 	struct lttng_kernel_event event;
+	uint64_t error_counter_index;
 
-	char padding[LTTNG_KERNEL_EVENT_NOTIFIER_PADDING1];
+	char padding[LTTNG_KERNEL_EVENT_NOTIFIER_PADDING];
+} __attribute__((packed));
+
+enum lttng_kernel_counter_arithmetic {
+	LTTNG_KERNEL_COUNTER_ARITHMETIC_MODULAR = 0,
+};
+
+enum lttng_kernel_counter_bitness {
+	LTTNG_KERNEL_COUNTER_BITNESS_32 = 0,
+	LTTNG_KERNEL_COUNTER_BITNESS_64 = 1,
+};
+
+struct lttng_kernel_counter_dimension {
+	uint64_t size;
+	uint64_t underflow_index;
+	uint64_t overflow_index;
+	uint8_t has_underflow;
+	uint8_t has_overflow;
+} __attribute__((packed));
+
+#define LTTNG_KERNEL_COUNTER_DIMENSION_MAX 4
+struct lttng_kernel_counter_conf {
+	uint32_t arithmetic;	/* enum lttng_kernel_counter_arithmetic */
+	uint32_t bitness;	/* enum lttng_kernel_counter_bitness */
+	uint32_t number_dimensions;
+	int64_t global_sum_step;
+	struct lttng_kernel_counter_dimension dimensions[LTTNG_KERNEL_COUNTER_DIMENSION_MAX];
+} __attribute__((packed));
+
+struct lttng_kernel_counter_index {
+	uint32_t number_dimensions;
+	uint64_t dimension_indexes[LTTNG_KERNEL_COUNTER_DIMENSION_MAX];
+} __attribute__((packed));
+
+struct lttng_kernel_counter_value {
+	int64_t value;
+	uint8_t underflow;
+	uint8_t overflow;
+} __attribute__((packed));
+
+#define LTTNG_KERNEL_COUNTER_READ_PADDING 32
+struct lttng_kernel_counter_read {
+	struct lttng_kernel_counter_index index;
+	int32_t cpu;	/* -1 for global counter, >= 0 for specific cpu. */
+	struct lttng_kernel_counter_value value;	/* output */
+	char padding[LTTNG_KERNEL_COUNTER_READ_PADDING];
+} __attribute__((packed));
+
+#define LTTNG_KERNEL_COUNTER_AGGREGATE_PADDING 32
+struct lttng_kernel_counter_aggregate {
+	struct lttng_kernel_counter_index index;
+	struct lttng_kernel_counter_value value;	/* output */
+	char padding[LTTNG_KERNEL_COUNTER_AGGREGATE_PADDING];
+} __attribute__((packed));
+
+#define LTTNG_KERNEL_COUNTER_CLEAR_PADDING 32
+struct lttng_kernel_counter_clear {
+	struct lttng_kernel_counter_index index;
+	char padding[LTTNG_KERNEL_COUNTER_CLEAR_PADDING];
+} __attribute__((packed));
+
+#define LTTNG_KERNEL_EVENT_NOTIFIER_NOTIFICATION_PADDING 32
+struct lttng_kernel_event_notifier_notification {
+	uint64_t token;
+	uint16_t capture_buf_size;
+	char padding[LTTNG_KERNEL_EVENT_NOTIFIER_NOTIFICATION_PADDING];
 } __attribute__((packed));
 
 struct lttng_kernel_tracer_version {
@@ -243,6 +310,14 @@ struct lttng_kernel_filter_bytecode {
 	char data[0];
 } __attribute__((packed));
 
+#define LTTNG_KERNEL_CAPTURE_BYTECODE_MAX_LEN		65536
+struct lttng_kernel_capture_bytecode {
+	uint32_t len;
+	uint32_t reloc_offset;
+	uint64_t seqnum;
+	char data[0];
+} __attribute__((packed));
+
 enum lttng_kernel_tracker_type {
 	LTTNG_KERNEL_TRACKER_UNKNOWN		= -1,
 
@@ -314,11 +389,15 @@ struct lttng_kernel_tracker_args {
 #define LTTNG_KERNEL_CONTEXT			\
 	_IOW(0xF6, 0x71, struct lttng_kernel_context)
 
-/* Event, Event notifier, Channel and Session ioctl */
+/* Event, Event notifier, Channel, Counter 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)
 
+/* Trigger group and session ioctl */
+#define LTTNG_KERNEL_COUNTER \
+	_IOW(0xF6, 0x84, struct lttng_kernel_counter_conf)
+
 /* Event and Event notifier FD ioctl */
 #define LTTNG_KERNEL_FILTER			_IO(0xF6, 0x90)
 #define LTTNG_KERNEL_ADD_CALLSITE		_IO(0xF6, 0x91)
@@ -337,6 +416,18 @@ struct lttng_kernel_tracker_args {
 #define LTTNG_KERNEL_EVENT_NOTIFIER_GROUP_NOTIFICATION_FD \
 	_IO(0xF6, 0xB1)
 
+/* Event notifier file descriptor ioctl */
+#define LTTNG_KERNEL_CAPTURE			_IO(0xF6, 0xB8)
+
+/* Counter file descriptor ioctl */
+#define LTTNG_KERNEL_COUNTER_READ \
+	_IOWR(0xF6, 0xC0, struct lttng_kernel_counter_read)
+#define LTTNG_KERNEL_COUNTER_AGGREGATE \
+	_IOWR(0xF6, 0xC1, struct lttng_kernel_counter_aggregate)
+#define LTTNG_KERNEL_COUNTER_CLEAR \
+	_IOW(0xF6, 0xC2, struct lttng_kernel_counter_clear)
+
+
 /*
  * LTTng-specific ioctls for the lib ringbuffer.
  *