projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Filtering: add support for star-only globbing patterns
[lttng-ust.git]
/
include
/
lttng
/
ust-abi.h
diff --git
a/include/lttng/ust-abi.h
b/include/lttng/ust-abi.h
index 8c065fca04fd075d4304b3ca2baef6e9d12479fb..f76d2a9fa5c6b25c3d99b96a21314eb1ed86d227 100644
(file)
--- a/
include/lttng/ust-abi.h
+++ b/
include/lttng/ust-abi.h
@@
-30,16
+30,20
@@
#include <stdint.h>
#include <lttng/ust-compiler.h>
#include <stdint.h>
#include <lttng/ust-compiler.h>
-#define LTTNG_UST_SYM_NAME_LEN 256
+#ifndef __ust_stringify
+#define __ust_stringify1(x) #x
+#define __ust_stringify(x) __ust_stringify1(x)
+#endif /* __ust_stringify */
-/* Version for comm protocol between sessiond and ust */
-#define LTTNG_UST_COMM_VERSION_MAJOR 2
-#define LTTNG_UST_COMM_VERSION_MINOR 1
+#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 7
+#define LTTNG_UST_ABI_MINOR_VERSION 2
enum lttng_ust_instrumentation {
LTTNG_UST_TRACEPOINT = 0,
enum lttng_ust_instrumentation {
LTTNG_UST_TRACEPOINT = 0,
@@
-133,8
+137,18
@@
enum lttng_ust_context_type {
LTTNG_UST_CONTEXT_VPID = 1,
LTTNG_UST_CONTEXT_PTHREAD_ID = 2,
LTTNG_UST_CONTEXT_PROCNAME = 3,
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_PADDING2 (LTTNG_UST_SYM_NAME_LEN + 32)
struct lttng_ust_context {
#define LTTNG_UST_CONTEXT_PADDING1 16
#define LTTNG_UST_CONTEXT_PADDING2 (LTTNG_UST_SYM_NAME_LEN + 32)
struct lttng_ust_context {
@@
-142,6
+156,12
@@
struct lttng_ust_context {
char padding[LTTNG_UST_CONTEXT_PADDING1];
union {
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;
char padding[LTTNG_UST_CONTEXT_PADDING2];
} u;
} LTTNG_PACKED;
@@
-171,6
+191,8
@@
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_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_PADDING1 32
};
#define LTTNG_UST_OBJECT_DATA_PADDING1 32
@@
-185,6
+207,7
@@
struct lttng_ust_object_data {
struct {
void *data;
enum lttng_ust_chan_type type;
struct {
void *data;
enum lttng_ust_chan_type type;
+ int wakeup_fd;
} channel;
struct {
int shm_fd;
} channel;
struct {
int shm_fd;
@@
-220,6
+243,13
@@
struct lttng_ust_filter_bytecode {
char data[0];
} LTTNG_PACKED;
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)
#define _UST_CMD(minor) (minor)
#define _UST_CMDR(minor, type) (minor)
#define _UST_CMDW(minor, type) (minor)
@@
-243,6
+273,7
@@
struct lttng_ust_filter_bytecode {
_UST_CMDW(0x51, struct lttng_ust_channel)
#define LTTNG_UST_SESSION_START _UST_CMD(0x52)
#define LTTNG_UST_SESSION_STOP _UST_CMD(0x53)
_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)
@@
-265,6
+296,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
@@
-273,6
+305,7
@@
struct lttng_ust_obj;
union ust_args {
struct {
void *chan_data;
union ust_args {
struct {
void *chan_data;
+ int wakeup_fd;
} channel;
struct {
int shm_fd;
} channel;
struct {
int shm_fd;
@@
-281,6
+314,9
@@
union ust_args {
struct {
struct lttng_ust_field_iter entry;
} field_list;
struct {
struct lttng_ust_field_iter entry;
} field_list;
+ struct {
+ char *ctxname;
+ } app_context;
};
struct lttng_ust_objd_ops {
};
struct lttng_ust_objd_ops {
@@
-293,7
+329,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.025845 seconds
and
4
git commands to generate.