co/Sleep: to to event/co/

CM4all · Dec 3, 2024 · bddf879 · bddf879
1 parent b8eb9a8
commit bddf879
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 7 deletions.
diff --git a/README.rst b/README.rst
@@ -61,6 +61,7 @@ Each directory below ``src`` contains a sub-library:
 - ``adata``: data structures using our pool allocator
 - ``co``: C++20 Coroutines
 - ``event``: a non-blocking I/O event loop
+- ``event/co``: integration of C++20 Coroutines into our event loop
 - ``event/net``: non-blocking networking libraries
 - ``event/systemd``: non-blocking systemd clients
 - ``event/uring``: integration of io_uring in the event loop

diff --git a/demo/was/CoSleepMirror.cxx b/demo/was/CoSleepMirror.cxx
@@ -3,7 +3,7 @@
 // author: Max Kellermann <[email protected]>
 
 #include "was/async/CoRun.hxx"
-#include "co/Sleep.hxx"
+#include "event/co/Sleep.hxx"
 #include "event/Loop.hxx"
 #include "util/PrintException.hxx"
 #include "DefaultFifoBuffer.hxx"

diff --git a/demo/was/meson.build b/demo/was/meson.build
@@ -23,6 +23,7 @@ if coroutines_dep.found()
     include_directories: inc,
     dependencies: [
       was_server_async_dep,
+      event_co_dep,
     ],
   )
 

diff --git a/meson.build b/meson.build
@@ -154,6 +154,7 @@ subdir('src/net/log')
 
 if not get_option('fuzzer')
   subdir('src/event')
+  subdir('src/event/co')
   subdir('src/event/net')
   subdir('src/event/net/control')
   subdir('src/event/net/djb')

diff --git a/src/co/Sleep.hxx → src/event/co/Sleep.hxx b/src/co/Sleep.hxx → src/event/co/Sleep.hxx
@@ -4,12 +4,10 @@
 
 #pragma once
 
-#include "Compat.hxx"
-#include "AwaitableHelper.hxx"
+#include "co/Compat.hxx"
+#include "co/AwaitableHelper.hxx"
 #include "event/FineTimerEvent.hxx"
 
-#include <cassert>
-
 namespace Co {
 
 /**

diff --git a/src/event/co/meson.build b/src/event/co/meson.build
@@ -0,0 +1 @@
+event_co_dep = coroutines_dep
diff --git a/test/co/TestCoCache.cxx b/test/co/TestCoCache.cxx
@@ -5,7 +5,7 @@
 #include "co/Cache.hxx"
 #include "co/Task.hxx"
 #include "co/InvokeTask.hxx"
-#include "co/Sleep.hxx"
+#include "event/co/Sleep.hxx"
 #include "event/Loop.hxx"
 
 #include <gtest/gtest.h>

diff --git a/test/co/TestEagerTask.cxx b/test/co/TestEagerTask.cxx
@@ -5,7 +5,7 @@
 #include "co/Cache.hxx"
 #include "co/Task.hxx"
 #include "co/InvokeTask.hxx"
-#include "co/Sleep.hxx"
+#include "event/co/Sleep.hxx"
 #include "event/Loop.hxx"
 
 #include <gtest/gtest.h>

diff --git a/test/co/meson.build b/test/co/meson.build
@@ -13,6 +13,7 @@ test(
       gtest,
       event_dep,
       coroutines_dep,
+      event_co_dep,
     ],
   ),
 )