projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lttng-ust(3): reword and fix style of `LTTNG_UST_ALLOW_BLOCKING` variable
[lttng-ust.git]
/
include
/
lttng
/
ust-abi.h
diff --git
a/include/lttng/ust-abi.h
b/include/lttng/ust-abi.h
index 6ea64c8708e6fb2b36e3ee6c99274586c97d18e2..4976b1bf61ce4786c1288933e29f0f4dcb6fb315 100644
(file)
--- a/
include/lttng/ust-abi.h
+++ b/
include/lttng/ust-abi.h
@@
-42,8
+42,8
@@
#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
6
-#define LTTNG_UST_ABI_MINOR_VERSION
1
+#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,
@@
-140,6
+140,7
@@
enum lttng_ust_context_type {
LTTNG_UST_CONTEXT_IP = 4,
LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER = 5,
LTTNG_UST_CONTEXT_CPU_ID = 6,
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 {
};
struct lttng_ust_perf_counter_ctx {
@@
-156,6
+157,11
@@
struct lttng_ust_context {
union {
struct lttng_ust_perf_counter_ctx perf_counter;
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,7
+177,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 */
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
} LTTNG_PACKED;
#define LTTNG_UST_TRACEPOINT_ITER_PADDING 16
@@
-267,6
+278,7
@@
struct lttng_ust_event_exclusion {
_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)
@@
-307,6
+319,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 {
This page took
0.043331 seconds
and
4
git commands to generate.