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

FIX: epoll-ng wait for fd with event 0 #502

Merged
merged 4 commits into from
Jun 6, 2024
Merged

FIX: epoll-ng wait for fd with event 0 #502

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c09cda
FIX: epoll-ng wait for fd with event 0
Coldwings Jun 6, 2024
05fa7d2
Add CI UT
Coldwings Jun 6, 2024
206cb6d
FIX http server proxy handle failure test
Coldwings Jun 6, 2024
921ef9a
Add epoll_ng into ALL_ENGINES in photon.cpp
Coldwings Jun 6, 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
10 changes: 10 additions & 0 deletions .github/workflows/ci.linux.x86-64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ jobs:
ctest -E test-lockfree --timeout 3600 -V
export PHOTON_CI_EV_ENGINE=io_uring
ctest -E test-lockfree --timeout 3600 -V
export PHOTON_CI_EV_ENGINE=epoll_ng
ctest -E test-lockfree --timeout 3600 -V

gcc921:
needs: gcc850
Expand Down Expand Up @@ -103,6 +105,8 @@ jobs:
ctest -E test-lockfree --timeout 3600 -V
export PHOTON_CI_EV_ENGINE=io_uring
ctest -E test-lockfree --timeout 3600 -V
export PHOTON_CI_EV_ENGINE=epoll_ng
ctest -E test-lockfree --timeout 3600 -V

gcc1031:
needs: gcc921
Expand Down Expand Up @@ -144,6 +148,8 @@ jobs:
ctest -E test-lockfree --timeout 3600 -V
export PHOTON_CI_EV_ENGINE=io_uring
ctest -E test-lockfree --timeout 3600 -V
export PHOTON_CI_EV_ENGINE=epoll_ng
ctest -E test-lockfree --timeout 3600 -V

gcc1121:
needs: gcc1031
Expand Down Expand Up @@ -185,6 +191,8 @@ jobs:
ctest -E test-lockfree --timeout 3600 -V
export PHOTON_CI_EV_ENGINE=io_uring
ctest -E test-lockfree --timeout 3600 -V
export PHOTON_CI_EV_ENGINE=epoll_ng
ctest -E test-lockfree --timeout 3600 -V

gcc1211:
needs: gcc1121
Expand Down Expand Up @@ -226,5 +234,7 @@ jobs:
ctest -E test-lockfree --timeout 3600 -V
export PHOTON_CI_EV_ENGINE=io_uring
ctest -E test-lockfree --timeout 3600 -V
export PHOTON_CI_EV_ENGINE=epoll_ng
ctest -E test-lockfree --timeout 3600 -V


1 change: 1 addition & 0 deletions io/epoll-ng.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ class EventEngineEPollNG : public MasterEventEngine,
virtual int cancel_wait() override { return eventfd_write(evfd, 1); }

int wait_for_fd(int fd, uint32_t interests, Timeout timeout) override {
if (interests == 0) return 0;
Event waiter{fd, interests | ONE_SHOT, CURRENT};
Event event{fd, interests | ONE_SHOT, &waiter};
int ret = add_interest(event);
Expand Down
7 changes: 5 additions & 2 deletions net/http/test/server_function_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,10 @@ int chunked_handler_pt(void*, net::ISocketStream* sock) {

int test_director(void* src_, Request& src, Request& dst) {
auto source_server = (ISocketServer*)src_;
dst.reset(src.verb(), to_url(source_server, "/filename_not_important"));
if (source_server)
dst.reset(src.verb(), to_url(source_server, "/filename_not_important"));
else
dst.reset(src.verb(), "http://localhost:0/filename_not_important");
dst.headers.insert("proxy_server_test", "just4test");
for (auto kv = src.headers.begin(); kv != src.headers.end(); kv++) {
if (kv.first() != "Host") dst.headers.insert(kv.first(), kv.second(), 1);
Expand Down Expand Up @@ -433,7 +436,7 @@ TEST(http_server, proxy_handler_failure) {
DEFER(delete tcpserver);
auto proxy_server = new_http_server();
DEFER(delete proxy_server);
auto proxy_handler = new_proxy_handler({tcpserver, &test_director},
auto proxy_handler = new_proxy_handler({nullptr, &test_director},
{nullptr, &test_modifier}, client_proxy);
proxy_server->add_handler(proxy_handler);
tcpserver->set_handler(proxy_server->get_connection_handler());
Expand Down
6 changes: 5 additions & 1 deletion test/ci-tools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ static void parse_env_eng() {
_engine = photon::INIT_EVENT_IOURING;
} else if (strcmp(_engine_name, "kqueue") == 0) {
_engine = photon::INIT_EVENT_KQUEUE;
} else if (strcmp(_engine_name, "epoll_ng") == 0) {
_engine = photon::INIT_EVENT_EPOLL_NG;
} else {
printf("invalid event engine: %s\n", _engine_name);
_engine_name = nullptr;
Expand All @@ -39,6 +41,7 @@ static estring_view get_engine_name(uint64_t eng) {
case INIT_EVENT_KQUEUE: return "kqueue";
case INIT_EVENT_SELECT: return "select";
case INIT_EVENT_IOCP: return "iocp";
case INIT_EVENT_EPOLL_NG: return "epoll_ng";
}
return {};
}
Expand Down Expand Up @@ -66,7 +69,8 @@ int init(uint64_t event_engine, uint64_t io_engine, const PhotonOptions& options
LOG_INFO("enter CI overriden photon::init()");
const uint64_t all_engines = INIT_EVENT_EPOLL |
INIT_EVENT_IOURING | INIT_EVENT_KQUEUE |
INIT_EVENT_SELECT | INIT_EVENT_IOCP;
INIT_EVENT_SELECT | INIT_EVENT_IOCP |
INIT_EVENT_EPOLL_NG;
auto arg_specified = event_engine & all_engines;
LOG_INFO("argument specified: ` (`)", get_engine_names(arg_specified), arg_specified);
LOG_INFO("environment specified: '`'", _engine_name);
Expand Down
Loading