Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR 0.7 to main #468

Merged
merged 7 commits into from
Apr 29, 2024
Merged

PR 0.7 to main #468

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
53095ba
httpfs add error log (#436)
beef9999 Apr 2, 2024
b5f9430
Remove some outdated libcurl option usage in curl wrapper header (#44…
Coldwings Apr 3, 2024
5cbfb92
zlib and uring source build didn't have -O3 (#451)
beef9999 Apr 10, 2024
cd03fc0
fix dns discard (#459)
liulanzheng Apr 18, 2024
76e032d
http client support uds (#461)
beef9999 Apr 19, 2024
01a1864
epoll_wait allows to wait 0ms, instead of the previous 1ms (#466)
beef9999 Apr 28, 2024
829314a
Merge branch 'main' into pr2main
lihuiba Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions io/epoll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,8 @@ ok: entry.interests |= eint;
int do_epoll_wait(uint64_t timeout) {
assert(_events_remain == 0);
uint8_t cool_down_ms = 1;
// since timeout may less than 1ms
// in such condition, timeout_ms should be at least 1
// or it may call epoll_wait without any idle
timeout = (timeout && timeout < 1024) ? 1 : timeout / 1024;
timeout &= 0x7fffffff; // make sure less than INT32_MAX
// epoll_wait 0ms should be OK, make sure less than INT32_MAX
timeout = (timeout / 1000) & 0x7fffffff;
while (_engine_fd > 0) {
int ret = ::epoll_wait(_engine_fd, _events, LEN(_events), timeout);
if (ret < 0) {
Expand Down
Loading