X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-abi.h;h=fd7180a10d45bf78c9d33d3b97c524e51fc8bc74;hb=b653ddc1c1b44ad674265ebb749cfebd97be350e;hp=b1cd9b3d2a310f7f578e33e041cea4745ed80c0a;hpb=38980ed1d67fee8112224294cba927d25dcfd08d;p=lttng-ust.git

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index b1cd9b3d..fd7180a1 100644
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -1,32 +1,14 @@
-#ifndef _LTTNG_UST_ABI_H
-#define _LTTNG_UST_ABI_H
-
 /*
- * lttng/ust-abi.h
- *
- * LTTng-UST ABI header
- *
- * Copyright 2010-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: MIT
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * LTTng-UST ABI header
  */
 
+#ifndef _LTTNG_UST_ABI_H
+#define _LTTNG_UST_ABI_H
+
 #include <stdint.h>
 #include <lttng/ust-compiler.h>
 
@@ -103,6 +85,7 @@ struct lttng_ust_stream {
 	 */
 } LTTNG_PACKED;
 
+#define LTTNG_UST_COUNTER_DIMENSION_MAX 4
 
 enum lttng_ust_counter_arithmetic {
 	LTTNG_UST_COUNTER_ARITHMETIC_MODULAR = 0,
@@ -110,8 +93,8 @@ enum lttng_ust_counter_arithmetic {
 };
 
 enum lttng_ust_counter_bitness {
-	LTTNG_UST_COUNTER_BITNESS_32 = 4,
-	LTTNG_UST_COUNTER_BITNESS_64 = 8,
+	LTTNG_UST_COUNTER_BITNESS_32 = 0,
+	LTTNG_UST_COUNTER_BITNESS_64 = 1,
 };
 
 struct lttng_ust_counter_dimension {
@@ -122,13 +105,15 @@ struct lttng_ust_counter_dimension {
 	uint8_t has_overflow;
 } LTTNG_PACKED;
 
-#define LTTNG_UST_COUNTER_DIMENSION_MAX 8
+#define LTTNG_UST_COUNTER_CONF_PADDING1 67
 struct lttng_ust_counter_conf {
 	uint32_t arithmetic;	/* enum lttng_ust_counter_arithmetic */
 	uint32_t bitness;	/* enum lttng_ust_counter_bitness */
 	uint32_t number_dimensions;
 	int64_t global_sum_step;
 	struct lttng_ust_counter_dimension dimensions[LTTNG_UST_COUNTER_DIMENSION_MAX];
+	uint8_t coalesce_hits;
+	char padding[LTTNG_UST_COUNTER_CONF_PADDING1];
 } LTTNG_PACKED;
 
 struct lttng_ust_counter_value {