FIX: wait_for_fd in epoll reap events when timeout is 0 #553
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HanLee13
reviewed
Sep 9, 2024
HanLee13
approved these changes
Sep 9, 2024
|
merge to 0.8? |
Better merging from 0.6 ? |
lihuiba
reviewed
Sep 11, 2024
io/epoll.cpp
Outdated
| ret = thread_usleep(timeout); | ||
| // if timeout is just simple 0, wait for a tiny little moment | ||
| // so that events can be collect. | ||
| ret = thread_usleep(timeout.timeout() ? timeout : Timeout(10)); |
There was a problem hiding this comment.
In case of timeout == 0, we'd better reap the events directly without blocking, so as to conform to the semantics.
io/kqueue.cpp
Outdated
| @@ -99,7 +99,7 @@ class KQueue : public MasterEventEngine, public CascadingEventEngine, public Res | |||
| return 0; | |||
| short ev = (interests == EVENT_READ) ? EVFILT_READ : EVFILT_WRITE; | |||
| enqueue(fd, ev, EV_ADD | EV_ONESHOT, 0, CURRENT); | |||
| int ret = thread_usleep(timeout); | |||
| int ret = thread_usleep(timeout.timeout() ? timeout : Timeout(10)); | |||
There was a problem hiding this comment.
In case of timeout == 0, we'd better reap the events directly without blocking, so as to conform to the semantics.
Coldwings
changed the title
Coldwings
force-pushed
the
fix/sockpool-waitforfd
branch
from
4498566
to
eeddb74
Compare
Coldwings
force-pushed
the
fix/sockpool-waitforfd
branch
from
eeddb74
to
b0e32eb
Compare
|
Once this PR checked and approved, I will request other PR for releases from 0.6 to 0.8 |
lihuiba
approved these changes
Sep 11, 2024
Coldwings
force-pushed
the
fix/sockpool-waitforfd
branch
from
4f9feed
to
668e8aa
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
socket pool use
wait_for_fdto check if released fd still have bytes left to read, but set timeout to 0.since thread_usleep will always timedout when sleep time left 0, set 10us timeout, so that thread can actually put into sleep and wait for notify.