projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: propagate archive id to the consumer daemon on stream creation
[lttng-tools.git]
/
src
/
common
/
sessiond-comm
/
sessiond-comm.h
diff --git
a/src/common/sessiond-comm/sessiond-comm.h
b/src/common/sessiond-comm/sessiond-comm.h
index 8aca4d481e325549379451cb1ef36e01dfad04e1..59f7482eb729915ff6aceed83750a4732882d1c1 100644
(file)
--- a/
src/common/sessiond-comm/sessiond-comm.h
+++ b/
src/common/sessiond-comm/sessiond-comm.h
@@
-456,6
+456,13
@@
struct lttcomm_consumer_msg {
int32_t cpu; /* On which CPU this stream is assigned. */
/* Tells the consumer if the stream should be or not monitored. */
uint32_t no_monitor;
int32_t cpu; /* On which CPU this stream is assigned. */
/* Tells the consumer if the stream should be or not monitored. */
uint32_t no_monitor;
+ /*
+ * The archive id that was "current" at the time this
+ * stream was created. This is used to determine
+ * whether a rotation request was sent before or after
+ * the creation of a stream.
+ */
+ uint64_t trace_archive_id;
} LTTNG_PACKED stream; /* Only used by Kernel. */
struct {
uint64_t net_index;
} LTTNG_PACKED stream; /* Only used by Kernel. */
struct {
uint64_t net_index;
@@
-505,6
+512,13
@@
struct lttcomm_consumer_msg {
*/
uint32_t ust_app_uid;
int64_t blocking_timeout;
*/
uint32_t ust_app_uid;
int64_t blocking_timeout;
+ /*
+ * The archive id that was "current" at the time this
+ * channel was created. This is used to determine
+ * whether a rotation request was sent before or after
+ * the creation of a channel.
+ */
+ uint64_t trace_archive_id;
char root_shm_path[PATH_MAX];
char shm_path[PATH_MAX];
} LTTNG_PACKED ask_channel;
char root_shm_path[PATH_MAX];
char shm_path[PATH_MAX];
} LTTNG_PACKED ask_channel;
@@
-540,6
+554,12
@@
struct lttcomm_consumer_msg {
uint64_t relayd_id; /* Relayd id if apply. */
uint64_t key;
uint64_t nb_packets_per_stream;
uint64_t relayd_id; /* Relayd id if apply. */
uint64_t key;
uint64_t nb_packets_per_stream;
+ /*
+ * The session's current trace archive id is propagated
+ * since a snapshot triggers the creation of an
+ * ephemeral metadata stream.
+ */
+ uint64_t trace_archive_id;
} LTTNG_PACKED snapshot_channel;
struct {
uint64_t channel_key;
} LTTNG_PACKED snapshot_channel;
struct {
uint64_t channel_key;
@@
-679,6
+699,14
@@
LTTNG_HIDDEN struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock(
LTTNG_HIDDEN int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec);
LTTNG_HIDDEN int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec);
LTTNG_HIDDEN int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec);
LTTNG_HIDDEN int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec);
+LTTNG_HIDDEN int lttcomm_sock_get_port(const struct lttcomm_sock *sock,
+ uint16_t *port);
+/*
+ * Set a port to an lttcomm_sock. This will have no effect is the socket is
+ * already bound.
+ */
+LTTNG_HIDDEN int lttcomm_sock_set_port(struct lttcomm_sock *sock, uint16_t port);
+
LTTNG_HIDDEN void lttcomm_init(void);
/* Get network timeout, in milliseconds */
LTTNG_HIDDEN unsigned long lttcomm_get_network_timeout(void);
LTTNG_HIDDEN void lttcomm_init(void);
/* Get network timeout, in milliseconds */
LTTNG_HIDDEN unsigned long lttcomm_get_network_timeout(void);
This page took
0.02362 seconds
and
4
git commands to generate.