projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement PID tracker content listing
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ht-cleanup.c
diff --git
a/src/bin/lttng-sessiond/ht-cleanup.c
b/src/bin/lttng-sessiond/ht-cleanup.c
index ace41e5cd5654f6a791e50c82fe90bcc8c406722..c5f64dae543eac94f90af66ff6d451c083d3551e 100644
(file)
--- a/
src/bin/lttng-sessiond/ht-cleanup.c
+++ b/
src/bin/lttng-sessiond/ht-cleanup.c
@@
-64,16
+64,14
@@
void *thread_ht_cleanup(void *data)
health_code_update();
while (1) {
health_code_update();
while (1) {
- int handled_event;
-
- DBG3("[ht-thread] Polling on %d fds.",
- LTTNG_POLL_GETNB(&events));
+ DBG3("[ht-thread] Polling.");
/* Inifinite blocking call, waiting for transmission */
restart:
/* Inifinite blocking call, waiting for transmission */
restart:
- handled_event = 0;
health_poll_entry();
ret = lttng_poll_wait(&events, -1);
health_poll_entry();
ret = lttng_poll_wait(&events, -1);
+ DBG3("[ht-thread] Returning from poll on %d fds.",
+ LTTNG_POLL_GETNB(&events));
health_poll_exit();
if (ret < 0) {
/*
health_poll_exit();
if (ret < 0) {
/*
@@
-96,6
+94,11
@@
restart:
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
+ if (!revents) {
+ /* No activity for this FD (poll implementation). */
+ continue;
+ }
+
if (pollfd != ht_cleanup_pipe[0]) {
continue;
}
if (pollfd != ht_cleanup_pipe[0]) {
continue;
}
@@
-128,11
+131,6
@@
restart:
health_code_update();
}
health_code_update();
}
- /* Only check cleanup quit when no more work to do. */
- if (handled_event) {
- continue;
- }
-
for (i = 0; i < nb_fd; i++) {
health_code_update();
for (i = 0; i < nb_fd; i++) {
health_code_update();
@@
-140,6
+138,11
@@
restart:
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
+ if (!revents) {
+ /* No activity for this FD (poll implementation). */
+ continue;
+ }
+
if (pollfd == ht_cleanup_pipe[0]) {
continue;
}
if (pollfd == ht_cleanup_pipe[0]) {
continue;
}
This page took
0.025264 seconds
and
4
git commands to generate.