-#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>
*/
} LTTNG_PACKED;
+#define LTTNG_UST_COUNTER_DIMENSION_MAX 4
enum lttng_ust_counter_arithmetic {
- LTTNG_UST_COUNTER_ARITHMETIC_MODULAR = 0,
- LTTNG_UST_COUNTER_ARITHMETIC_SATURATION = 1,
+ LTTNG_UST_COUNTER_ARITHMETIC_MODULAR = 0,
+ LTTNG_UST_COUNTER_ARITHMETIC_SATURATION = 1,
};
enum lttng_ust_counter_bitness {
- LTTNG_UST_COUNTER_BITNESS_32BITS = 4,
- LTTNG_UST_COUNTER_BITNESS_64BITS = 8,
+ LTTNG_UST_COUNTER_BITNESS_32 = 0,
+ LTTNG_UST_COUNTER_BITNESS_64 = 1,
};
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 {
} u;
} LTTNG_PACKED;
-#define LTTNG_UST_EVENT_NOTIFIER_PADDING1 16
+#define LTTNG_UST_EVENT_NOTIFIER_PADDING 32
struct lttng_ust_event_notifier {
struct lttng_ust_event event;
uint64_t error_counter_index;
- char padding[LTTNG_UST_EVENT_NOTIFIER_PADDING1];
+ char padding[LTTNG_UST_EVENT_NOTIFIER_PADDING];
} LTTNG_PACKED;
#define LTTNG_EVENT_NOTIFIER_NOTIFICATION_PADDING 32
#define LTTNG_UST_TRACEPOINT_FIELD_LIST _UST_CMD(0x45)
#define LTTNG_UST_EVENT_NOTIFIER_GROUP_CREATE _UST_CMD(0x46)
-/* Session FD commands */
+/* Session commands */
#define LTTNG_UST_CHANNEL \
_UST_CMDW(0x51, struct lttng_ust_channel)
#define LTTNG_UST_SESSION_START _UST_CMD(0x52)
#define LTTNG_UST_SESSION_STOP _UST_CMD(0x53)
#define LTTNG_UST_SESSION_STATEDUMP _UST_CMD(0x54)
-/* Channel FD commands */
+/* Channel commands */
#define LTTNG_UST_STREAM _UST_CMD(0x60)
#define LTTNG_UST_EVENT \
_UST_CMDW(0x61, struct lttng_ust_event)
-/* Event and Channel FD commands */
+/* Event and channel commands */
#define LTTNG_UST_CONTEXT \
_UST_CMDW(0x70, struct lttng_ust_context)
#define LTTNG_UST_FLUSH_BUFFER \
_UST_CMD(0x71)
-/* Event, Channel and Session commands */
+/* Event, event notifier, channel and session commands */
#define LTTNG_UST_ENABLE _UST_CMD(0x80)
#define LTTNG_UST_DISABLE _UST_CMD(0x81)
#define LTTNG_UST_TRACEPOINT_LIST_GET _UST_CMD(0x90)
#define LTTNG_UST_TRACEPOINT_FIELD_LIST_GET _UST_CMD(0x91)
-/* Event FD commands */
+/* Event and event notifier commands */
#define LTTNG_UST_FILTER _UST_CMD(0xA0)
#define LTTNG_UST_EXCLUSION _UST_CMD(0xA1)
/* Event notifier group commands */
#define LTTNG_UST_EVENT_NOTIFIER_CREATE \
_UST_CMDW(0xB0, struct lttng_ust_event_notifier)
-#define LTTNG_UST_CAPTURE _UST_CMD(0xB1)
+
+/* Event notifier commands */
+#define LTTNG_UST_CAPTURE _UST_CMD(0xB6)
/* Session and event notifier group commands */
#define LTTNG_UST_COUNTER \