Skip to content

BLASTBufferQueue: Add epoll_pwait2 fallback for older kernels #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raystef66 wants to merge 1 commit into
base: 16.0
Choose a base branch
from
+21 −2
Open

BLASTBufferQueue: Add epoll_pwait2 fallback for older kernels #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions libs/gui/BLASTBufferQueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,25 @@ timespec timespecFromNanos(nsecs_t duration) {

} // namespace

inline int epoll_wait_with_timeout(int epfd, struct epoll_event* events, int maxevents,
const timespec* timeout) {
static bool useEpollWait = false;
if (!useEpollWait) {
int ret = epoll_pwait2(epfd, events, maxevents, timeout, nullptr);
if (ret == -1 && errno == ENOSYS) {
useEpollWait = true;
} else {
return ret;
}
}

int timeoutMs = -1;
if (timeout) {
timeoutMs = (timeout->tv_sec * 1000) + (timeout->tv_nsec / 1000000);
}
return epoll_wait(epfd, events, maxevents, timeoutMs);
}

namespace android {

// Macros to include adapter info in log messages
Expand Down Expand Up @@ -1467,8 +1486,8 @@ status_t BufferReleaseReader::readBlocking(ReleaseCallbackId& outId, sp<Fence>&
epoll_event event{};
int eventCount;
do {
eventCount = epoll_pwait2(mEpollFd.get(), &event, 1 /*maxevents*/,
timespec ? &(*timespec) : nullptr, nullptr /*sigmask*/);
eventCount = epoll_wait_with_timeout(mEpollFd.get(), &event, 1 /*maxevents*/,
timespec ? &(*timespec) : nullptr);
} while (eventCount == -1 && errno == EINTR);

if (eventCount == -1) {
Expand Down