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

options/linux: Add initial timerfd() support

Browse source
This commit is contained in:
Alexander van der Grinten 2018-02-12 10:19:17 +01:00
parent 21cc551dfd
commit db2a453b06
3 changed files with 54 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
options/internal/include/mlibc/sysdeps.hpp
View file

@ -43,6 +43,8 @@ int sys_sleep(time_t *secs, long *nanos);
int sys_fork(pid_t *child);
void sys_execve(const char *path, char *const argv[], char *const envp[]);
int sys_timerfd_create(int flags, int *fd);
int sys_signalfd_create(int flags, int *fd);
} //namespace mlibc

10
options/linux/generic/sys-timerfd.cpp
View file

@ -2,9 +2,13 @@
#include <bits/ensure.h>
#include <sys/timerfd.h>
int timerfd_create(int, int) {
__ensure(!"Not implemented");
__builtin_unreachable();
#include <mlibc/sysdeps.hpp>
int timerfd_create(int, int flags) {
int fd;
if(mlibc::sys_timerfd_create(flags, &fd))
return -1;
return fd;
}
int timerfd_settime(int, int, const struct itimerspec *, struct itimerspec *) {

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

@ -484,10 +484,55 @@ int epoll_wait(int epfd, struct epoll_event *evnts, int n, int timeout) {
return recv_data->length / sizeof(struct epoll_event);
}
#include <sys/timerfd.h>
#include <sys/signalfd.h>
namespace mlibc {
int sys_timerfd_create(int flags, int *fd) {
__ensure(!(flags & ~(TFD_CLOEXEC | TFD_NONBLOCK)));
if(flags & TFD_CLOEXEC)
frigg::infoLogger() << "\e[31mmlibc: timerfd(TFD_CLOEXEC)"
" is not implemented correctly\e[39m" << frigg::endLog;
if(flags & TFD_NONBLOCK)
frigg::infoLogger() << "\e[31mmlibc: timerfd(TFD_NONBLOCK)"
" is not implemented correctly\e[39m" << frigg::endLog;
HelAction actions[3];
globalQueue.trim();
managarm::posix::CntRequest<MemoryAllocator> req(getAllocator());
req.set_request_type(managarm::posix::CntReqType::TIMERFD_CREATE);
frigg::String<MemoryAllocator> ser(getAllocator());
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 = 0;
HEL_CHECK(helSubmitAsync(kHelThisThread, actions, 3,
globalQueue.getQueue(), 0, 0));
auto element = globalQueue.dequeueSingle();
auto offer = parseSimple(element);
auto send_req = parseSimple(element);
auto recv_resp = parseInline(element);
HEL_CHECK(offer->error);
HEL_CHECK(send_req->error);
HEL_CHECK(recv_resp->error);
managarm::posix::SvrResponse<MemoryAllocator> resp(getAllocator());
resp.ParseFromArray(recv_resp->data, recv_resp->length);
__ensure(resp.error() == managarm::posix::Errors::SUCCESS);
*fd = resp.fd();
return 0;
}
int sys_signalfd_create(int flags, int *fd) {
__ensure(!(flags & ~(SFD_CLOEXEC | SFD_NONBLOCK)));
if(flags & SFD_CLOEXEC)