mmr/Livox-SDK
Archived
1
0
Fork 0
Code Issues 105 Pull Requests 11 Actions Packages Projects Releases 9 Wiki Activity

fix:descriptor remove failed on MacOS

Browse Source
This commit is contained in:
Livox-SDK
2021-04-20 12:18:48 +08:00
parent 94a0c7674a
commit b08ee601c7
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdk_core/src/base/multiple_io/multiple_io_kqueue.cpp
+16 -11
View File
@@ -83,22 +83,27 @@ bool MultipleIOKqueue::PollSetAdd(PollFd poll_fd) {
bool MultipleIOKqueue::PollSetRemove(PollFd poll_fd) { bool MultipleIOKqueue::PollSetRemove(PollFd poll_fd) {
int fd = poll_fd.fd; int fd = poll_fd.fd;
bool result = true;
if (descriptors_.find(fd) != descriptors_.end()) { if (descriptors_.find(fd) != descriptors_.end()) {
if (descriptors_[fd].event & READBLE_EVENT) { do {
EV_SET(&kevent_, fd, EVFILT_READ, EV_DELETE, 0, 0, NULL); if (descriptors_[fd].event & READBLE_EVENT) {
if (kevent(kqueue_fd_, &kevent_, 1, nullptr, 0, nullptr) == -1) { EV_SET(&kevent_, fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
return false; if (kevent(kqueue_fd_, &kevent_, 1, nullptr, 0, nullptr) == -1) {
result = false;
break;
}
} }
} if (descriptors_[fd].event & WRITABLE_EVENT) {
if (descriptors_[fd].event & WRITABLE_EVENT) { EV_SET(&kevent_, fd, EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
EV_SET(&kevent_, fd, EVFILT_WRITE, EV_DELETE, 0, 0, NULL); if (kevent(kqueue_fd_, &kevent_, 1, nullptr, 0, nullptr) == -1) {
if (kevent(kqueue_fd_, &kevent_, 1, nullptr, 0, nullptr) == -1) { result = false;
return false; break;
}
} }
} } while(0);
descriptors_.erase(fd); descriptors_.erase(fd);
} }
return true; return result;
} }
void MultipleIOKqueue::Poll(int time_out) { void MultipleIOKqueue::Poll(int time_out) {