projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename data_available to data_pending
[lttng-tools.git]
/
src
/
common
/
relayd
/
relayd.c
diff --git
a/src/common/relayd/relayd.c
b/src/common/relayd/relayd.c
index db476080ec207d505938ddcb9b351cd1b4d10ac7..daaf44ef04561a40725afdc618e7b91061ef83ae 100644
(file)
--- a/
src/common/relayd/relayd.c
+++ b/
src/common/relayd/relayd.c
@@
-348,25
+348,25
@@
error:
/*
* Check for data availability for a given stream id.
*
/*
* Check for data availability for a given stream id.
*
- * Return 0 if NOT
available
, 1 if so and a negative value on error.
+ * Return 0 if NOT
pending
, 1 if so and a negative value on error.
*/
*/
-int relayd_data_
available
(struct lttcomm_sock *sock, uint64_t stream_id,
+int relayd_data_
pending
(struct lttcomm_sock *sock, uint64_t stream_id,
uint64_t last_net_seq_num)
{
int ret;
uint64_t last_net_seq_num)
{
int ret;
- struct lttcomm_relayd_data_
available
msg;
+ struct lttcomm_relayd_data_
pending
msg;
struct lttcomm_relayd_generic_reply reply;
/* Code flow error. Safety net. */
assert(sock);
struct lttcomm_relayd_generic_reply reply;
/* Code flow error. Safety net. */
assert(sock);
- DBG("Relayd data
available
for stream id %" PRIu64, stream_id);
+ DBG("Relayd data
pending
for stream id %" PRIu64, stream_id);
msg.stream_id = htobe64(stream_id);
msg.last_net_seq_num = htobe64(last_net_seq_num);
/* Send command */
msg.stream_id = htobe64(stream_id);
msg.last_net_seq_num = htobe64(last_net_seq_num);
/* Send command */
- ret = send_command(sock, RELAYD_DATA_
AVAILABLE
, (void *) &msg,
+ ret = send_command(sock, RELAYD_DATA_
PENDING
, (void *) &msg,
sizeof(msg), 0);
if (ret < 0) {
goto error;
sizeof(msg), 0);
if (ret < 0) {
goto error;
@@
-383,14
+383,14
@@
int relayd_data_available(struct lttcomm_sock *sock, uint64_t stream_id,
/* Return session id or negative ret code. */
if (reply.ret_code >= LTTNG_OK) {
ret = -reply.ret_code;
/* Return session id or negative ret code. */
if (reply.ret_code >= LTTNG_OK) {
ret = -reply.ret_code;
- ERR("Relayd data
available
replied error %d", ret);
+ ERR("Relayd data
pending
replied error %d", ret);
}
/* At this point, the ret code is either 1 or 0 */
ret = reply.ret_code;
}
/* At this point, the ret code is either 1 or 0 */
ret = reply.ret_code;
- DBG("Relayd data is %s
available
for stream id %" PRIu64,
- ret == 1 ? "
" : "NOT
", stream_id);
+ DBG("Relayd data is %s
pending
for stream id %" PRIu64,
+ ret == 1 ? "
NOT" : "
", stream_id);
error:
return ret;
error:
return ret;
@@
-431,7
+431,7
@@
int relayd_quiescent_control(struct lttcomm_sock *sock)
}
/* Control socket is quiescent */
}
/* Control socket is quiescent */
- return
1
;
+ return
0
;
error:
return ret;
error:
return ret;
This page took
0.024175 seconds
and
4
git commands to generate.