wip

odoo · Jan 23, 2025 · a934e89 · a934e89
1 parent 5d0f65e
commit a934e89
Show file tree

Hide file tree

Showing 22 changed files with 307 additions and 147 deletions.
diff --git a/src/impls/impl-posix/epoll/async.cpp b/src/impls/impl-posix/epoll/async.cpp
@@ -0,0 +1,118 @@
+#include <impl-posix/fd.h>
+#include <impl-posix/utils.h>
+#include <karm-async/promise.h>
+#include <karm-base/map.h>
+#include <karm-sys/_embed.h>
+#include <karm-sys/async.h>
+#include <karm-sys/time.h>
+#include <sys/epoll.h>
+#include <sys/timerfd.h>
+#include <unistd.h>
+
+namespace Karm::Sys::_Embed {
+
+struct EpollSched : public Sys::Sched {
+    int _epollFd;
+    usize _id = 0;
+    Map<usize, Async::Promise<>> _promises;
+
+    EpollSched(int epoll_fd) : _epollFd(epoll_fd) {}
+
+    ~EpollSched() { close(_epollFd); }
+
+    Async::Task<> waitFor(epoll_event ev, int fd) {
+        usize id = _id++;
+        auto promise = Async::Promise<>();
+        auto future = promise.future();
+
+        ev.data.u64 = id;
+        if (::epoll_ctl(_epollFd, EPOLL_CTL_ADD, fd, &ev) < 0)
+            panic("epoll_ctl");
+
+        _promises.put(id, std::move(promise));
+        return Async::makeTask(future);
+    }
+
+    Async::Task<usize> readAsync(Rc<Fd> fd, MutBytes buf) override {
+        co_trya$(waitFor({.events = EPOLLIN | EPOLLET, .data = {}}, fd->handle().value()));
+        co_return Ok(co_try$(fd->read(buf)));
+    }
+
+    Async::Task<usize> writeAsync(Rc<Fd> fd, Bytes buf) override {
+        co_trya$(waitFor({.events = EPOLLOUT | EPOLLET, .data = {}}, fd->handle().value()));
+        co_return Ok(co_try$(fd->write(buf)));
+    }
+
+    Async::Task<usize> flushAsync(Rc<Fd> fd) override {
+        co_trya$(waitFor({.events = EPOLLOUT | EPOLLET, .data = {}}, fd->handle().value()));
+        co_return Ok(co_try$(fd->flush()));
+    }
+
+    Async::Task<_Accepted> acceptAsync(Rc<Fd> fd) override {
+        co_trya$(waitFor({.events = EPOLLIN | EPOLLET, .data = {}}, fd->handle().value()));
+        co_return Ok(co_try$(fd->accept()));
+    }
+
+    Async::Task<_Sent> sendAsync(Rc<Fd> fd, Bytes buf, Slice<Handle> handles, SocketAddr addr) override {
+        co_trya$(waitFor({.events = EPOLLOUT | EPOLLET, .data = {}}, fd->handle().value()));
+        co_return Ok(co_try$(fd->send(buf, handles, addr)));
+    }
+
+    Async::Task<_Received> recvAsync(Rc<Fd> fd, MutBytes buf, MutSlice<Handle> hnds) override {
+        co_trya$(waitFor({.events = EPOLLIN | EPOLLET, .data = {}}, fd->handle().value()));
+        co_return Ok(co_try$(fd->recv(buf, hnds)));
+    }
+
+    Async::Task<> sleepAsync(Instant until) override {
+        Instant now = Sys::instant();
+        Duration delta = Duration::zero();
+        if (now < until)
+            delta = until - now;
+
+        int timeFd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK);
+        if (timeFd < 0)
+            co_return Posix::fromLastErrno();
+        Defer defer{[&] {
+            close(timeFd);
+        }};
+
+        itimerspec spec{};
+        spec.it_value = Posix::toTimespec(delta);
+        if (timerfd_settime(timeFd, 0, &spec, nullptr) < 0)
+            co_return Posix::fromLastErrno();
+
+        co_trya$(waitFor({.events = EPOLLIN, .data = {}}, timeFd));
+        close(timeFd);
+        co_return Ok();
+    }
+
+    Res<> wait(Instant until) override {
+        epoll_event ev;
+        int timeout = until.isEndOfTime() ? -1 : (until - Sys::instant()).toMSecs();
+
+        int n = ::epoll_wait(_epollFd, &ev, 1, timeout);
+
+        if (n < 0)
+            return Posix::fromLastErrno();
+
+        if (n == 0)
+            return Ok();
+
+        usize id = ev.data.u64;
+        auto promise = _promises.take(id);
+        promise.resolve(Ok());
+        return Ok();
+    }
+};
+
+Sched& globalSched() {
+    static EpollSched sched = [] {
+        int fd = ::epoll_create1(0);
+        if (fd < 0)
+            panic("epoll_create1");
+        return EpollSched(fd);
+    }();
+    return sched;
+}
+
+} // namespace Karm::Sys::_Embed
diff --git a/src/impls/impl-posix/epoll/manifest.json b/src/impls/impl-posix/epoll/manifest.json
@@ -0,0 +1,16 @@
+{
+    "$schema": "https://schemas.cute.engineering/stable/cutekit.manifest.component.v1",
+    "id": "impl-posix.epoll",
+    "type": "lib",
+    "props": {
+        "cpp-excluded": true
+    },
+    "enableIf": {
+        "sys": [
+            "linux"
+        ]
+    },
+    "provides": [
+        "karm-sys-async-impl"
+    ]
+}
diff --git a/src/impls/impl-posix/kevent/async.cpp b/src/impls/impl-posix/kevent/async.cpp
@@ -29,9 +29,9 @@ struct DarwinSched :
         close(_kqueue);
     }
 
