X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fabi.h;h=0cdd6534805cb9e09f0cb9f60d001ee129b4fe24;hb=dd1ee9589c12b053ede875f28d6f235187dd8c4f;hp=37d6312938f6eed20bf35eb6ce558083a6f7bb08;hpb=2af7b13b53e4b92d3e76b74e5f1a7e0c26e58e9c;p=lttng-modules.git

diff --git a/include/lttng/abi.h b/include/lttng/abi.h
index 37d63129..0cdd6534 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
@@ -146,13 +146,15 @@ struct lttng_kernel_event_notifier {
 	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 +165,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 {