projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: unix socket peercred on FreeBSD
[lttng-ust.git]
/
include
/
ust-comm.h
diff --git
a/include/ust-comm.h
b/include/ust-comm.h
index 49a55d2109e31b6ceca45a8fc09002b2f0e45220..4dbd5c8999d00f49495a6841951a63500df68d86 100644
(file)
--- a/
include/ust-comm.h
+++ b/
include/ust-comm.h
@@
-33,6
+33,7
@@
#include <lttng/ust-error.h>
#include <lttng/ust-compiler.h>
#include <lttng/ust-ctl.h>
#include <lttng/ust-error.h>
#include <lttng/ust-compiler.h>
#include <lttng/ust-ctl.h>
+#include "helper.h"
#ifndef LTTNG_PACKED
#error "LTTNG_PACKED should be defined"
#ifndef LTTNG_PACKED
#error "LTTNG_PACKED should be defined"
@@
-88,7
+89,6
@@
struct ustcomm_ust_msg {
uint32_t cmd;
char padding[USTCOMM_MSG_PADDING1];
union {
uint32_t cmd;
char padding[USTCOMM_MSG_PADDING1];
union {
- struct lttng_ust_event_notifier event_notifier;
struct lttng_ust_channel channel;
struct lttng_ust_stream stream;
struct lttng_ust_event event;
struct lttng_ust_channel channel;
struct lttng_ust_stream stream;
struct lttng_ust_event event;
@@
-111,6
+111,15
@@
struct ustcomm_ust_msg {
struct lttng_ust_counter counter;
struct lttng_ust_counter_global counter_global;
struct lttng_ust_counter_cpu counter_cpu;
struct lttng_ust_counter counter;
struct lttng_ust_counter_global counter_global;
struct lttng_ust_counter_cpu counter_cpu;
+ /*
+ * For LTTNG_UST_EVENT_NOTIFIER_CREATE, a struct
+ * lttng_ust_event_notifier implicitly follows struct
+ * ustcomm_ust_msg.
+ */
+ struct {
+ /* Length of struct lttng_ust_event_notifier */
+ uint32_t len;
+ } event_notifier;
char padding[USTCOMM_MSG_PADDING2];
} u;
} LTTNG_PACKED;
char padding[USTCOMM_MSG_PADDING2];
} u;
} LTTNG_PACKED;
@@
-228,11
+237,14
@@
ssize_t ustcomm_recv_channel_from_sessiond(int sock,
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);
+LTTNG_HIDDEN
ssize_t ustcomm_recv_event_notifier_notif_fd_from_sessiond(int sock,
int *event_notifier_notif_fd);
ssize_t ustcomm_recv_event_notifier_notif_fd_from_sessiond(int sock,
int *event_notifier_notif_fd);
+LTTNG_HIDDEN
ssize_t ustcomm_recv_counter_from_sessiond(int sock,
void **counter_data, uint64_t len);
ssize_t ustcomm_recv_counter_from_sessiond(int sock,
void **counter_data, uint64_t len);
+LTTNG_HIDDEN
int ustcomm_recv_counter_shm_from_sessiond(int sock,
int *shm_fd);
int ustcomm_recv_counter_shm_from_sessiond(int sock,
int *shm_fd);
This page took
0.024646 seconds
and
4
git commands to generate.