diff options
author | HÃ¥vard Pettersen <3535158+havardpe@users.noreply.github.com> | 2019-10-01 11:02:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-01 11:02:20 +0200 |
commit | f9930ea313881e2d5b21eda24f87f0f1070590aa (patch) | |
tree | b28cf1b7832f27c5c78a8efa6d12616fdf43b245 | |
parent | 9cada67836f1339b32d0f89fe082c93bfb086a4b (diff) | |
parent | d89b30a53ce10839cbfcbdf39a965be357d73162 (diff) |
Merge pull request #10826 from vespa-engine/revert-10324-toregge/avoid-hang-in-vespalib-websocket-acceptor
Revert "Avoid hang in vepalib::ws::Acceptor::accept_main on systems where"
-rw-r--r-- | vespalib/src/vespa/vespalib/websocket/acceptor.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/vespalib/src/vespa/vespalib/websocket/acceptor.cpp b/vespalib/src/vespa/vespalib/websocket/acceptor.cpp index d99035e0be7..4ba1bf3b908 100644 --- a/vespalib/src/vespa/vespalib/websocket/acceptor.cpp +++ b/vespalib/src/vespa/vespalib/websocket/acceptor.cpp @@ -3,34 +3,15 @@ #include "acceptor.h" #include <vespa/vespalib/net/socket_spec.h> #include <functional> -#ifdef __APPLE__ -#include <poll.h> -#endif namespace vespalib::ws { void Acceptor::accept_main(Handler<Socket> &socket_handler) { -#ifdef __APPLE__ - _server_socket.set_blocking(false); -#endif while (!_is_closed) { -#ifdef __APPLE__ - pollfd fds; - fds.fd = _server_socket.get_fd(); - fds.events = POLLIN; - fds.revents = 0; - int res = poll(&fds, 1, 10); - if (res < 1 || fds.revents == 0 || _is_closed) { - continue; - } -#endif SocketHandle handle = _server_socket.accept(); if (handle.valid()) { -#ifdef __APPLE__ - handle.set_blocking(true); -#endif socket_handler.handle(std::make_unique<SimpleSocket>(std::move(handle))); } } |