From: ylamarre@efficios.com (Yannick Lamarre)
Subject: [lttng-dev] [PATCH lttng-tools v5 5/8] Fix hang in thread_rotation when using compat-poll
Date: Thu, 25 Apr 2019 10:36:17 -0400 [thread overview]
Message-ID: <20190425143620.3348-6-ylamarre@efficios.com> (raw)
In-Reply-To: <20190425143620.3348-1-ylamarre@efficios.com>
Add missing verification to prevent a blocking read on an empty fd.
Signed-off-by: Yannick Lamarre <ylamarre at efficios.com>
---
src/bin/lttng-sessiond/rotation-thread.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 6669372d..b86b1668 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -974,6 +974,10 @@ void *thread_rotation(void *data)
int fd = LTTNG_POLL_GETFD(&thread.events, i);
uint32_t revents = LTTNG_POLL_GETEV(&thread.events, i);
+ if (!revents) {
+ /* No activity for this FD (poll implementation). */
+ continue;
+ }
DBG("[rotation-thread] Handling fd (%i) activity (%u)",
fd, revents);
--
2.11.0
next prev parent reply other threads:[~2019-04-25 14:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-25 14:36 [lttng-dev] [PATCH lttng-tools v5 0/8] Change in poll compat layer Yannick Lamarre
2019-04-25 14:36 ` [lttng-dev] [PATCH lttng-tools v5 1/8] Fix: lttng_poll_mod calls compat_(e)poll_add Yannick Lamarre
2019-04-25 14:36 ` [lttng-dev] [PATCH lttng-tools v5 2/8] Add Unit test to poll compatibility layer Yannick Lamarre
2019-04-25 14:36 ` [lttng-dev] [PATCH lttng-tools v5 3/8] Change LTTNG_POLL_GETNB behaviour for poll flavor Yannick Lamarre
2019-04-25 14:36 ` [lttng-dev] [PATCH lttng-tools v5 4/8] Adapt poll layer behaviour to match the epoll layer Yannick Lamarre
2019-04-25 14:36 ` Yannick Lamarre [this message]
2019-04-25 14:36 ` [lttng-dev] [PATCH lttng-tools v5 6/8] Change lttng_poll_wait behaviour of compat-poll to match compat-epoll Yannick Lamarre
2019-04-25 14:36 ` [lttng-dev] [PATCH lttng-tools v5 7/8] Clean code base from redundant verification Yannick Lamarre
2019-04-25 14:36 ` [lttng-dev] [PATCH lttng-tools v5 8/8] Fix typo Yannick Lamarre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190425143620.3348-6-ylamarre@efficios.com \
--to=ylamarre@efficios.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox