projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename LTTng index in CTF index
[lttng-tools.git]
/
src
/
common
/
relayd
/
relayd.c
diff --git
a/src/common/relayd/relayd.c
b/src/common/relayd/relayd.c
index 7c90b4d1a05a4e6fdc0d041288cd7fe21784b2d7..448d19e6e30c2a16b89f3732147659b8159cf051 100644
(file)
--- a/
src/common/relayd/relayd.c
+++ b/
src/common/relayd/relayd.c
@@
-26,7
+26,7
@@
#include <common/common.h>
#include <common/defaults.h>
#include <common/sessiond-comm/relayd.h>
#include <common/common.h>
#include <common/defaults.h>
#include <common/sessiond-comm/relayd.h>
-#include <common/index/
lttng
-index.h>
+#include <common/index/
ctf
-index.h>
#include "relayd.h"
#include "relayd.h"
@@
-691,7
+691,7
@@
error:
int relayd_end_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id,
unsigned int *is_data_inflight)
{
int relayd_end_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id,
unsigned int *is_data_inflight)
{
- int ret;
+ int ret
, recv_ret
;
struct lttcomm_relayd_end_data_pending msg;
struct lttcomm_relayd_generic_reply reply;
struct lttcomm_relayd_end_data_pending msg;
struct lttcomm_relayd_generic_reply reply;
@@
-714,15
+714,15
@@
int relayd_end_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id,
goto error;
}
goto error;
}
- re
ply.ret_code
= be32toh(reply.ret_code);
- if (re
ply.ret_code
< 0) {
- ret = re
ply.ret_code
;
+ re
cv_ret
= be32toh(reply.ret_code);
+ if (re
cv_ret
< 0) {
+ ret = re
cv_ret
;
goto error;
}
goto error;
}
- *is_data_inflight = re
ply.ret_code
;
+ *is_data_inflight = re
cv_ret
;
- DBG("Relayd end data pending is data inflight: %d", re
ply.ret_code
);
+ DBG("Relayd end data pending is data inflight: %d", re
cv_ret
);
return 0;
return 0;
@@
-734,7
+734,7
@@
error:
* Send index to the relayd.
*/
int relayd_send_index(struct lttcomm_relayd_sock *rsock,
* Send index to the relayd.
*/
int relayd_send_index(struct lttcomm_relayd_sock *rsock,
- struct
lttng
_packet_index *index, uint64_t relay_stream_id,
+ struct
ctf
_packet_index *index, uint64_t relay_stream_id,
uint64_t net_seq_num)
{
int ret;
uint64_t net_seq_num)
{
int ret;
This page took
0.024751 seconds
and
4
git commands to generate.