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

options/linux: Implement timerfd_settime()

Browse source
This commit is contained in:
Alexander van der Grinten 2018-02-16 22:46:03 +01:00
parent 9441bbe55d
commit c477e99d8a
3 changed files with 59 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,8 @@ 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_timerfd_settime(int fd, int flags,
const struct itimerspec *value);
int sys_signalfd_create(int flags, int *fd);

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

@ -12,8 +12,12 @@ int timerfd_create(int, int flags) {
return fd;
}
int timerfd_settime(int, int, const struct itimerspec *, struct itimerspec *) {
frigg::infoLogger() << "\e[31mmlibc: timerfd_settime() is a no-op\e[39m" << frigg::endLog;
int timerfd_settime(int fd, int flags, const struct itimerspec *value,
struct itimerspec *oldvalue) {
__ensure(!oldvalue);
if(mlibc::sys_timerfd_settime(fd, flags, value))
return -1;
return 0;
}

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

@ -462,6 +462,16 @@ int epoll_create1(int flags) {
}
int epoll_ctl(int epfd, int mode, int fd, struct epoll_event *ev) {
if(mode == EPOLL_CTL_MOD) {
frigg::infoLogger() << "\e[31mmlibc: epoll_ctl(EPOLL_CTL_MOD) is not implemented correctly"
<< "\e[39m" << frigg::endLog;
return 0;
}else if(mode == EPOLL_CTL_DEL) {
frigg::infoLogger() << "\e[31mmlibc: epoll_ctl(EPOLL_CTL_DEL) is not implemented correctly"
<< "\e[39m" << frigg::endLog;
return 0;
}
__ensure(mode == EPOLL_CTL_ADD);
HelAction actions[3];
@ -596,6 +606,47 @@ int sys_timerfd_create(int flags, int *fd) {
return 0;
}
int sys_timerfd_settime(int fd, int flags,
const struct itimerspec *value) {
HelAction actions[3];
globalQueue.trim();
managarm::posix::CntRequest<MemoryAllocator> req(getAllocator());
req.set_request_type(managarm::posix::CntReqType::TIMERFD_SETTIME);
req.set_fd(fd);
req.set_time_secs(value->it_value.tv_sec);
req.set_time_nanos(value->it_value.tv_nsec);
req.set_interval_secs(value->it_interval.tv_sec);
req.set_interval_nanos(value->it_interval.tv_nsec);
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);
return 0;
}
int sys_signalfd_create(int flags, int *fd) {
__ensure(!(flags & ~(SFD_CLOEXEC | SFD_NONBLOCK)));
if(flags & SFD_CLOEXEC)