projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: DBG statement in relayd
[lttng-tools.git]
/
src
/
common
/
relayd
/
relayd.c
diff --git
a/src/common/relayd/relayd.c
b/src/common/relayd/relayd.c
index 43f91082385a951682f6ebaf6f839abf3e123a33..45cb097f616c1bf65b31d5d66ba45966e0877d8b 100644
(file)
--- a/
src/common/relayd/relayd.c
+++ b/
src/common/relayd/relayd.c
@@
-33,7
+33,7
@@
* Send command. Fill up the header and append the data.
*/
static int send_command(struct lttcomm_sock *sock,
* Send command. Fill up the header and append the data.
*/
static int send_command(struct lttcomm_sock *sock,
- enum lttcomm_
session
d_command cmd, void *data, size_t size,
+ enum lttcomm_
relay
d_command cmd, void *data, size_t size,
int flags)
{
int ret;
int flags)
{
int ret;
@@
-457,7
+457,7
@@
int relayd_data_pending(struct lttcomm_sock *sock, uint64_t stream_id,
ret = reply.ret_code;
DBG("Relayd data is %s pending for stream id %" PRIu64,
ret = reply.ret_code;
DBG("Relayd data is %s pending for stream id %" PRIu64,
- ret == 1 ? "
NOT" : "
", stream_id);
+ ret == 1 ? "
" : "NOT
", stream_id);
error:
return ret;
error:
return ret;
@@
-466,9
+466,11
@@
error:
/*
* Check on the relayd side for a quiescent state on the control socket.
*/
/*
* Check on the relayd side for a quiescent state on the control socket.
*/
-int relayd_quiescent_control(struct lttcomm_sock *sock)
+int relayd_quiescent_control(struct lttcomm_sock *sock,
+ uint64_t metadata_stream_id)
{
int ret;
{
int ret;
+ struct lttcomm_relayd_quiescent_control msg;
struct lttcomm_relayd_generic_reply reply;
/* Code flow error. Safety net. */
struct lttcomm_relayd_generic_reply reply;
/* Code flow error. Safety net. */
@@
-476,8
+478,10
@@
int relayd_quiescent_control(struct lttcomm_sock *sock)
DBG("Relayd checking quiescent control state");
DBG("Relayd checking quiescent control state");
+ msg.stream_id = htobe64(metadata_stream_id);
+
/* Send command */
/* Send command */
- ret = send_command(sock, RELAYD_QUIESCENT_CONTROL,
NULL, 0
, 0);
+ ret = send_command(sock, RELAYD_QUIESCENT_CONTROL,
&msg, sizeof(msg)
, 0);
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
This page took
0.023945 seconds
and
4
git commands to generate.