projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: use the poll wait ret value when iterating on fd(s)
[lttng-tools.git]
/
src
/
common
/
consumer.c
diff --git
a/src/common/consumer.c
b/src/common/consumer.c
index 16521a8b863788fd957b756d7c4882f6b3c5abbd..0df073523e5361e09050c7b8dcd8f47bfdd09e2a 100644
(file)
--- a/
src/common/consumer.c
+++ b/
src/common/consumer.c
@@
-2101,17
+2101,13
@@
void *consumer_thread_metadata_poll(void *data)
DBG("Metadata main loop started");
while (1) {
DBG("Metadata main loop started");
while (1) {
- lttng_poll_reset(&events);
-
- nb_fd = LTTNG_POLL_GETNB(&events);
-
/* Only the metadata pipe is set */
/* Only the metadata pipe is set */
- if (nb_fd == 0 && consumer_quit == 1) {
+ if (
events.
nb_fd == 0 && consumer_quit == 1) {
goto end;
}
restart:
goto end;
}
restart:
- DBG("Metadata poll wait with %d fd(s)", nb_fd);
+ DBG("Metadata poll wait with %d fd(s)",
events.
nb_fd);
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) {
@@
-2122,6
+2118,8
@@
restart:
goto error;
}
goto error;
}
+ nb_fd = ret;
+
/* From here, the event is a metadata wait fd */
for (i = 0; i < nb_fd; i++) {
revents = LTTNG_POLL_GETEV(&events, i);
/* From here, the event is a metadata wait fd */
for (i = 0; i < nb_fd; i++) {
revents = LTTNG_POLL_GETEV(&events, i);
This page took
0.024055 seconds
and
4
git commands to generate.