projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename public structure to avoid collisions
[lttng-ust.git]
/
include
/
lttng
/
ust-abi.h
diff --git
a/include/lttng/ust-abi.h
b/include/lttng/ust-abi.h
index 3c9f4600e9c0055997d4fbdeaed7173e68079900..8c2469e42a2a7194449e796f57095718d0db0232 100644
(file)
--- a/
include/lttng/ust-abi.h
+++ b/
include/lttng/ust-abi.h
@@
-42,7
+42,7
@@
#define LTTNG_UST_COMM_MAGIC 0xC57C57C5
/* Version for ABI between liblttng-ust, sessiond, consumerd */
#define LTTNG_UST_COMM_MAGIC 0xC57C57C5
/* Version for ABI between liblttng-ust, sessiond, consumerd */
-#define LTTNG_UST_ABI_MAJOR_VERSION
4
+#define LTTNG_UST_ABI_MAJOR_VERSION
5
#define LTTNG_UST_ABI_MINOR_VERSION 0
enum lttng_ust_instrumentation {
#define LTTNG_UST_ABI_MINOR_VERSION 0
enum lttng_ust_instrumentation {
@@
-137,8
+137,16
@@
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,
};
};
+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 {
@@
-146,6
+154,7
@@
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;
char padding[LTTNG_UST_CONTEXT_PADDING2];
} u;
} LTTNG_PACKED;
char padding[LTTNG_UST_CONTEXT_PADDING2];
} u;
} LTTNG_PACKED;
@@
-191,6
+200,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;
@@
-226,6
+236,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)
@@
-271,6
+288,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
@@
-279,6
+297,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;
@@
-299,7
+318,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.025793 seconds
and
4
git commands to generate.