refactor handle

ericyonng · Jan 8, 2022 · 37cca4c · 37cca4c
1 parent 1770128
commit 37cca4c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/include/asyncio/handle.h b/include/asyncio/handle.h
@@ -21,22 +21,23 @@ using HandleId = uint64_t;
 struct Handle { // type erase for EventLoop
     Handle() noexcept: handle_id_(handle_id_generation_++) {}
     virtual void run() = 0;
+    virtual void set_state(PromiseState state) {}
+    HandleId get_handle_id() { return handle_id_; }
+    virtual ~Handle() = default;
+private:
+    HandleId handle_id_;
+    static HandleId handle_id_generation_;
+};
+
+struct CoroHandle: Handle {
     std::string frame_name() const {
         const auto& frame_info = get_frame_info();
         return fmt::format("{} at {}:{}", frame_info.function_name(),
                            frame_info.file_name(), frame_info.line());
     }
     virtual void dump_backtrace(size_t depth = 0) const {};
-    virtual void set_state(PromiseState state) {}
-    HandleId get_handle_id() { return handle_id_; }
-    virtual ~Handle() = default;
-
 private:
     virtual const std::source_location& get_frame_info() const;
-
-private:
-    HandleId handle_id_;
-    static HandleId handle_id_generation_;
 };
 
 ASYNCIO_NS_END

diff --git a/include/asyncio/task.h b/include/asyncio/task.h
@@ -76,7 +76,7 @@ struct Task: private NonCopyable {
         return Awaiter {handle_};
     }
 
-    struct promise_type: Handle, Result<R> {
+    struct promise_type: CoroHandle, Result<R> {
         promise_type() = default;
 
         template<typename... Args> // from free function
@@ -137,7 +137,7 @@ struct Task: private NonCopyable {
         // to auto delete by final awaiter
         PromiseState state_ {PromiseState::UNSCHEDULED};
         const bool wait_at_initial_suspend_ {true};
-        Handle* continuation_ {};
+        CoroHandle* continuation_ {};
         std::source_location frame_info_{};
     };
 

diff --git a/src/event_loop.cpp b/src/event_loop.cpp
@@ -68,7 +68,7 @@ void EventLoop::run_once() {
 
 HandleId Handle::handle_id_generation_ = 0;
 
-const std::source_location& Handle::get_frame_info() const {
+const std::source_location& CoroHandle::get_frame_info() const {
     static const std::source_location frame_info = std::source_location::current();
     return frame_info;
 }