andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Fix EventFdLinux

Browse Source 
GitOrigin-RevId: 15b9fe88f5df8489c837d75fe3705a01298e902a
This commit is contained in:
Arseny Smirnov 2018-09-22 17:13:49 +03:00
parent 4ec1765b41
commit 23e4c95c1c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tdutils/td/utils/port/detail/EventFdLinux.cpp
View File

@ -81,6 +81,12 @@ void EventFdLinux::release() {
} }
void EventFdLinux::acquire() { void EventFdLinux::acquire() {
impl_->info.get_flags();
SCOPE_EXIT {
// Clear flags without EAGAIN and EWOULDBLOCK
// Looks like it is safe thing to do with eventfd
get_poll_info().clear_flags(PollFlags::Read());
};
uint64 res; uint64 res;
auto slice = MutableSlice(reinterpret_cast<char *>(&res), sizeof(res)); auto slice = MutableSlice(reinterpret_cast<char *>(&res), sizeof(res));
auto native_fd = impl_->info.native_fd().fd(); auto native_fd = impl_->info.native_fd().fd();
@ -97,7 +103,6 @@ void EventFdLinux::acquire() {
|| read_errno == EWOULDBLOCK || read_errno == EWOULDBLOCK
#endif #endif
) { ) {
get_poll_info().clear_flags(PollFlags::Read());
return 0; return 0;
} }
return Status::PosixError(read_errno, PSLICE() << "Read from fd " << native_fd << " has failed"); return Status::PosixError(read_errno, PSLICE() << "Read from fd " << native_fd << " has failed");