projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: add missing UST perf counter support check
[lttng-tools.git]
/
src
/
common
/
consumer.c
diff --git
a/src/common/consumer.c
b/src/common/consumer.c
index c741a1b8ec438925bf9da59edeef65b47652b444..b0b926bb01a1f65c58c9d25da47bc980b4125e83 100644
(file)
--- a/
src/common/consumer.c
+++ b/
src/common/consumer.c
@@
-2181,14
+2181,6
@@
void *consumer_thread_metadata_poll(void *data)
DBG("Metadata main loop started");
while (1) {
DBG("Metadata main loop started");
while (1) {
- health_code_update();
-
- /* Only the metadata pipe is set */
- if (LTTNG_POLL_GETNB(&events) == 0 && consumer_quit == 1) {
- err = 0; /* All is OK */
- goto end;
- }
-
restart:
health_code_update();
health_poll_entry();
restart:
health_code_update();
health_poll_entry();
@@
-2203,7
+2195,10
@@
restart:
ERR("Poll EINTR catched");
goto restart;
}
ERR("Poll EINTR catched");
goto restart;
}
- goto error;
+ if (LTTNG_POLL_GETNB(&events) == 0) {
+ err = 0; /* All is OK */
+ }
+ goto end;
}
nb_fd = ret;
}
nb_fd = ret;
@@
-2336,7
+2331,6
@@
restart:
/* All is OK */
err = 0;
/* All is OK */
err = 0;
-error:
end:
DBG("Metadata poll thread exiting");
end:
DBG("Metadata poll thread exiting");
@@
-2759,14
+2753,6
@@
void *consumer_thread_channel_poll(void *data)
DBG("Channel main loop started");
while (1) {
DBG("Channel main loop started");
while (1) {
- health_code_update();
-
- /* Only the channel pipe is set */
- if (LTTNG_POLL_GETNB(&events) == 0 && consumer_quit == 1) {
- err = 0; /* All is OK */
- goto end;
- }
-
restart:
health_code_update();
DBG("Channel poll wait");
restart:
health_code_update();
DBG("Channel poll wait");
@@
-2781,6
+2767,9
@@
restart:
ERR("Poll EINTR catched");
goto restart;
}
ERR("Poll EINTR catched");
goto restart;
}
+ if (LTTNG_POLL_GETNB(&events) == 0) {
+ err = 0; /* All is OK */
+ }
goto end;
}
goto end;
}
This page took
0.039689 seconds
and
4
git commands to generate.