projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 2.2.3
[lttng-ust.git]
/
include
/
ust-comm.h
diff --git
a/include/ust-comm.h
b/include/ust-comm.h
index c3564dc66a6baa1692bdd9130e6a04877a825cfd..7f268b7fe08b6c7b4197a8d8c908053d23e28962 100644
(file)
--- a/
include/ust-comm.h
+++ b/
include/ust-comm.h
@@
-48,6
+48,7
@@
#define LTTNG_UST_COMM_REG_MSG_PADDING 64
struct lttng_event_field;
#define LTTNG_UST_COMM_REG_MSG_PADDING 64
struct lttng_event_field;
+struct lttng_ctx_field;
struct ustctl_reg_msg {
uint32_t magic;
struct ustctl_reg_msg {
uint32_t magic;
@@
-102,7
+103,7
@@
struct ustcomm_ust_msg {
struct ustcomm_ust_reply {
uint32_t handle;
uint32_t cmd;
struct ustcomm_ust_reply {
uint32_t handle;
uint32_t cmd;
-
uint32_t ret_code;
/* enum ustcomm_return_code */
+
int32_t ret_code;
/* enum ustcomm_return_code */
uint32_t ret_val; /* return value */
char padding[USTCOMM_REPLY_PADDING1];
union {
uint32_t ret_val; /* return value */
char padding[USTCOMM_REPLY_PADDING1];
union {
@@
-185,7
+186,7
@@
extern int ustcomm_send_app_cmd(int sock,
int ustcomm_recv_fd(int sock);
ssize_t ustcomm_recv_channel_from_sessiond(int sock,
int ustcomm_recv_fd(int sock);
ssize_t ustcomm_recv_channel_from_sessiond(int sock,
- void **chan_data, uint64_t len);
+ void **chan_data, uint64_t len
, int *wakeup_fd
);
int ustcomm_recv_stream_from_sessiond(int sock,
uint64_t *memory_map_size,
int *shm_fd, int *wakeup_fd);
int ustcomm_recv_stream_from_sessiond(int sock,
uint64_t *memory_map_size,
int *shm_fd, int *wakeup_fd);
@@
-226,7
+227,7
@@
int ustcomm_register_channel(int sock,
int session_objd, /* session descriptor */
int channel_objd, /* channel descriptor */
size_t nr_ctx_fields,
int session_objd, /* session descriptor */
int channel_objd, /* channel descriptor */
size_t nr_ctx_fields,
- const struct lttng_
event
_field *ctx_fields,
+ const struct lttng_
ctx
_field *ctx_fields,
uint32_t *chan_id, /* channel id (output) */
int *header_type); /* header type (output) */
uint32_t *chan_id, /* channel id (output) */
int *header_type); /* header type (output) */
This page took
0.02429 seconds
and
4
git commands to generate.