projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: consumer fd recv poll should be sensitive to POLLPRI too
[lttng-tools.git]
/
src
/
common
/
consumer.c
diff --git
a/src/common/consumer.c
b/src/common/consumer.c
index 74a9b0ad2095216f8d11b6836a91305dba795300..2604f3d060574c1c7677047fcc16581a5c54818d 100644
(file)
--- a/
src/common/consumer.c
+++ b/
src/common/consumer.c
@@
-538,7
+538,7
@@
int consumer_update_poll_array(
* increment i so nb_fd is the number of real FD.
*/
(*pollfd)[i].fd = ctx->consumer_poll_pipe[0];
* increment i so nb_fd is the number of real FD.
*/
(*pollfd)[i].fd = ctx->consumer_poll_pipe[0];
- (*pollfd)[i].events = POLLIN;
+ (*pollfd)[i].events = POLLIN
| POLLPRI
;
return i;
}
return i;
}
@@
-562,7
+562,7
@@
restart:
perror("Poll error");
goto exit;
}
perror("Poll error");
goto exit;
}
- if (consumer_sockpoll[0].revents &
POLLIN
) {
+ if (consumer_sockpoll[0].revents &
(POLLIN | POLLPRI)
) {
DBG("consumer_should_quit wake up");
goto exit;
}
DBG("consumer_should_quit wake up");
goto exit;
}
@@
-1018,7
+1018,7
@@
void *lttng_consumer_thread_poll_fds(void *data)
* array. We want to prioritize array update over
* low-priority reads.
*/
* array. We want to prioritize array update over
* low-priority reads.
*/
- if (pollfd[nb_fd].revents &
POLLIN
) {
+ if (pollfd[nb_fd].revents &
(POLLIN | POLLPRI)
) {
DBG("consumer_poll_pipe wake up");
tmp2 = read(ctx->consumer_poll_pipe[0], &tmp, 1);
if (tmp2 < 0) {
DBG("consumer_poll_pipe wake up");
tmp2 = read(ctx->consumer_poll_pipe[0], &tmp, 1);
if (tmp2 < 0) {
This page took
0.024641 seconds
and
4
git commands to generate.