thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-04 07:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't epoll_create each poll

Browse Source
This commit is contained in:
alesapin 2020-11-25 23:42:23 +03:00
parent fd67864e15
commit 77651dd239
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/Server/TestKeeperTCPHandler.cpp
View File

@ -13,7 +13,6 @@
#include <Common/PipeFDs.h> #include <Common/PipeFDs.h>
#include <Poco/Util/AbstractConfiguration.h> #include <Poco/Util/AbstractConfiguration.h>
#ifdef POCO_HAVE_FD_EPOLL #ifdef POCO_HAVE_FD_EPOLL
#include <sys/epoll.h> #include <sys/epoll.h>
#else #else
@ -34,6 +33,12 @@ struct SocketInterruptablePollWrapper
int sockfd; int sockfd;
PipeFDs pipe; PipeFDs pipe;
#if defined(POCO_HAVE_FD_EPOLL)
int epollfd;
epoll_event socket_event{};
epoll_event pipe_event{};
#endif
enum class PollStatus enum class PollStatus
{ {
HAS_DATA, HAS_DATA,
@ -48,6 +53,27 @@ struct SocketInterruptablePollWrapper
: sockfd(poco_socket_.impl()->sockfd()) : sockfd(poco_socket_.impl()->sockfd())
{ {
pipe.setNonBlocking(); pipe.setNonBlocking();
#if defined(POCO_HAVE_FD_EPOLL)
epollfd = epoll_create(2);
if (epollfd < 0)
throwFromErrno("Cannot epoll_create", ErrorCodes::SYSTEM_ERROR);
socket_event.events = EPOLLIN | EPOLLERR;
socket_event.data.fd = sockfd;
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sockfd, &socket_event) < 0)
{
::close(epollfd);
throwFromErrno("Cannot insert socket into epoll queue", ErrorCodes::SYSTEM_ERROR);
}
pipe_event.events = EPOLLIN | EPOLLERR;
pipe_event.data.fd = pipe.fds_rw[0];
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, pipe.fds_rw[0], &pipe_event) < 0)
{
::close(epollfd);
throwFromErrno("Cannot insert socket into epoll queue", ErrorCodes::SYSTEM_ERROR);
}
#endif
} }
int getInterruptFD() const int getInterruptFD() const
@ -57,30 +83,7 @@ struct SocketInterruptablePollWrapper
PollStatus poll(Poco::Timespan remaining_time) PollStatus poll(Poco::Timespan remaining_time)
{ {
#if defined(POCO_HAVE_FD_EPOLL) #if defined(POCO_HAVE_FD_EPOLL)
int epollfd = epoll_create(2);
if (epollfd < 0)
throwFromErrno("Cannot epoll_create", ErrorCodes::SYSTEM_ERROR);
epoll_event socket_event{};
socket_event.events = EPOLLIN | EPOLLERR;
socket_event.data.fd = sockfd;
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sockfd, &socket_event) < 0)
{
::close(epollfd);
throwFromErrno("Cannot insert socket into epoll queue", ErrorCodes::SYSTEM_ERROR);
}
epoll_event pipe_event{};
pipe_event.events = EPOLLIN | EPOLLERR;
pipe_event.data.fd = pipe.fds_rw[0];
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, pipe.fds_rw[0], &pipe_event) < 0)
{
::close(epollfd);
throwFromErrno("Cannot insert socket into epoll queue", ErrorCodes::SYSTEM_ERROR);
}
int rc; int rc;
epoll_event evout{}; epoll_event evout{};
do do
@ -99,7 +102,6 @@ struct SocketInterruptablePollWrapper
} }
while (rc < 0 && errno == EINTR); while (rc < 0 && errno == EINTR);
::close(epollfd);
int out_fd = evout.data.fd; int out_fd = evout.data.fd;
#else #else
pollfd poll_buf[2]; pollfd poll_buf[2];
@ -143,6 +145,13 @@ struct SocketInterruptablePollWrapper
} }
return PollStatus::HAS_DATA; return PollStatus::HAS_DATA;
} }
#if defined(POCO_HAVE_FD_EPOLL)
~SocketInterruptablePollWrapper()
{
::close(epollfd);
}
#endif
}; };
TestKeeperTCPHandler::TestKeeperTCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_) TestKeeperTCPHandler::TestKeeperTCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_)