X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=inline;f=include%2Flttng%2Fabi.h;h=5745635e8e9bf937d7aca26d7efb5997cd22d6f8;hb=437d5aa59380583ce1cd14d394a53b398be1275d;hp=843acbe72fc5f51af91c679eba6f27793d872bb3;hpb=99f52fcce5865809584c1e022bca1409702ea292;p=lttng-modules.git

diff --git a/include/lttng/abi.h b/include/lttng/abi.h
index 843acbe7..5745635e 100644
--- a/include/lttng/abi.h
+++ b/include/lttng/abi.h
@@ -18,7 +18,7 @@
  * 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
@@ -56,11 +56,18 @@ struct lttng_kernel_channel {
 	char padding[LTTNG_KERNEL_CHANNEL_PADDING];
 } __attribute__((packed));
 
+enum lttng_kernel_kretprobe_entryexit {
+	LTTNG_KERNEL_KRETPROBE_ENTRYEXIT = 0,
+	LTTNG_KERNEL_KRETPROBE_ENTRY = 1,
+	LTTNG_KERNEL_KRETPROBE_EXIT = 2,
+};
+
 struct lttng_kernel_kretprobe {
 	uint64_t addr;
 
 	uint64_t offset;
 	char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
+	uint8_t entryexit;	/* enum lttng_kernel_kretprobe_entryexit */
 } __attribute__((packed));
 
 /*
@@ -138,21 +145,23 @@ 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));
 
+#define LTTNG_KERNEL_COUNTER_DIMENSION_MAX	4
+
 enum lttng_kernel_counter_arithmetic {
-    LTTNG_KERNEL_COUNTER_ARITHMETIC_MODULAR = 1,
+	LTTNG_KERNEL_COUNTER_ARITHMETIC_MODULAR = 0,
 };
 
 enum lttng_kernel_counter_bitness {
-    LTTNG_KERNEL_COUNTER_BITNESS_32 = 1,
-    LTTNG_KERNEL_COUNTER_BITNESS_64 = 2,
+	LTTNG_KERNEL_COUNTER_BITNESS_32 = 0,
+	LTTNG_KERNEL_COUNTER_BITNESS_64 = 1,
 };
 
 struct lttng_kernel_counter_dimension {
@@ -163,13 +172,15 @@ struct lttng_kernel_counter_dimension {
 	uint8_t has_overflow;
 } __attribute__((packed));
 
-#define LTTNG_KERNEL_COUNTER_DIMENSION_MAX 4
+#define LTTNG_KERNEL_COUNTER_CONF_PADDING1	67
 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];
+	uint8_t coalesce_hits;
+	char padding[LTTNG_KERNEL_COUNTER_CONF_PADDING1];
 } __attribute__((packed));
 
 struct lttng_kernel_counter_index {