change lifecycle of handle, not auto detach the handdle.

levalup · Jul 23, 2024 · 015e982 · 015e982
1 parent 33cc07a
commit 015e982
Show file tree

Hide file tree

Showing 29 changed files with 288 additions and 199 deletions.
diff --git a/docs/lifecycle.md b/docs/lifecycle.md
@@ -15,10 +15,10 @@ stateDiagram-v2
     direction LR
 
     [*] --> Suspend
-    Suspend --> Running : run
-    Suspend --> [*] : close
+    Suspend --> Running: run
+    Suspend --> [*]: close
     Running --> Suspend
-    Running --> [*] : close
+    Running --> [*]: close
 
     classDef attached color:#67C23A;
     classDef detached stroke:red,color:#F56C6C;
@@ -47,9 +47,9 @@ stateDiagram-v2
     direction LR
 
     [*] --> Hanging
-    Hanging --> Waiting : request
-    Waiting --> Dealing : response
-    Dealing --> Waiting : request
+    Hanging --> Waiting: request
+    Waiting --> Dealing: response
+    Dealing --> Waiting: request
     Dealing --> Hanging
 
     classDef attached color:#67C23A;
@@ -73,18 +73,21 @@ However, it should be noted that `request` operations can only be performed in t
 
 ## Handle
 
