thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix data race

Browse Source
This commit is contained in:
Pavel Kruglov 2021-02-15 22:54:23 +03:00
parent 28dec516ac
commit 937a3192eb
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Common/Epoll.cpp
View File

@ -21,9 +21,21 @@ Epoll::Epoll() : events_count(0)
throwFromErrno("Cannot open epoll descriptor", DB::ErrorCodes::EPOLL_ERROR);
}
Epoll::Epoll(Epoll && other) : epoll_fd(other.epoll_fd), events_count(other.events_count)
Epoll::Epoll(Epoll && other)
{
epoll_fd = other.epoll_fd;
other.epoll_fd = -1;
int count = other.events_count;
events_count = count;
}
Epoll & Epoll::operator=(Epoll && other)
{
epoll_fd = other.epoll_fd;
other.epoll_fd = -1;
int count = other.events_count;
events_count = count;
return *this;
}
void Epoll::add(int fd, void * ptr)
@ -35,18 +47,18 @@ void Epoll::add(int fd, void * ptr)
else
event.data.fd = fd;
++events_count;
if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &event) == -1)
throwFromErrno("Cannot add new descriptor to epoll", DB::ErrorCodes::EPOLL_ERROR);
++events_count;
}
void Epoll::remove(int fd)
{
--events_count;
if (epoll_ctl(epoll_fd, EPOLL_CTL_DEL, fd, nullptr) == -1)
throwFromErrno("Cannot remove descriptor from epoll", DB::ErrorCodes::EPOLL_ERROR);
--events_count;
}
size_t Epoll::getManyReady(int max_events, epoll_event * events_out, bool blocking, AsyncCallback async_callback) const
@ -54,7 +66,7 @@ size_t Epoll::getManyReady(int max_events, epoll_event * events_out, bool blocki
if (events_count == 0)
throw Exception("There is no events in epoll", ErrorCodes::LOGICAL_ERROR);
int ready_size = 0;
int ready_size;
int timeout = blocking && !async_callback ? -1 : 0;
do
{

9
src/Common/Epoll.h
View File

@ -16,13 +16,12 @@ class Epoll
public:
Epoll();
Epoll(const Epoll & other) = delete;
Epoll & operator=(const Epoll & other) = delete;
Epoll(const Epoll &) = delete;
Epoll & operator=(const Epoll &) = delete;
Epoll & operator=(Epoll && other);
Epoll(Epoll && other);
Epoll & operator=(Epoll && other) = default;
/// Add new file descriptor to epoll. If ptr set to nullptr, epoll_event.data.fd = fd,
/// otherwise epoll_event.data.ptr = ptr.
void add(int fd, void * ptr = nullptr);
@ -47,7 +46,7 @@ public:
private:
int epoll_fd;
int events_count;
std::atomic<int> events_count;
};
}