projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: Mixed enums used for return code in send_sessiond_channel()
[lttng-tools.git]
/
src
/
common
/
ust-consumer
/
ust-consumer.c
diff --git
a/src/common/ust-consumer/ust-consumer.c
b/src/common/ust-consumer/ust-consumer.c
index 01f79d68fe6e4c50feb4a6983ef8b51fd4aed21a..38cdf70b467a752de700430bff2c76574139ee3e 100644
(file)
--- a/
src/common/ust-consumer/ust-consumer.c
+++ b/
src/common/ust-consumer/ust-consumer.c
@@
-17,6
+17,7
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <assert.h>
#include <lttng/ust-ctl.h>
#include <poll.h>
#include <assert.h>
#include <lttng/ust-ctl.h>
#include <poll.h>
@@
-433,7
+434,7
@@
static int send_sessiond_channel(int sock,
if (relayd_error) {
*relayd_error = 1;
}
if (relayd_error) {
*relayd_error = 1;
}
- ret_code = LTT
NG_ERR_RELAYD_CONNECT
_FAIL;
+ ret_code = LTT
COMM_CONSUMERD_RELAYD
_FAIL;
}
if (net_seq_idx == -1ULL) {
net_seq_idx = stream->net_seq_idx;
}
if (net_seq_idx == -1ULL) {
net_seq_idx = stream->net_seq_idx;
@@
-1881,7
+1882,7
@@
static int notify_if_more_data(struct lttng_consumer_stream *stream,
goto end;
}
goto end;
}
- ret = ustctl_put_
next_
subbuf(ustream);
+ ret = ustctl_put_subbuf(ustream);
assert(!ret);
/* This stream still has data. Flag it and wake up the data thread. */
assert(!ret);
/* This stream still has data. Flag it and wake up the data thread. */
@@
-2144,7
+2145,7
@@
int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream)
*/
DBG("UST consumer metadata pending check: contiguous %" PRIu64 " vs pushed %" PRIu64,
contiguous, pushed);
*/
DBG("UST consumer metadata pending check: contiguous %" PRIu64 " vs pushed %" PRIu64,
contiguous, pushed);
- assert(((int64_t)
contiguous - pushed
) >= 0);
+ assert(((int64_t)
(contiguous - pushed)
) >= 0);
if ((contiguous != pushed) ||
(((int64_t) contiguous - pushed) > 0 || contiguous == 0)) {
ret = 1; /* Data is pending */
if ((contiguous != pushed) ||
(((int64_t) contiguous - pushed) > 0 || contiguous == 0)) {
ret = 1; /* Data is pending */
This page took
0.023652 seconds
and
4
git commands to generate.