wip

Author: sleepy-monax

src/apps/hideo-shell/cursor.path

@@ -0,0 +1 @@
+"M13.1 14.9 1.4 3.1 1.4 20 5 16.2 8.3 23.8 11 22.6 7.7 15Z"

src/libs/karm-async/async.cpp

@@ -119,8 +119,11 @@ Res<> Loop::run() {
         if (_sources.len() == 0)
             return Ok();
 
-        if (_ret)
+        if (_ret) {
+            auto ret = *_ret;
+            _ret = NONE;
             return *_ret;
+        }
 
         try$(wait(until));
     }

src/libs/karm-ipc/ipc.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <karm-async/funcs.h>
+#include <karm-base/func.h>
 #include <karm-main/base.h>
 #include <karm-sys/url.h>
 
@@ -25,8 +25,17 @@ struct Invoker<MID, Ret(Args...)> {
 };
 
 struct Transport {
-    template <typename I, u64 MID, typename F, typename... Args>
-    Meta::Ret<F> invoke(Args... args) {
+    template <typename IFace, auto *NAME, auto UID, typename F>
+    struct Method {
+        using _IFace = IFace;
+        static constexpr auto _NAME = NAME;
+        static constexpr auto _UID = UID;
+        using _Func = F;
+        using _Ret = Meta::Ret<F>;
+    };
+
+    template <typename Method, typename... Args>
+    Meta::Ret<typename Method::_Ret, Args...> invoke(Args &&...args) {
         Invoker<MID, F> invoker;
     }
 };
@@ -49,7 +58,7 @@ static inline Async::Task<Res<Strong<I>>> open(Sys::Url) {
 using Srv = Func<AsyncRes<Strong<Object>>(Ctx &ctx)>;
 
 static inline AsyncRes<> runSrv(Ctx &, Srv srv) {
-    co_return Async::run();
+    co_return Async::loop().run();
 }
 
 } // namespace Karm::Ipc

src/libs/karm-meta/callable.h

@@ -27,7 +27,7 @@ using Ret = decltype(Meta::declval<U>()(std::forward<Args>(Meta::declval<Args>()
 
 template <typename T, typename... Args>
 concept Callable = requires(T f) {
-                       f(declval<Args>()...);
-                   };
+    f(declval<Args>()...);
+};
 
 } // namespace Karm::Meta

src/srvs/grund-echo/api.h

@@ -12,10 +12,8 @@ Res<> loadService(Ctx &ctx, Sys::Url url) {
     auto &handover = useHandover(ctx);
     auto urlStr = try$(url.str());
     auto *elf = handover.fileByName(urlStr.buf());
-    if (not elf) {
-        logError("system: service '{}' not found", url);
-        return Error::invalidFilename();
-    }
+    if (not elf)
+        return Error::invalidFilename("service not found");
 
     logInfo("system: mapping elf...");
     auto elfVmo = try$(Hj::Vmo::create(Hj::ROOT, elf->start, elf->size, Hj::VmoFlags::DMA));
@@ -27,17 +25,13 @@ Res<> loadService(Ctx &ctx, Sys::Url url) {
 
     logInfo("system: validating elf...");
     Elf::Image image{elfRange.bytes()};
-    if (not image.valid()) {
-        logError("Invalid elf");
-        return Error::invalidInput();
-    }
+    if (not image.valid())
+        return Error::invalidInput("Invalid elf");
 
     logInfo("system: mapping the elf...");
-
     for (auto prog : image.programs()) {
-        if (prog.type() != Elf::Program::LOAD) {
+        if (prog.type() != Elf::Program::LOAD)
             continue;
-        }
 
         usize size = alignUp(max(prog.memsz(), prog.filez()), Hal::PAGE_SIZE);
         logInfo("system: mapping section: {x}-{x}", prog.vaddr(), prog.vaddr() + size);