-    struct timespec _computeTimeout(TimeStamp until) {
-        TimeStamp now = Sys::now();
-        TimeSpan delta = TimeSpan::zero();
+    struct timespec _computeTimeout(Instant until) {
+        Instant now = Sys::now();
+        Duration delta = Duration::zero();
         if (now < until)
             delta = until - now;
         return Posix::toTimespec(delta);
@@ -138,7 +138,7 @@ struct DarwinSched :
         co_return Ok(co_try$(fd->recv(buf, hnds)));
     }
 
-    Async::Task<> sleepAsync(TimeStamp until) override {
+    Async::Task<> sleepAsync(Instant until) override {
         struct timespec ts = _computeTimeout(until);
 
         co_trya$(waitFor({
@@ -153,7 +153,7 @@ struct DarwinSched :
         co_return Ok();
     }
 
-    Res<> wait(TimeStamp until) override {
+    Res<> wait(Instant until) override {
         struct kevent64_s ev;
         struct timespec ts = _computeTimeout(until);
 

diff --git a/src/impls/impl-posix/sys.cpp b/src/impls/impl-posix/sys.cpp
@@ -301,18 +301,18 @@ Res<Rc<Fd>> listenIpc(Mime::Url url) {
 
 // MARK: Time ------------------------------------------------------------------
 
-TimeSpan fromTimeSpec(struct timespec const& ts) {
+Duration fromTimeSpec(struct timespec const& ts) {
     auto usecs = (u64)ts.tv_sec * 1000000 + (u64)ts.tv_nsec / 1000;
-    return TimeSpan::fromUSecs(usecs);
+    return Duration::fromUSecs(usecs);
 }
 
-TimeStamp now() {
+Instant now() {
     struct timespec ts;
     clock_gettime(CLOCK_REALTIME, &ts);
-    return TimeStamp::epoch() + fromTimeSpec(ts);
+    return Instant::epoch() + fromTimeSpec(ts);
 }
 
-TimeSpan uptime() {
+Duration uptime() {
     struct timespec ts;
     clock_gettime(CLOCK_MONOTONIC, &ts);
     return fromTimeSpec(ts);
@@ -422,7 +422,7 @@ Res<> populate(Vec<UserInfo>& infos) {
 
 // MARK: Process Managment -----------------------------------------------------
 
-Res<> sleep(TimeSpan span) {
+Res<> sleep(Duration span) {
     struct timespec ts;
     ts.tv_sec = span.toSecs();
     ts.tv_nsec = (span.toUSecs() % 1000000) * 1000;

diff --git a/src/impls/impl-posix/uring/async.cpp b/src/impls/impl-posix/uring/async.cpp
@@ -12,7 +12,7 @@
 
 namespace Karm::Sys::_Embed {
 
-struct __kernel_timespec toKernelTimespec(TimeStamp ts) {
+struct __kernel_timespec toKernelTimespec(Instant ts) {
     struct __kernel_timespec kts;
     if (ts.isEndOfTime()) {
         kts.tv_sec = LONG_MAX;
@@ -25,7 +25,7 @@ struct __kernel_timespec toKernelTimespec(TimeStamp ts) {
     return kts;
 }
 
-struct __kernel_timespec toKernelTimespec(TimeSpan ts) {
+struct __kernel_timespec toKernelTimespec(Duration ts) {
     struct __kernel_timespec kts;
     if (ts.isInfinite()) {
         kts.tv_sec = LONG_MAX;
@@ -282,14 +282,14 @@ struct UringSched : public Sys::Sched {
         return Async::makeTask(job->future());
     }
 
-    Async::Task<> sleepAsync(TimeStamp until) override {
+    Async::Task<> sleepAsync(Instant until) override {
         struct Job : public _Job {
-            TimeStamp _until;
+            Instant _until;
             Async::Promise<> _promise;
 
             struct __kernel_timespec _ts{};
 
-            Job(TimeStamp until)
+            Job(Instant until)
                 : _until(until) {}
 
             void submit(io_uring_sqe* sqe) override {
@@ -314,12 +314,12 @@ struct UringSched : public Sys::Sched {
         return Async::makeTask(job->future());
     }
 
-    Res<> wait(TimeStamp until) override {
+    Res<> wait(Instant until) override {
         // HACK: io_uring_wait_cqes doesn't support absolute timeout
         //       so we have to do it ourselves
-        TimeStamp now = Sys::now();
+        Instant now = Sys::now();
 
-        TimeSpan delta = TimeSpan::zero();
+        Duration delta = Duration::zero();
         if (now < until)
             delta = until - now;
 

diff --git a/src/impls/impl-posix/utils.cpp b/src/impls/impl-posix/utils.cpp
@@ -219,13 +219,13 @@ Sys::Stat fromStat(struct stat const& buf) {
         type = Sys::Type::DIR;
     stat.type = type;
     stat.size = (usize)buf.st_size;
-    stat.accessTime = TimeStamp::epoch() + TimeSpan::fromSecs(buf.st_atime);
-    stat.modifyTime = TimeStamp::epoch() + TimeSpan::fromSecs(buf.st_mtime);
-    stat.changeTime = TimeStamp::epoch() + TimeSpan::fromSecs(buf.st_ctime);
+    stat.accessTime = SystemTime::epoch() + Duration::fromSecs(buf.st_atime);
+    stat.modifyTime = SystemTime::epoch() + Duration::fromSecs(buf.st_mtime);
+    stat.changeTime = SystemTime::epoch() + Duration::fromSecs(buf.st_ctime);
     return stat;
 }
 
-struct timespec toTimespec(TimeStamp ts) {
+struct timespec toTimespec(SystemTime ts) {
     struct timespec pts;
     if (ts.isEndOfTime()) {
         pts.tv_sec = Limits<long>::MAX;
@@ -238,7 +238,7 @@ struct timespec toTimespec(TimeStamp ts) {
     return pts;
 }
 
-struct timespec toTimespec(TimeSpan ts) {
+struct timespec toTimespec(Duration ts) {
     struct timespec pts;
     if (ts.isInfinite()) {
         pts.tv_sec = Limits<long>::MAX;

diff --git a/src/impls/impl-posix/utils.h b/src/impls/impl-posix/utils.h
@@ -24,9 +24,9 @@ Sys::SocketAddr fromSockAddr(struct sockaddr_in sockaddr);
 
 Sys::Stat fromStat(struct stat const& buf);
 
-struct timespec toTimespec(TimeStamp ts);
+struct timespec toTimespec(SystemTime ts);
 
-struct timespec toTimespec(TimeSpan ts);
+struct timespec toTimespec(Duration ts);
 
 enum struct RepoType {
     CUTEKIT,

diff --git a/src/impls/impl-sdl/ui.cpp b/src/impls/impl-sdl/ui.cpp
@@ -515,7 +515,7 @@ struct SdlHost :
         g.pop();
     }
 
-    Res<> wait(TimeStamp ts) override {
+    Res<> wait(Instant ts) override {
         // HACK: Since we don't have a lot of control onto how SDL wait for
         //       events we can't integrate it properly with our event loop
         //       To remedi this we will just cap how long we wait, this way
@@ -524,8 +524,8 @@ struct SdlHost :
         // NOTE: A better option would be to have SDL in a separeted thread
         //       and do the communication over an inter-thread channel but
         //       but this would require to make the Framework thread safe
-        auto delay = TimeSpan::fromMSecs((usize)(FRAME_TIME * 1000));
-        auto cappedWait = min(ts, Sys::now() + delay);
+        auto delay = Duration::fromMSecs((usize)(FRAME_TIME * 1000));
+        auto cappedWait = min(ts, Sys::instant() + delay);
         try$(Sys::globalSched().wait(cappedWait));
 
         SDL_Event e{};

diff --git a/src/impls/impl-wasm/sys.cpp b/src/impls/impl-wasm/sys.cpp
@@ -72,9 +72,9 @@ struct JSConsole : public Sys::Fd {
     }
 };
 
-TimeStamp now() {
+SystemTime now() {
     auto span = embedGetTimeStamp();
-    return TimeStamp::epoch() + TimeSpan::fromMSecs(span);
+    return SystemTime::epoch() + Duration::fromMSecs(span);
 }
 
 Res<Rc<Sys::Fd>> createIn() {