projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: timestamp_end field should include all events within sub-buffer
[lttng-ust.git]
/
include
/
lttng
/
ust-abi.h
diff --git
a/include/lttng/ust-abi.h
b/include/lttng/ust-abi.h
index a4dc10d193459df9047b1443ecb40d347e4d4386..c1e13085bbf44cfa327aeabf5025e0c4f94c0aa6 100644
(file)
--- a/
include/lttng/ust-abi.h
+++ b/
include/lttng/ust-abi.h
@@
-28,17
+28,26
@@
*/
#include <stdint.h>
*/
#include <stdint.h>
+#include <lttng/ust-compiler.h>
-#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 0
+#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 */
/* 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 8
+#define LTTNG_UST_ABI_MINOR_VERSION 0
enum lttng_ust_instrumentation {
LTTNG_UST_TRACEPOINT = 0,
enum lttng_ust_instrumentation {
LTTNG_UST_TRACEPOINT = 0,
@@
-56,35
+65,45
@@
enum lttng_ust_output {
LTTNG_UST_MMAP = 0,
};
LTTNG_UST_MMAP = 0,
};
+enum lttng_ust_chan_type {
+ LTTNG_UST_CHAN_PER_CPU = 0,
+ LTTNG_UST_CHAN_METADATA = 1,
+};
+
struct lttng_ust_tracer_version {
uint32_t major;
uint32_t minor;
uint32_t patchlevel;
struct lttng_ust_tracer_version {
uint32_t major;
uint32_t minor;
uint32_t patchlevel;
-};
+}
LTTNG_PACKED
;
-#define LTTNG_UST_CHANNEL_PADDING LTTNG_UST_SYM_NAME_LEN + 32
+#define LTTNG_UST_CHANNEL_PADDING (LTTNG_UST_SYM_NAME_LEN + 32)
+/*
+ * Given that the consumerd is limited to 64k file descriptors, we
+ * cannot expect much more than 1MB channel structure size. This size is
+ * depends on the number of streams within a channel, which depends on
+ * the number of possible CPUs on the system.
+ */
+#define LTTNG_UST_CHANNEL_DATA_MAX_LEN 1048576U
struct lttng_ust_channel {
struct lttng_ust_channel {
- int overwrite; /* 1: overwrite, 0: discard */
- uint64_t subbuf_size; /* in bytes */
- uint64_t num_subbuf;
- unsigned int switch_timer_interval; /* usecs */
- unsigned int read_timer_interval; /* usecs */
- enum lttng_ust_output output; /* output mode */
+ uint64_t len;
+ enum lttng_ust_chan_type type;
char padding[LTTNG_UST_CHANNEL_PADDING];
char padding[LTTNG_UST_CHANNEL_PADDING];
-};
+ char data[]; /* variable sized data */
+} LTTNG_PACKED;
-#define LTTNG_UST_STREAM_PADDING1 16
-#define LTTNG_UST_STREAM_PADDING2 LTTNG_UST_SYM_NAME_LEN + 32
+#define LTTNG_UST_STREAM_PADDING1 (LTTNG_UST_SYM_NAME_LEN + 32)
struct lttng_ust_stream {
struct lttng_ust_stream {
+ uint64_t len; /* shm len */
+ uint32_t stream_nr; /* stream number */
char padding[LTTNG_UST_STREAM_PADDING1];
char padding[LTTNG_UST_STREAM_PADDING1];
-
- union {
- char padding[LTTNG_UST_STREAM_PADDING2];
- } u;
-};
+ /*
+ * shm_fd and wakeup_fd are send over unix socket as file
+ * descriptors after this structure.
+ */
+}
LTTNG_PACKED
;
#define LTTNG_UST_EVENT_PADDING1 16
#define LTTNG_UST_EVENT_PADDING1 16
-#define LTTNG_UST_EVENT_PADDING2
LTTNG_UST_SYM_NAME_LEN + 32
+#define LTTNG_UST_EVENT_PADDING2
(LTTNG_UST_SYM_NAME_LEN + 32)
struct lttng_ust_event {
enum lttng_ust_instrumentation instrumentation;
char name[LTTNG_UST_SYM_NAME_LEN]; /* event name */
struct lttng_ust_event {
enum lttng_ust_instrumentation instrumentation;
char name[LTTNG_UST_SYM_NAME_LEN]; /* event name */
@@
-97,7
+116,7
@@
struct lttng_ust_event {
union {
char padding[LTTNG_UST_EVENT_PADDING2];
} u;
union {
char padding[LTTNG_UST_EVENT_PADDING2];
} u;
-};
+}
LTTNG_PACKED
;
enum lttng_ust_field_type {
LTTNG_UST_FIELD_OTHER = 0,
enum lttng_ust_field_type {
LTTNG_UST_FIELD_OTHER = 0,
@@
-107,7
+126,7
@@
enum lttng_ust_field_type {
LTTNG_UST_FIELD_STRING = 4,
};
LTTNG_UST_FIELD_STRING = 4,
};
-#define LTTNG_UST_FIELD_ITER_PADDING
LTTNG_UST_SYM_NAME_LEN + 28
+#define LTTNG_UST_FIELD_ITER_PADDING
(LTTNG_UST_SYM_NAME_LEN + 28)
struct lttng_ust_field_iter {
char event_name[LTTNG_UST_SYM_NAME_LEN];
char field_name[LTTNG_UST_SYM_NAME_LEN];
struct lttng_ust_field_iter {
char event_name[LTTNG_UST_SYM_NAME_LEN];
char field_name[LTTNG_UST_SYM_NAME_LEN];
@@
-115,62
+134,105
@@
struct lttng_ust_field_iter {
int loglevel; /* event loglevel */
int nowrite;
char padding[LTTNG_UST_FIELD_ITER_PADDING];
int loglevel; /* event loglevel */
int nowrite;
char padding[LTTNG_UST_FIELD_ITER_PADDING];
-};
+}
LTTNG_PACKED
;
enum lttng_ust_context_type {
LTTNG_UST_CONTEXT_VTID = 0,
LTTNG_UST_CONTEXT_VPID = 1,
LTTNG_UST_CONTEXT_PTHREAD_ID = 2,
LTTNG_UST_CONTEXT_PROCNAME = 3,
enum lttng_ust_context_type {
LTTNG_UST_CONTEXT_VTID = 0,
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,
};
};
+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_PADDING1 16
-#define LTTNG_UST_CONTEXT_PADDING2
LTTNG_UST_SYM_NAME_LEN + 32
+#define LTTNG_UST_CONTEXT_PADDING2
(LTTNG_UST_SYM_NAME_LEN + 32)
struct lttng_ust_context {
enum lttng_ust_context_type ctx;
char padding[LTTNG_UST_CONTEXT_PADDING1];
union {
struct lttng_ust_context {
enum lttng_ust_context_type ctx;
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;
char padding[LTTNG_UST_CONTEXT_PADDING2];
} u;
-};
+}
LTTNG_PACKED
;
/*
* Tracer channel attributes.
*/
/*
* Tracer channel attributes.
*/
-#define LTTNG_UST_CHANNEL_ATTR_PADDING
LTTNG_UST_SYM_NAME_LEN + 32
+#define LTTNG_UST_CHANNEL_ATTR_PADDING
(LTTNG_UST_SYM_NAME_LEN + 32)
struct lttng_ust_channel_attr {
struct lttng_ust_channel_attr {
- int overwrite; /* 1: overwrite, 0: discard */
uint64_t subbuf_size; /* bytes */
uint64_t num_subbuf; /* 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 */
unsigned int read_timer_interval; /* usec */
enum lttng_ust_output output; /* splice, mmap */
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
struct lttng_ust_tracepoint_iter {
char name[LTTNG_UST_SYM_NAME_LEN]; /* provider:name */
int loglevel;
char padding[LTTNG_UST_TRACEPOINT_ITER_PADDING];
#define LTTNG_UST_TRACEPOINT_ITER_PADDING 16
struct lttng_ust_tracepoint_iter {
char name[LTTNG_UST_SYM_NAME_LEN]; /* provider:name */
int loglevel;
char padding[LTTNG_UST_TRACEPOINT_ITER_PADDING];
+} LTTNG_PACKED;
+
+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,
};
};
-#define LTTNG_UST_OBJECT_DATA_PADDING LTTNG_UST_SYM_NAME_LEN + 32
+#define LTTNG_UST_OBJECT_DATA_PADDING1 32
+#define LTTNG_UST_OBJECT_DATA_PADDING2 (LTTNG_UST_SYM_NAME_LEN + 32)
+
struct lttng_ust_object_data {
struct lttng_ust_object_data {
+ enum lttng_ust_object_type type;
int handle;
int handle;
- int shm_fd;
- int wait_fd;
- uint64_t memory_map_size;
- char padding[LTTNG_UST_OBJECT_DATA_PADDING];
-};
+ uint64_t size;
+ char padding1[LTTNG_UST_OBJECT_DATA_PADDING1];
+ union {
+ struct {
+ void *data;
+ enum lttng_ust_chan_type type;
+ int wakeup_fd;
+ } channel;
+ struct {
+ int shm_fd;
+ int wakeup_fd;
+ uint32_t stream_nr;
+ } stream;
+ char padding2[LTTNG_UST_OBJECT_DATA_PADDING2];
+ } u;
+} LTTNG_PACKED;
enum lttng_ust_calibrate_type {
LTTNG_UST_CALIBRATE_TRACEPOINT,
};
#define LTTNG_UST_CALIBRATE_PADDING1 16
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
+#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];
struct lttng_ust_calibrate {
enum lttng_ust_calibrate_type type; /* type (input) */
char padding[LTTNG_UST_CALIBRATE_PADDING1];
@@
-178,7
+240,7
@@
struct lttng_ust_calibrate {
union {
char padding[LTTNG_UST_CALIBRATE_PADDING2];
} u;
union {
char padding[LTTNG_UST_CALIBRATE_PADDING2];
} u;
-};
+}
LTTNG_PACKED
;
#define FILTER_BYTECODE_MAX_LEN 65536
#define LTTNG_UST_FILTER_PADDING 32
#define FILTER_BYTECODE_MAX_LEN 65536
#define LTTNG_UST_FILTER_PADDING 32
@@
-188,7
+250,14
@@
struct lttng_ust_filter_bytecode {
uint64_t seqnum;
char padding[LTTNG_UST_FILTER_PADDING];
char data[0];
uint64_t seqnum;
char padding[LTTNG_UST_FILTER_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_CMD(minor) (minor)
#define _UST_CMDR(minor, type) (minor)
@@
-209,12
+278,11
@@
struct lttng_ust_filter_bytecode {
#define LTTNG_UST_TRACEPOINT_FIELD_LIST _UST_CMD(0x45)
/* Session FD commands */
#define LTTNG_UST_TRACEPOINT_FIELD_LIST _UST_CMD(0x45)
/* Session FD commands */
-#define LTTNG_UST_METADATA \
- _UST_CMDW(0x50, struct lttng_ust_channel)
#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_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)
/* Channel FD commands */
#define LTTNG_UST_STREAM _UST_CMD(0x60)
@@
-237,6
+305,7
@@
struct lttng_ust_filter_bytecode {
/* Event FD commands */
#define LTTNG_UST_FILTER _UST_CMD(0xA0)
/* Event FD commands */
#define LTTNG_UST_FILTER _UST_CMD(0xA0)
+#define LTTNG_UST_EXCLUSION _UST_CMD(0xA1)
#define LTTNG_UST_ROOT_HANDLE 0
#define LTTNG_UST_ROOT_HANDLE 0
@@
-244,18
+313,19
@@
struct lttng_ust_obj;
union ust_args {
struct {
union ust_args {
struct {
- int *shm_fd;
- int *wait_fd;
- uint64_t *memory_map_size;
+ void *chan_data;
+ int wakeup_fd;
} channel;
struct {
} channel;
struct {
- int *shm_fd;
- int *wait_fd;
- uint64_t *memory_map_size;
+ int shm_fd;
+ int wakeup_fd;
} stream;
struct {
struct lttng_ust_field_iter entry;
} field_list;
} stream;
struct {
struct lttng_ust_field_iter entry;
} field_list;
+ struct {
+ char *ctxname;
+ } app_context;
};
struct lttng_ust_objd_ops {
};
struct lttng_ust_objd_ops {
@@
-268,7
+338,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_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);
void lttng_ust_abi_exit(void);
void lttng_ust_events_exit(void);
This page took
0.031979 seconds
and
4
git commands to generate.