projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: don't print usage when listing fails
[lttng-tools.git]
/
src
/
common
/
consumer.c
diff --git
a/src/common/consumer.c
b/src/common/consumer.c
index 1de9cbadbd053749baa81d1a800975dd2bb22a8b..c74d1f7ae3cbded46415430ca20054c8686de416 100644
(file)
--- a/
src/common/consumer.c
+++ b/
src/common/consumer.c
@@
-2102,12
+2102,12
@@
void *consumer_thread_metadata_poll(void *data)
while (1) {
/* Only the metadata pipe is set */
while (1) {
/* Only the metadata pipe is set */
- if (
events.nb_fd
== 0 && consumer_quit == 1) {
+ if (
LTTNG_POLL_GETNB(&events)
== 0 && consumer_quit == 1) {
goto end;
}
restart:
goto end;
}
restart:
- DBG("Metadata poll wait with %d fd(s)",
events.nb_fd
);
+ DBG("Metadata poll wait with %d fd(s)",
LTTNG_POLL_GETNB(&events)
);
ret = lttng_poll_wait(&events, -1);
DBG("Metadata event catched in thread");
if (ret < 0) {
ret = lttng_poll_wait(&events, -1);
DBG("Metadata event catched in thread");
if (ret < 0) {
@@
-3006,7
+3006,8
@@
int consumer_data_pending(uint64_t id)
if (relayd) {
pthread_mutex_lock(&relayd->ctrl_sock_mutex);
if (stream->metadata_flag) {
if (relayd) {
pthread_mutex_lock(&relayd->ctrl_sock_mutex);
if (stream->metadata_flag) {
- ret = relayd_quiescent_control(&relayd->control_sock);
+ ret = relayd_quiescent_control(&relayd->control_sock,
+ stream->relayd_stream_id);
} else {
ret = relayd_data_pending(&relayd->control_sock,
stream->relayd_stream_id, stream->next_net_seq_num);
} else {
ret = relayd_data_pending(&relayd->control_sock,
stream->relayd_stream_id, stream->next_net_seq_num);
This page took
0.027283 seconds
and
5
git commands to generate.