projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change trace_path to session_root_path and chunk_path
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
consumer.c
diff --git
a/src/bin/lttng-sessiond/consumer.c
b/src/bin/lttng-sessiond/consumer.c
index 126b01a448c062e35095ddb97fd1eaf37e5dabb2..dc21e24ca0a5c01e4c2e8d3b24082492685944bf 100644
(file)
--- a/
src/bin/lttng-sessiond/consumer.c
+++ b/
src/bin/lttng-sessiond/consumer.c
@@
-731,6
+731,8
@@
error:
/*
* Send file descriptor to consumer via sock.
/*
* Send file descriptor to consumer via sock.
+ *
+ * The consumer socket lock must be held by the caller.
*/
int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd)
{
*/
int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd)
{
@@
-755,6
+757,8
@@
error:
/*
* Consumer send communication message structure to consumer.
/*
* Consumer send communication message structure to consumer.
+ *
+ * The consumer socket lock must be held by the caller.
*/
int consumer_send_msg(struct consumer_socket *sock,
struct lttcomm_consumer_msg *msg)
*/
int consumer_send_msg(struct consumer_socket *sock,
struct lttcomm_consumer_msg *msg)
@@
-778,6
+782,8
@@
error:
/*
* Consumer send channel communication message structure to consumer.
/*
* Consumer send channel communication message structure to consumer.
+ *
+ * The consumer socket lock must be held by the caller.
*/
int consumer_send_channel(struct consumer_socket *sock,
struct lttcomm_consumer_msg *msg)
*/
int consumer_send_channel(struct consumer_socket *sock,
struct lttcomm_consumer_msg *msg)
@@
-1421,7
+1427,7
@@
int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
} else {
ret = snprintf(msg.u.snapshot_channel.pathname,
sizeof(msg.u.snapshot_channel.pathname),
} else {
ret = snprintf(msg.u.snapshot_channel.pathname,
sizeof(msg.u.snapshot_channel.pathname),
- "%s/%s-%s-%" PRIu64 "%s", output->consumer->dst.
trace
_path,
+ "%s/%s-%s-%" PRIu64 "%s", output->consumer->dst.
session_root
_path,
output->name, output->datetime, output->nb_snapshot,
session_path);
if (ret < 0) {
output->name, output->datetime, output->nb_snapshot,
session_path);
if (ret < 0) {
This page took
0.027398 seconds
and
5
git commands to generate.