projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep the base directory of a relay session separate
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
consumer.h
diff --git
a/src/bin/lttng-sessiond/consumer.h
b/src/bin/lttng-sessiond/consumer.h
index 77bc2b1f12b8cf6c08a7fc402a953be4ce86a296..ddc94d7148e5c3cc91be34f98b0a924374862fba 100644
(file)
--- a/
src/bin/lttng-sessiond/consumer.h
+++ b/
src/bin/lttng-sessiond/consumer.h
@@
-108,8
+108,8
@@
struct consumer_data {
struct consumer_socket metadata_sock;
/* consumer error and command Unix socket path */
struct consumer_socket metadata_sock;
/* consumer error and command Unix socket path */
- c
har err_unix_sock_path[PATH_MAX]
;
- c
har cmd_unix_sock_path[PATH_MAX]
;
+ c
onst char *err_unix_sock_path
;
+ c
onst char *cmd_unix_sock_path
;
/*
* This lock has two purposes. It protects any change to the consumer
/*
* This lock has two purposes. It protects any change to the consumer
@@
-140,6
+140,9
@@
struct consumer_net {
/* Data path for network streaming. */
struct lttng_uri data;
/* Data path for network streaming. */
struct lttng_uri data;
+
+ /* <hostname>/<session-name> */
+ char base_dir[PATH_MAX];
};
/*
};
/*
@@
-163,7
+166,8
@@
struct consumer_output {
uint32_t relay_minor_version;
/*
uint32_t relay_minor_version;
/*
- * Subdirectory path name used for both local and network consumer.
+ * Subdirectory path name used for both local and network
+ * consumer (/kernel or /ust).
*/
char subdir[PATH_MAX];
*/
char subdir[PATH_MAX];
@@
-178,9
+182,15
@@
struct consumer_output {
unsigned int snapshot:1;
union {
unsigned int snapshot:1;
union {
- char
trace
_path[PATH_MAX];
+ char
session_root
_path[PATH_MAX];
struct consumer_net net;
} dst;
struct consumer_net net;
} dst;
+
+ /*
+ * Sub-directory below the session_root_path where the next chunk of
+ * trace will be stored (\0 before the first session rotation).
+ */
+ char chunk_path[PATH_MAX];
};
struct consumer_socket *consumer_find_socket(int key,
};
struct consumer_socket *consumer_find_socket(int key,
@@
-256,6
+266,7
@@
void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
uint64_t session_id_per_pid,
unsigned int monitor,
uint32_t ust_app_uid,
uint64_t session_id_per_pid,
unsigned int monitor,
uint32_t ust_app_uid,
+ int64_t blocking_timeout,
const char *root_shm_path,
const char *shm_path);
void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
const char *root_shm_path,
const char *shm_path);
void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
This page took
0.024238 seconds
and
4
git commands to generate.