X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-abi.h;h=1c80c14408937a3f14e89c1f1125efb4c2b4edd1;hb=d37ecb3fc622dee6f80f84c21f38d32eef407262;hp=8c065fca04fd075d4304b3ca2baef6e9d12479fb;hpb=74d81a6cca2cd4a7718bba9368f382f9f2fbba84;p=lttng-ust.git diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h index 8c065fca..1c80c144 100644 --- a/include/lttng/ust-abi.h +++ b/include/lttng/ust-abi.h @@ -30,16 +30,25 @@ #include #include -#define LTTNG_UST_SYM_NAME_LEN 256 +#ifndef LTTNG_PACKED +#error "LTTNG_PACKED should be defined" +#endif -/* Version for comm protocol between sessiond and ust */ -#define LTTNG_UST_COMM_VERSION_MAJOR 2 -#define LTTNG_UST_COMM_VERSION_MINOR 1 +#ifndef __ust_stringify +#define __ust_stringify1(x) #x +#define __ust_stringify(x) __ust_stringify1(x) +#endif /* __ust_stringify */ + +#define LTTNG_UST_SYM_NAME_LEN 256 +#define LTTNG_UST_ABI_PROCNAME_LEN 16 + +/* UST comm magic number, used to validate protocol and endianness. */ +#define LTTNG_UST_COMM_MAGIC 0xC57C57C5 /* Version for ABI between liblttng-ust, sessiond, consumerd */ -#define LTTNG_UST_INTERNAL_MAJOR_VERSION 3 -#define LTTNG_UST_INTERNAL_MINOR_VERSION 0 -#define LTTNG_UST_INTERNAL_PATCHLEVEL_VERSION 0 +#define LTTNG_UST_ABI_MAJOR_VERSION 9 +#define LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE 8 +#define LTTNG_UST_ABI_MINOR_VERSION 0 enum lttng_ust_instrumentation { LTTNG_UST_TRACEPOINT = 0, @@ -94,7 +103,7 @@ struct lttng_ust_stream { */ } LTTNG_PACKED; -#define LTTNG_UST_EVENT_PADDING1 16 +#define LTTNG_UST_EVENT_PADDING1 8 #define LTTNG_UST_EVENT_PADDING2 (LTTNG_UST_SYM_NAME_LEN + 32) struct lttng_ust_event { enum lttng_ust_instrumentation instrumentation; @@ -102,6 +111,7 @@ struct lttng_ust_event { enum lttng_ust_loglevel_type loglevel_type; int loglevel; /* value, -1: all */ + uint64_t token; /* User-provided token */ char padding[LTTNG_UST_EVENT_PADDING1]; /* Per instrumentation type configuration */ @@ -110,6 +120,19 @@ struct lttng_ust_event { } u; } LTTNG_PACKED; +#define LTTNG_UST_EVENT_NOTIFIER_PADDING1 16 +struct lttng_ust_event_notifier { + struct lttng_ust_event event; + char padding[LTTNG_UST_EVENT_NOTIFIER_PADDING1]; +} LTTNG_PACKED; + +#define LTTNG_EVENT_NOTIFIER_NOTIFICATION_PADDING 32 +struct lttng_ust_event_notifier_notification { + uint64_t token; + uint16_t capture_buf_size; + char padding[LTTNG_EVENT_NOTIFIER_NOTIFICATION_PADDING]; +} LTTNG_PACKED; + enum lttng_ust_field_type { LTTNG_UST_FIELD_OTHER = 0, LTTNG_UST_FIELD_INTEGER = 1, @@ -133,8 +156,32 @@ enum lttng_ust_context_type { LTTNG_UST_CONTEXT_VPID = 1, LTTNG_UST_CONTEXT_PTHREAD_ID = 2, LTTNG_UST_CONTEXT_PROCNAME = 3, + LTTNG_UST_CONTEXT_IP = 4, + 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 { + uint32_t type; + uint64_t config; + char name[LTTNG_UST_SYM_NAME_LEN]; +} LTTNG_PACKED; + #define LTTNG_UST_CONTEXT_PADDING1 16 #define LTTNG_UST_CONTEXT_PADDING2 (LTTNG_UST_SYM_NAME_LEN + 32) struct lttng_ust_context { @@ -142,6 +189,12 @@ struct lttng_ust_context { char padding[LTTNG_UST_CONTEXT_PADDING1]; union { + struct lttng_ust_perf_counter_ctx perf_counter; + struct { + /* Includes trailing '\0'. */ + uint32_t provider_name_len; + uint32_t ctx_name_len; + } app_ctx; char padding[LTTNG_UST_CONTEXT_PADDING2]; } u; } LTTNG_PACKED; @@ -157,7 +210,12 @@ struct lttng_ust_channel_attr { unsigned int switch_timer_interval; /* usec */ unsigned int read_timer_interval; /* usec */ enum lttng_ust_output output; /* splice, mmap */ - char padding[LTTNG_UST_CHANNEL_ATTR_PADDING]; + union { + struct { + int64_t blocking_timeout; /* Blocking timeout (usec) */ + } s; + char padding[LTTNG_UST_CHANNEL_ATTR_PADDING]; + } u; } LTTNG_PACKED; #define LTTNG_UST_TRACEPOINT_ITER_PADDING 16 @@ -171,6 +229,10 @@ enum lttng_ust_object_type { LTTNG_UST_OBJECT_TYPE_UNKNOWN = -1, LTTNG_UST_OBJECT_TYPE_CHANNEL = 0, LTTNG_UST_OBJECT_TYPE_STREAM = 1, + LTTNG_UST_OBJECT_TYPE_EVENT = 2, + LTTNG_UST_OBJECT_TYPE_CONTEXT = 3, + LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER_GROUP = 4, + LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER = 5, }; #define LTTNG_UST_OBJECT_DATA_PADDING1 32 @@ -185,6 +247,7 @@ struct lttng_ust_object_data { struct { void *data; enum lttng_ust_chan_type type; + int wakeup_fd; } channel; struct { int shm_fd; @@ -220,6 +283,23 @@ struct lttng_ust_filter_bytecode { char data[0]; } LTTNG_PACKED; +#define CAPTURE_BYTECODE_MAX_LEN 65536 +#define LTTNG_UST_CAPTURE_PADDING 32 +struct lttng_ust_capture_bytecode { + uint32_t len; + uint32_t reloc_offset; + uint64_t seqnum; + char padding[LTTNG_UST_CAPTURE_PADDING]; + char data[0]; +} LTTNG_PACKED; + +#define LTTNG_UST_EXCLUSION_PADDING 32 +struct lttng_ust_event_exclusion { + uint32_t count; + char padding[LTTNG_UST_EXCLUSION_PADDING]; + char names[LTTNG_UST_SYM_NAME_LEN][0]; +} LTTNG_PACKED; + #define _UST_CMD(minor) (minor) #define _UST_CMDR(minor, type) (minor) #define _UST_CMDW(minor, type) (minor) @@ -237,12 +317,14 @@ 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 \ _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 */ #define LTTNG_UST_STREAM _UST_CMD(0x60) @@ -265,6 +347,12 @@ struct lttng_ust_filter_bytecode { /* 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_CAPTURE _UST_CMD(0xB1) #define LTTNG_UST_ROOT_HANDLE 0 @@ -273,6 +361,7 @@ struct lttng_ust_obj; union ust_args { struct { void *chan_data; + int wakeup_fd; } channel; struct { int shm_fd; @@ -281,6 +370,12 @@ union ust_args { struct { struct lttng_ust_field_iter entry; } field_list; + struct { + char *ctxname; + } app_context; + struct { + int event_notifier_notif_fd; + } event_notifier_handle; }; struct lttng_ust_objd_ops { @@ -293,7 +388,7 @@ struct lttng_ust_objd_ops { int lttng_abi_create_root_handle(void); const struct lttng_ust_objd_ops *objd_ops(int id); -int lttng_ust_objd_unref(int id); +int lttng_ust_objd_unref(int id, int is_owner); void lttng_ust_abi_exit(void); void lttng_ust_events_exit(void);