support float type time duration

ericyonng · Nov 22, 2021 · 7caccb1 · 7caccb1
1 parent 97a347a
commit 7caccb1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/include/asyncio/event_loop.h b/include/asyncio/event_loop.h
@@ -20,28 +20,28 @@ class EventLoop: private NonCopyable {
 
 public:
     EventLoop() {
-        using namespace std::chrono;
-        auto now = system_clock::now();
+        auto now = std::chrono::system_clock::now();
         start_time_ = duration_cast<MSDuration>(now.time_since_epoch());
     }
 
     MSDuration time() {
-        using namespace std::chrono;
-        auto now = system_clock::now();
+        auto now = std::chrono::system_clock::now();
         return duration_cast<MSDuration>(now.time_since_epoch()) - start_time_;
     }
 
     bool is_stop() {
         return schedule_.empty() && ready_.empty();
     }
 
-    void call_later(MSDuration delay, Handle& callback) {
-        call_at(time() + delay, callback);
+    template<typename Rep, typename Period>
+    void call_later(std::chrono::duration<Rep, Period> delay, Handle& callback) {
+        call_at(time() + duration_cast<MSDuration>(delay), callback);
     }
 
-    void call_at(MSDuration when, Handle& callback) {
+    template<typename Rep, typename Period>
+    void call_at(std::chrono::duration<Rep, Period> when, Handle& callback) {
         callback.set_state(PromiseState::PENDING);
-        schedule_.emplace_back(std::make_pair(when, &callback));
+        schedule_.emplace_back(std::make_pair(duration_cast<MSDuration>(when), &callback));
         std::ranges::push_heap(schedule_, std::ranges::greater{}, &TimerHandle::first);
     }
 

diff --git a/include/asyncio/sleep.h b/include/asyncio/sleep.h
@@ -5,18 +5,22 @@
 #ifndef ASYNCIO_SLEEP_H
 #define ASYNCIO_SLEEP_H
 #include <asyncio/asyncio_ns.h>
+#include <asyncio/noncopyable.h>
 #include <chrono>
 ASYNCIO_NS_BEGIN
 namespace detail {
 template<typename Duration>
-struct SleepAwaiter {
+struct SleepAwaiter: private NonCopyable {
+    SleepAwaiter(Duration delay): delay_(delay) {}
     constexpr bool await_ready() noexcept { return false; }
     constexpr void await_resume() const noexcept {}
     template<typename Promise>
     void await_suspend(std::coroutine_handle<Promise> caller) const noexcept {
         auto& loop = get_event_loop();
         loop.call_later(delay_, caller.promise());
     }
+
+private:
     Duration delay_;
 };
 }

diff --git a/include/asyncio/wait_for.h b/include/asyncio/wait_for.h
@@ -6,8 +6,10 @@
 #define ASYNCIO_WAIT_FOR_H
 #include <asyncio/asyncio_ns.h>
 #include <asyncio/concept/future.h>
+#include <asyncio/awaitable_traits.h>
 #include <asyncio/schedule_task.h>
 #include <asyncio/event_loop.h>
+#include <asyncio/exception.h>
 #include <asyncio/void_value.h>
 #include <chrono>
 ASYNCIO_NS_BEGIN

diff --git a/test/ut/task_test.cpp b/test/ut/task_test.cpp
@@ -145,7 +145,7 @@ SCENARIO("test gather") {
         int r = 1;
         for (int i = 2; i <= number; ++i) {
             fmt::print("Task {}: Compute factorial({}), currently i={}...\n", name, number, i);
-            co_await asyncio::sleep(500ms);
+            co_await asyncio::sleep(0.3s);
             r *= i;
         }
         fmt::print("Task {}: factorial({}) = {}\n", name, number, r);