/*
- * lttng/ust-abi.h
+ * Copyright 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
- * 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:
+ * Copied from LTTng-UST lttng/ust-abi.h
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * LTTng-UST ABI header
*
- * 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.
*/
#ifndef LTTNG_UST_ABI_INTERNAL_H
#define LTTNG_UST_ABI_INTERNAL_H
#include <stdint.h>
+#include <common/macros.h>
-#define lttng_ust_notrace __attribute__((no_instrument_function))
-#define LTTNG_PACKED __attribute__((__packed__))
+#ifndef LTTNG_PACKED
+#error "LTTNG_PACKED should be defined"
+#endif
#ifndef __ust_stringify
#define __ust_stringify1(x) #x
/* Version for ABI between liblttng-ust, sessiond, consumerd */
#define LTTNG_UST_ABI_MAJOR_VERSION 8
-#define LTTNG_UST_ABI_MINOR_VERSION 0
-
-struct lttng_ust_calibrate;
+#define LTTNG_UST_ABI_MINOR_VERSION 1
enum lttng_ust_instrumentation {
LTTNG_UST_TRACEPOINT = 0,
} u;
} LTTNG_PACKED;
+#define LTTNG_UST_EVENT_NOTIFIER_PADDING 40
+struct lttng_ust_event_notifier {
+ struct lttng_ust_event event;
+ char padding[LTTNG_UST_EVENT_NOTIFIER_PADDING];
+} LTTNG_PACKED;
+
+#define LTTNG_UST_EVENT_NOTIFIER_NOTIFICATION_PADDING 34
+struct lttng_ust_event_notifier_notification {
+ uint64_t token;
+ char padding[LTTNG_UST_EVENT_NOTIFIER_NOTIFICATION_PADDING];
+} LTTNG_PACKED;
+
enum lttng_ust_field_type {
LTTNG_UST_FIELD_OTHER = 0,
LTTNG_UST_FIELD_INTEGER = 1,
LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER = 5,
LTTNG_UST_CONTEXT_CPU_ID = 6,
LTTNG_UST_CONTEXT_APP_CONTEXT = 7,
+ LTTNG_UST_CONTEXT_CGROUP_NS = 8,
+ LTTNG_UST_CONTEXT_IPC_NS = 9,
+ LTTNG_UST_CONTEXT_MNT_NS = 10,
+ LTTNG_UST_CONTEXT_NET_NS = 11,
+ LTTNG_UST_CONTEXT_PID_NS = 12,
+ LTTNG_UST_CONTEXT_USER_NS = 13,
+ LTTNG_UST_CONTEXT_UTS_NS = 14,
+ LTTNG_UST_CONTEXT_VUID = 15,
+ LTTNG_UST_CONTEXT_VEUID = 16,
+ LTTNG_UST_CONTEXT_VSUID = 17,
+ LTTNG_UST_CONTEXT_VGID = 18,
+ LTTNG_UST_CONTEXT_VEGID = 19,
+ LTTNG_UST_CONTEXT_VSGID = 20,
+ LTTNG_UST_CONTEXT_TIME_NS = 21,
};
struct lttng_ust_perf_counter_ctx {
*/
#define LTTNG_UST_CHANNEL_ATTR_PADDING (LTTNG_UST_SYM_NAME_LEN + 32)
struct lttng_ust_channel_attr {
- uint64_t subbuf_size; /* bytes, power of 2 */
+ uint64_t subbuf_size; /* bytes */
uint64_t num_subbuf; /* power of 2 */
int overwrite; /* 1: overwrite, 0: discard */
unsigned int switch_timer_interval; /* usec */
enum lttng_ust_output output; /* splice, mmap */
union {
struct {
- int64_t blocking_timeout; /* Retry timeout (usec) */
+ int64_t blocking_timeout; /* Blocking timeout (usec) */
} s;
char padding[LTTNG_UST_CHANNEL_ATTR_PADDING];
} u;
} u;
} LTTNG_PACKED;
+enum lttng_ust_calibrate_type {
+ LTTNG_UST_CALIBRATE_TRACEPOINT,
+};
+
+#define LTTNG_UST_CALIBRATE_PADDING1 16
+#define LTTNG_UST_CALIBRATE_PADDING2 (LTTNG_UST_SYM_NAME_LEN + 32)
+struct lttng_ust_calibrate {
+ enum lttng_ust_calibrate_type type; /* type (input) */
+ char padding[LTTNG_UST_CALIBRATE_PADDING1];
+
+ union {
+ char padding[LTTNG_UST_CALIBRATE_PADDING2];
+ } u;
+} LTTNG_PACKED;
+
#define FILTER_BYTECODE_MAX_LEN 65536
#define LTTNG_UST_FILTER_PADDING 32
struct lttng_ust_filter_bytecode {
#define LTTNG_UST_WAIT_QUIESCENT _UST_CMD(0x43)
#define LTTNG_UST_REGISTER_DONE _UST_CMD(0x44)
#define LTTNG_UST_TRACEPOINT_FIELD_LIST _UST_CMD(0x45)
+#define LTTNG_UST_EVENT_NOTIFIER_GROUP_CREATE _UST_CMD(0x46)
/* Session FD commands */
#define LTTNG_UST_CHANNEL \
/* Event FD 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_ROOT_HANDLE 0
struct {
struct lttng_ust_field_iter entry;
} field_list;
+ struct {
+ char *ctxname;
+ } app_context;
};
struct lttng_ust_objd_ops {