squiid/mlibc
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

options/linux: Unified epoll_wait and epoll_pwait

Browse source 
Signed-off-by: Dennisbonke <admin@dennisbonke.com>
This commit is contained in:
Dennisbonke 2020-05-27 15:25:59 +02:00
parent 9dad6438d3
commit a566bf339e
2 changed files with 8 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
options/linux/generic/sys-epoll.cpp
View file

@ -63,12 +63,12 @@ int epoll_ctl(int epfd, int mode, int fd, struct epoll_event *ev) {
int epoll_wait(int epfd, struct epoll_event *evnts, int n, int timeout) { int epoll_wait(int epfd, struct epoll_event *evnts, int n, int timeout) {
int raised; int raised;
if(!mlibc::sys_epoll_wait) { if(!mlibc::sys_epoll_pwait) {
MLIBC_MISSING_SYSDEP(); MLIBC_MISSING_SYSDEP();
errno = ENOSYS; errno = ENOSYS;
return -1; return -1;
} }
if(int e = mlibc::sys_epoll_wait(epfd, evnts, n, timeout, &raised)) { if(int e = mlibc::sys_epoll_pwait(epfd, evnts, n, timeout, NULL, &raised)) {
errno = e; errno = e;
return -1; return -1;
} }

60
sysdeps/managarm/generic/file.cpp
View file

@ -1501,58 +1501,6 @@ int sys_epoll_ctl(int epfd, int mode, int fd, struct epoll_event *ev) {
return 0; return 0;
} }
int sys_epoll_wait(int epfd, struct epoll_event *evnts, int n, int timeout, int *raised) {
__ensure(timeout >= 0 || timeout == -1); // TODO: Report errors correctly.
SignalGuard sguard;
HelAction actions[4];
globalQueue.trim();
managarm::posix::CntRequest<MemoryAllocator> req(getSysdepsAllocator());
req.set_request_type(managarm::posix::CntReqType::EPOLL_WAIT);
req.set_fd(epfd);
req.set_size(n);
req.set_timeout(timeout > 0 ? int64_t{timeout} * 1000000 : timeout);
frg::string<MemoryAllocator> ser(getSysdepsAllocator());
req.SerializeToString(&ser);
actions[0].type = kHelActionOffer;
actions[0].flags = kHelItemAncillary;
actions[1].type = kHelActionSendFromBuffer;
actions[1].flags = kHelItemChain;
actions[1].buffer = ser.data();
actions[1].length = ser.size();
actions[2].type = kHelActionRecvInline;
actions[2].flags = kHelItemChain;
actions[3].type = kHelActionRecvToBuffer;
actions[3].flags = 0;
actions[3].buffer = evnts;
actions[3].length = n * sizeof(struct epoll_event);
HEL_CHECK(helSubmitAsync(getPosixLane(), actions, 4,
globalQueue.getQueue(), 0, 0));
auto element = globalQueue.dequeueSingle();
auto offer = parseSimple(element);
auto send_req = parseSimple(element);
auto recv_resp = parseInline(element);
auto recv_data = parseLength(element);
HEL_CHECK(offer->error);
HEL_CHECK(send_req->error);
HEL_CHECK(recv_resp->error);
HEL_CHECK(recv_data->error);
managarm::posix::SvrResponse<MemoryAllocator> resp(getSysdepsAllocator());
resp.ParseFromArray(recv_resp->data, recv_resp->length);
if(resp.error() == managarm::posix::Errors::BAD_FD) {
return EBADF;
}
__ensure(resp.error() == managarm::posix::Errors::SUCCESS);
__ensure(!(recv_data->length % sizeof(struct epoll_event)));
*raised = recv_data->length / sizeof(struct epoll_event);
return 0;
}
int sys_epoll_pwait(int epfd, struct epoll_event *ev, int n, int sys_epoll_pwait(int epfd, struct epoll_event *ev, int n,
int timeout, const sigset_t *sigmask, int *raised) { int timeout, const sigset_t *sigmask, int *raised) {
__ensure(timeout >= 0 || timeout == -1); // TODO: Report errors correctly. __ensure(timeout >= 0 || timeout == -1); // TODO: Report errors correctly.
@ -1566,8 +1514,12 @@ int sys_epoll_pwait(int epfd, struct epoll_event *ev, int n,
req.set_fd(epfd); req.set_fd(epfd);
req.set_size(n); req.set_size(n);
req.set_timeout(timeout > 0 ? int64_t{timeout} * 1000000 : timeout); req.set_timeout(timeout > 0 ? int64_t{timeout} * 1000000 : timeout);
req.set_sigmask((long int)sigmask); if(sigmask != NULL) {
req.set_sigmask_needed(true); req.set_sigmask((long int)sigmask);
req.set_sigmask_needed(true);
} else {
req.set_sigmask_needed(false);
}
frg::string<MemoryAllocator> ser(getSysdepsAllocator()); frg::string<MemoryAllocator> ser(getSysdepsAllocator());
req.SerializeToString(&ser); req.SerializeToString(&ser);