+> In the new version, the strategy for the lifecycle has been modified, and it no longer automatically "detaches".
+> An explicit "detach" interface is provided, allowing the status to be explicitly adjusted to "detach" when needed.
+
 Following is the life states of `handle`.
 
 ```mermaid
 stateDiagram-v2
     direction LR
 
-    [*] --> Allocated : set_data
-    Allocated --> Suspend : init
-    Suspend --> Running : start
-    Suspend --> [*] : close
+    [*] --> Allocated: set_data
+    Allocated --> Suspend: init
+    Suspend --> Running: start
+    Suspend --> [*]: close
     Running --> Suspend: stop
-    Running --> [*] : close
+    Running --> [*]: close
 
     classDef attached color:#67C23A;
     classDef detached stroke:red,color:#F56C6C;

diff --git a/examples/fs_event.cpp b/examples/fs_event.cpp
@@ -28,7 +28,7 @@ int main() {
     });
 
     // close fs_event
-    uv::timer_t().start(2 * 1000, 1).call([&]() {
+    uv::timer_t().start(2 * 1000, 1).detach().call([&]() {
         fs_event.close(nullptr);
         throw uvcxx::close_handle();
     });

diff --git a/examples/idle.cpp b/examples/idle.cpp
@@ -8,7 +8,7 @@
 int main() {
     uv::loop_t loop;
     int64_t counter = 0;
-    uv::idle_t(loop).start().call([&]() {
+    uv::idle_t(loop).start().detach().call([&]() {
         counter++;
         if (counter >= 1000) {
             throw uvcxx::close_handle();
@@ -19,4 +19,4 @@ int main() {
     loop.run();
 
     return 0;
-}
+}
diff --git a/examples/pipe.cpp b/examples/pipe.cpp
@@ -25,15 +25,15 @@ int main() {
         uv::pipe_t server(server_loop, false);
         server.bind(pipe_name);
 
-        server.listen(128).call([=]() mutable {
+        server.listen(128).detach().call([=]() mutable {
             auto conn = server.accept(false);
 
             uv::buf_t server_buf;
             conn.alloc().call([=](size_t size, uv_buf_t *buf) mutable {
                 server_buf.resize(size);
                 *buf = server_buf;
             });
-            conn.read_start().call([=](ssize_t nread, const uv_buf_t *buf) mutable {
+            conn.read_start().detach().call([=](ssize_t nread, const uv_buf_t *buf) mutable {
                 std::cout << "server read: " << std::string(buf->base, nread) << std::endl;
             }).except<uvcxx::E_AGAIN>([]() {
             }).except<uvcxx::E_EOF>([=]() mutable {
@@ -49,7 +49,7 @@ int main() {
         });
 
         std::cout << "[INFO] stop server after " << server_time_ms << "ms" << std::endl;
-        uv::timer_t(server_loop).start(server_time_ms, 1).call([=]() mutable {
+        uv::timer_t(server_loop).start(server_time_ms, 1).detach().call([=]() mutable {
             server.close(nullptr);
             throw uvcxx::close_handle();    // close timer
         });
@@ -60,7 +60,7 @@ int main() {
         auto msg = uvcxx::catstr("hello~", i);
 
         uv::pipe_t client(client_loop, false);
-        client.connect(pipe_name).then([=]() mutable {
+        client.connect(pipe_name).detach().then([=]() mutable {
             client.write(msg).then([=]() {
                 std::cout << "client write: " << msg << std::endl;
             });

diff --git a/examples/signal.cpp b/examples/signal.cpp
@@ -51,7 +51,7 @@ int main(int argc, const char *argv[]) {
     {
         // start backend
         uv::signal_t signal(loop);
-        signal.start(sig).call([key, &count](int) mutable {
+        signal.start(sig).detach().call([key, &count](int) mutable {
             ++count;
             std::cout << "Received " << key << " " << count << std::endl;
             throw uvcxx::close_handle();
@@ -61,9 +61,12 @@ int main(int argc, const char *argv[]) {
     uvcxx_assert(loop_handle_count(loop) == 0, "count = ", loop_handle_count(loop));
     // start oneshot
     {
-        uv::signal_t(loop).start_oneshot(sig).then([key, &count](int) mutable {
+        uv::signal_t signal(loop);
+        signal.start_oneshot(sig).detach().then([key, &count](int) mutable {
             ++count;
             std::cout << "Received " << key << " " << count << std::endl;
+        }).finally([signal]() mutable {
+            signal.close(nullptr);
         });
     }
     loop.run();

diff --git a/examples/tcp.cpp b/examples/tcp.cpp
@@ -49,7 +49,7 @@ int main() {
 
         std::cout << "[INFO] server start listen: " << server_sock << std::endl;
 
-        server.listen(128).call([=]() mutable {
+        server.listen(128).detach().call([=]() mutable {
             auto conn = server.accept(false);
 
             std::cout << "[INFO] received [" << getsockname(conn) << " <- " << getpeername(conn) << "]" << std::endl;
@@ -59,7 +59,7 @@ int main() {
                 server_buf.resize(size);
                 *buf = server_buf;
             });
-            conn.read_start().call([=](ssize_t nread, const uv_buf_t *buf) mutable {
+            conn.read_start().detach().call([=](ssize_t nread, const uv_buf_t *buf) mutable {
                 std::cout << "server read: " << std::string(buf->base, nread) << std::endl;
             }).except<uvcxx::E_AGAIN>([]() {
             }).except<uvcxx::E_EOF>([=]() mutable {
@@ -73,7 +73,7 @@ int main() {
         });
 
         std::cout << "[INFO] stop server after " << server_time_ms << "ms" << std::endl;
-        uv::timer_t(server_loop).start(server_time_ms, 1).call([=]() mutable {
+        uv::timer_t(server_loop).start(server_time_ms, 1).detach().call([=]() mutable {
             server.close(nullptr);
             throw uvcxx::close_handle();    // close timer
         });
@@ -86,7 +86,7 @@ int main() {
         auto msg = uvcxx::catstr("hello~", i);
 
         uv::tcp_t client(client_loop, false);
-        client.connect(addr).then([=]() mutable {
+        client.connect(addr).detach().then([=]() mutable {
             client.write(msg).then([=]() {
                 std::cout << "client write: " << msg << std::endl;
             });

diff --git a/examples/timer.cpp b/examples/timer.cpp
@@ -6,7 +6,7 @@
 #include <uvcxx.h>
 
 int main() {
-    uv::timer_t().start(1000, 1000).call([]() {
+    uv::timer_t().start(1000, 1000).detach().call([]() {
         std::cout << "Hello~~~" << std::endl;
         throw uvcxx::close_handle();
     });

diff --git a/examples/udp.cpp b/examples/udp.cpp
@@ -48,7 +48,7 @@ int main() {
             server_buf.resize(size);
             *buf = server_buf;
         });
-        server.recv_start().call(
+        server.recv_start().detach().call(
                 [=](ssize_t nread, const uv_buf_t *buf, const sockaddr *addr, uv_udp_flags flags) mutable {
                     std::cout << "server read: " << std::string(buf->base, nread) << " with "
                               << uvcxx::to_string(uv_udp_flags(flags)) << " from " << uvcxx::any_address_t(addr)
@@ -60,7 +60,7 @@ int main() {
         });
 
         std::cout << "[INFO] stop server after " << server_time_ms << "ms" << std::endl;
-        uv::timer_t(server_loop).start(server_time_ms, 1).call([=]() mutable {
+        uv::timer_t(server_loop).start(server_time_ms, 1).detach().call([=]() mutable {
             server.close(nullptr);
             throw uvcxx::close_handle();    // close timer
         });
@@ -73,7 +73,7 @@ int main() {
         auto msg = uvcxx::catstr("hello~", i);
 
         uv::udp_t client(client_loop, false);
-        client.send(msg, addr).then([=]() {
+        client.send(msg, addr).detach().then([=]() {
             std::cout << "client write: " << msg << std::endl;
         }).finally([=]() mutable {
             client.close(nullptr);

diff --git a/include/uvcxx.h b/include/uvcxx.h
@@ -8,6 +8,8 @@
 
 #include "uvcxx/utils/apply.h"
 #include "uvcxx/utils/assert.h"
+#include "uvcxx/utils/attached_callback.h"
+#include "uvcxx/utils/attached_promise.h"
 #include "uvcxx/utils/callback.h"
 #include "uvcxx/utils/defer.h"
 #include "uvcxx/utils/detach.h"

diff --git a/include/uvcxx/async.h b/include/uvcxx/async.h
@@ -16,7 +16,11 @@ namespace uv {
 
         async_t() {
             set_data(new data_t(*this));    //< data will be deleted in close action
-            _attach_data_();
+        }
+
+        self &detach() {
+            _detach_();
+            return *this;
         }
 
         UVCXX_NODISCARD
@@ -25,14 +29,14 @@ namespace uv {
         }
 
         UVCXX_NODISCARD
-        uvcxx::callback<> init(const loop_t &loop) {
+        uvcxx::attached_callback<> init(const loop_t &loop) {
             UVCXX_APPLY(uv_async_init(loop, *this, raw_callback), nullptr);
-            _detach_();
-            return callback();
+            _initialized_();
+            return {*this, callback()};
         }
 
         UVCXX_NODISCARD
-        uvcxx::callback<> init() {
+        uvcxx::attached_callback<> init() {
             return init(default_loop());
         }
 

diff --git a/include/uvcxx/check.h b/include/uvcxx/check.h
@@ -19,7 +19,12 @@ namespace uv {
         explicit check_t(const loop_t &loop) {
             set_data(new data_t(*this));    //< data will be deleted in close action
             (void) uv_check_init(loop, *this);
-            _attach_close_();
+            _initialized_();
+        }
+
+        self &detach() {
+            _detach_();
+            return *this;
         }
 
         UVCXX_NODISCARD
@@ -28,15 +33,13 @@ namespace uv {
         }
 
         UVCXX_NODISCARD
-        uvcxx::callback<> start() {
+        uvcxx::attached_callback<> start() {
             UVCXX_APPLY(uv_check_start(*this, raw_callback), nullptr);
-            _detach_();
-            return callback();
+            return {*this, callback()};
         }
 
         void stop() {
             (void) uv_check_stop(*this);
-            _attach_close_();
         }
 
     private:

diff --git a/include/uvcxx/fs_event.h b/include/uvcxx/fs_event.h
@@ -25,7 +25,12 @@ namespace uv {
 #endif
             set_data(new data_t(*this));    //< data will be deleted in close action
             (void) uv_fs_event_init(loop, *this);
-            _attach_close_();
+            _initialized_();
+        }
+
+        self &detach() {
+            _detach_();
+            return *this;
         }
 
         UVCXX_NODISCARD
@@ -34,15 +39,13 @@ namespace uv {
         }
 
         UVCXX_NODISCARD
-        uvcxx::callback<const char *, uv_fs_event> start(uvcxx::string path, int flags) {
+        uvcxx::attached_callback<const char *, uv_fs_event> start(uvcxx::string path, int flags) {
             UVCXX_APPLY(uv_fs_event_start(*this, raw_callback, path, flags), nullptr);
-            _detach_();
-            return callback();
+            return {*this, callback()};
         }
 
         void stop() {
             (void) uv_fs_event_stop(*this);
-            _attach_close_();
         }
 
         int getpath(char *buffer, size_t *size) {

diff --git a/include/uvcxx/fs_poll.h b/include/uvcxx/fs_poll.h
@@ -22,7 +22,12 @@ namespace uv {
         explicit fs_poll_t(const loop_t &loop) {
             set_data(new data_t(*this));    //< data will be deleted in close action
             (void) uv_fs_poll_init(loop, *this);
-            _attach_close_();
+            _initialized_();
+        }
+
+        self &detach() {
+            _detach_();
+            return *this;
         }
 
         UVCXX_NODISCARD
@@ -31,15 +36,13 @@ namespace uv {
         }
 
         UVCXX_NODISCARD
-        uvcxx::callback<const uv_stat_t *, const uv_stat_t *> start(uvcxx::string path, unsigned int interval) {
+        uvcxx::attached_callback<const uv_stat_t *, const uv_stat_t *> start(uvcxx::string path, unsigned int interval) {
             UVCXX_APPLY(uv_fs_poll_start(*this, raw_callback, path, interval), nullptr);
-            _detach_();
-            return callback();
+            return {*this, callback()};
         }
 
         void stop() {
             (void) uv_fs_poll_stop(*this);
-            _attach_close_();
         }
 
         int getpath(char *buffer, size_t *size) const {