Fix bug

fantasy-peak · May 21, 2024 · c61bd57 · c61bd57
1 parent a7a53f5
commit c61bd57
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 61 deletions.
diff --git a/.github/workflows/ubuntu-gcc13.yaml b/.github/workflows/ubuntu-gcc13.yaml
@@ -1,4 +1,4 @@
-name: ubuntu-gcc13
+name: ubuntu-gcc14
 
 on:
   push:
@@ -18,7 +18,7 @@ jobs:
       - name: Installation
         run: |
           sudo apt-get update
-          sudo apt-get install -y valgrind libgl1-mesa-dev libglu1-mesa-dev p7zip gobjc g++-13 wget sudo
+          sudo apt-get install -y valgrind libgl1-mesa-dev libglu1-mesa-dev p7zip gobjc g++-14 wget sudo
 
       - uses: xmake-io/github-action-setup-xmake@v1
         with:
@@ -29,9 +29,9 @@ jobs:
       - name: build
         run: |
           export XMAKE_ROOT="y"
-          g++-13 -v
-          export CXX=g++-13
-          export CC=gcc-13
+          g++-14 -v
+          export CXX=g++-14
+          export CC=gcc-14
           xmake build -y
           xmake install -o .
 

diff --git a/README.md b/README.md
@@ -136,4 +136,3 @@ Stream:
 
 ## Contact
 * **Issue** - You are very welcome to post questions to [issues](https://github.com/fantasy-peak/frpc/issues) list.
-
diff --git a/out/bi_web/include/fantasy.hpp b/out/bi_web/include/fantasy.hpp
@@ -114,7 +114,7 @@ class HelloWorldClient final {
         frpc::DateTime date_time,
         std::function<
             void(std::string, Info, uint64_t, std::optional<std::string>)> cb) {
-        auto req_id = m_req_id.fetch_add(1);
+        auto req_id = frpc::createUuid();
         auto snd_bufs =
             makeRequestPacket<HelloWorldClientHelloWorldServer::hello_world>(
                 req_id,
@@ -140,7 +140,7 @@ class HelloWorldClient final {
             void(std::string, Info, uint64_t, std::optional<std::string>)> cb,
         const std::chrono::milliseconds& timeout,
         std::function<void()> timeout_cb) {
-        auto req_id = m_req_id.fetch_add(1);
+        auto req_id = frpc::createUuid();
         auto snd_bufs =
             makeRequestPacket<HelloWorldClientHelloWorldServer::hello_world>(
                 req_id,
@@ -393,7 +393,8 @@ class HelloWorldClient final {
 
   private:
     template <HelloWorldClientHelloWorldServer type, typename T>
-    std::vector<zmq::message_t> makeRequestPacket(uint64_t req_id, T&& t) {
+    std::vector<zmq::message_t> makeRequestPacket(const std::string& req_id,
+                                                  T&& t) {
         auto header = std::make_tuple(req_id, type);
         auto buffer = frpc::pack<decltype(header)>(header);
         auto packet = frpc::pack<T>(std::forward<T>(t));
@@ -404,7 +405,7 @@ class HelloWorldClient final {
         return snd_bufs;
     }
 
-    void callTimeoutCallback(uint64_t req_id) {
+    void callTimeoutCallback(const std::string& req_id) {
         std::unique_lock lk(m_mtx);
         if (m_timeout_cb.find(req_id) == m_timeout_cb.end())
             return;
@@ -422,7 +423,7 @@ class HelloWorldClient final {
         }
         try {
             using FrpcHeader =
-                std::tuple<uint64_t, HelloWorldClientHelloWorldServer>;
+                std::tuple<std::string, HelloWorldClientHelloWorldServer>;
             auto [req_id, req_type] =
                 frpc::unpack<FrpcHeader>(recv_bufs[0].data(),
                                          recv_bufs[0].size());
@@ -467,9 +468,8 @@ class HelloWorldClient final {
     std::unique_ptr<frpc::BiChannel> m_channel;
     std::function<void(std::string)> m_error;
     std::mutex m_mtx;
-    std::unordered_map<uint64_t, std::any> m_cb;
-    std::unordered_map<uint64_t, std::function<void()>> m_timeout_cb;
-    std::atomic_uint64_t m_req_id{0};
+    std::unordered_map<std::string, std::any> m_cb;
+    std::unordered_map<std::string, std::function<void()>> m_timeout_cb;
 };
 
 struct HelloWorldServerHandler {
@@ -663,7 +663,7 @@ class HelloWorldServer final {
         }
         try {
             using FrpcHeader =
-                std::tuple<uint64_t, HelloWorldClientHelloWorldServer>;
+                std::tuple<std::string, HelloWorldClientHelloWorldServer>;
             [[maybe_unused]] auto [req_id, req_type] =
                 frpc::unpack<FrpcHeader>(recv_bufs[1].data(),
                                          recv_bufs[1].size());
@@ -1304,7 +1304,7 @@ class StreamClient final {
     }
 
     auto hello_world() {
-        auto req_id = m_req_id.fetch_add(1);
+        auto req_id = frpc::createUuid();
         auto header =
             std::make_tuple(req_id, StreamClientStreamServer::hello_world);
 
@@ -1383,7 +1383,7 @@ class StreamClient final {
         }
         try {
             using FrpcHeader =
-                std::tuple<uint64_t, StreamClientStreamServer, bool>;
+                std::tuple<std::string, StreamClientStreamServer, bool>;
             auto [req_id, req_type, is_close] =
                 frpc::unpack<FrpcHeader>(recv_bufs[0].data(),
                                          recv_bufs[0].size());
@@ -1424,9 +1424,8 @@ class StreamClient final {
     std::unique_ptr<frpc::BiChannel> m_channel;
     std::function<void(std::string)> m_error;
     std::mutex m_mtx;
-    std::unordered_map<uint64_t, std::any> m_cb;
-    std::unordered_map<uint64_t, std::function<void()>> m_close_cb;
-    std::atomic_uint64_t m_req_id{0};
+    std::unordered_map<std::string, std::any> m_cb;
+    std::unordered_map<std::string, std::function<void()>> m_close_cb;
     std::unique_ptr<frpc::ContextPool> m_pool_ptr;
 };
 
@@ -1570,7 +1569,8 @@ class StreamServer final {
             return;
         }
         try {
-            using FrpcHeader = std::tuple<uint64_t, StreamClientStreamServer>;
+            using FrpcHeader =
+                std::tuple<std::string, StreamClientStreamServer>;
             auto [req_id, req_type] =
                 frpc::unpack<FrpcHeader>(recv_bufs[1].data(),
                                          recv_bufs[1].size());
@@ -1696,7 +1696,7 @@ class StreamServer final {
     std::unique_ptr<frpc::BiChannel> m_channel;
     std::mutex m_mtx;
     std::unique_ptr<frpc::ContextPool> m_pool_ptr;
-    std::unordered_map<uint64_t, std::any> m_channel_mapping;
+    std::unordered_map<std::string, std::any> m_channel_mapping;
 };
 
 #endif

diff --git a/out/bi_web/include/impl/utils.h b/out/bi_web/include/impl/utils.h
@@ -65,12 +65,16 @@ struct ChannelConfig {
     std::size_t channel_size{50000};
 };
 
-inline std::string uniqueAddr() {
+inline std::string createUuid() {
     uuid_t uuid;
     char s[37];
     uuid_generate_random(uuid);
     uuid_unparse(uuid, s);
-    return "inproc://" + std::string(s);
+    return std::string(s);
+}
+
+inline std::string uniqueAddr() {
+    return "inproc://" + createUuid();
 }
 
 template <typename>

diff --git a/out/include/fantasy.hpp b/out/include/fantasy.hpp
@@ -114,7 +114,7 @@ class HelloWorldClient final {
         frpc::DateTime date_time,
         std::function<
             void(std::string, Info, uint64_t, std::optional<std::string>)> cb) {
-        auto req_id = m_req_id.fetch_add(1);
+        auto req_id = frpc::createUuid();
         auto snd_bufs =
             makeRequestPacket<HelloWorldClientHelloWorldServer::hello_world>(
                 req_id,
@@ -140,7 +140,7 @@ class HelloWorldClient final {
             void(std::string, Info, uint64_t, std::optional<std::string>)> cb,
         const std::chrono::milliseconds& timeout,
         std::function<void()> timeout_cb) {
-        auto req_id = m_req_id.fetch_add(1);
+        auto req_id = frpc::createUuid();
         auto snd_bufs =
             makeRequestPacket<HelloWorldClientHelloWorldServer::hello_world>(
                 req_id,
@@ -393,7 +393,8 @@ class HelloWorldClient final {
 
   private:
     template <HelloWorldClientHelloWorldServer type, typename T>
-    std::vector<zmq::message_t> makeRequestPacket(uint64_t req_id, T&& t) {
+    std::vector<zmq::message_t> makeRequestPacket(const std::string& req_id,
+                                                  T&& t) {
         auto header = std::make_tuple(req_id, type);
         auto buffer = frpc::pack<decltype(header)>(header);
         auto packet = frpc::pack<T>(std::forward<T>(t));
@@ -404,7 +405,7 @@ class HelloWorldClient final {
         return snd_bufs;
     }
 
-    void callTimeoutCallback(uint64_t req_id) {
+    void callTimeoutCallback(const std::string& req_id) {
         std::unique_lock lk(m_mtx);
         if (m_timeout_cb.find(req_id) == m_timeout_cb.end())
             return;
@@ -422,7 +423,7 @@ class HelloWorldClient final {
         }
         try {
             using FrpcHeader =
-                std::tuple<uint64_t, HelloWorldClientHelloWorldServer>;
+                std::tuple<std::string, HelloWorldClientHelloWorldServer>;
             auto [req_id, req_type] =
                 frpc::unpack<FrpcHeader>(recv_bufs[0].data(),
                                          recv_bufs[0].size());
@@ -467,9 +468,8 @@ class HelloWorldClient final {
     std::unique_ptr<frpc::BiChannel> m_channel;
     std::function<void(std::string)> m_error;
     std::mutex m_mtx;
-    std::unordered_map<uint64_t, std::any> m_cb;
-    std::unordered_map<uint64_t, std::function<void()>> m_timeout_cb;
-    std::atomic_uint64_t m_req_id{0};
+    std::unordered_map<std::string, std::any> m_cb;
+    std::unordered_map<std::string, std::function<void()>> m_timeout_cb;
 };
 
 struct HelloWorldServerHandler {
@@ -663,7 +663,7 @@ class HelloWorldServer final {
         }
         try {
             using FrpcHeader =
-                std::tuple<uint64_t, HelloWorldClientHelloWorldServer>;
+                std::tuple<std::string, HelloWorldClientHelloWorldServer>;
             [[maybe_unused]] auto [req_id, req_type] =
                 frpc::unpack<FrpcHeader>(recv_bufs[1].data(),
                                          recv_bufs[1].size());
@@ -1304,7 +1304,7 @@ class StreamClient final {
     }
 
     auto hello_world() {
-        auto req_id = m_req_id.fetch_add(1);
+        auto req_id = frpc::createUuid();
         auto header =
             std::make_tuple(req_id, StreamClientStreamServer::hello_world);
 
@@ -1383,7 +1383,7 @@ class StreamClient final {
         }
         try {
             using FrpcHeader =
-                std::tuple<uint64_t, StreamClientStreamServer, bool>;
+                std::tuple<std::string, StreamClientStreamServer, bool>;
             auto [req_id, req_type, is_close] =
                 frpc::unpack<FrpcHeader>(recv_bufs[0].data(),
                                          recv_bufs[0].size());
@@ -1424,9 +1424,8 @@ class StreamClient final {
     std::unique_ptr<frpc::BiChannel> m_channel;
     std::function<void(std::string)> m_error;
     std::mutex m_mtx;
-    std::unordered_map<uint64_t, std::any> m_cb;
-    std::unordered_map<uint64_t, std::function<void()>> m_close_cb;
-    std::atomic_uint64_t m_req_id{0};
+    std::unordered_map<std::string, std::any> m_cb;
+    std::unordered_map<std::string, std::function<void()>> m_close_cb;
     std::unique_ptr<frpc::ContextPool> m_pool_ptr;
 };
 
@@ -1570,7 +1569,8 @@ class StreamServer final {
             return;
         }
         try {
-            using FrpcHeader = std::tuple<uint64_t, StreamClientStreamServer>;
+            using FrpcHeader =
+                std::tuple<std::string, StreamClientStreamServer>;
             auto [req_id, req_type] =
                 frpc::unpack<FrpcHeader>(recv_bufs[1].data(),
                                          recv_bufs[1].size());
@@ -1696,7 +1696,7 @@ class StreamServer final {
     std::unique_ptr<frpc::BiChannel> m_channel;
     std::mutex m_mtx;
     std::unique_ptr<frpc::ContextPool> m_pool_ptr;
-    std::unordered_map<uint64_t, std::any> m_channel_mapping;
+    std::unordered_map<std::string, std::any> m_channel_mapping;
 };
 
 #endif

diff --git a/out/include/impl/utils.h b/out/include/impl/utils.h
@@ -65,12 +65,16 @@ struct ChannelConfig {
     std::size_t channel_size{50000};
 };
 
-inline std::string uniqueAddr() {
+inline std::string createUuid() {
     uuid_t uuid;
     char s[37];
     uuid_generate_random(uuid);
     uuid_unparse(uuid, s);
-    return "inproc://" + std::string(s);
+    return std::string(s);
+}
+
+inline std::string uniqueAddr() {
+    return "inproc://" + createUuid();
 }
 
 template <typename>

diff --git a/template/cpp/bi.inja b/template/cpp/bi.inja
@@ -54,7 +54,7 @@ public:
     {% for func in value.definitions %}
 
         void {{func.func_name}}({{_format_args(func.inputs)}}, std::function<void({{_format_args_type(func.outputs)}})> cb) {
-            auto req_id = m_req_id.fetch_add(1);
+            auto req_id = frpc::createUuid();
             auto snd_bufs = makeRequestPacket<{{value.caller}}{{value.callee}}::{{func.func_name}}>(
                 req_id,
                 std::make_tuple({{_format_args_name_and_move(func.inputs)}}));
@@ -69,7 +69,7 @@ public:
             std::function<void({{_format_args_type(func.outputs)}})> cb,
             const std::chrono::milliseconds& timeout,
             std::function<void()> timeout_cb) {
-            auto req_id = m_req_id.fetch_add(1);
+            auto req_id = frpc::createUuid();
             auto snd_bufs = makeRequestPacket<{{value.caller}}{{value.callee}}::{{func.func_name}}>(
                 req_id,
                 std::make_tuple({{_format_args_name_and_move(func.inputs)}}));
@@ -176,7 +176,7 @@ public:
 
 private:
     template <{{value.caller}}{{value.callee}} type, typename T>
-    std::vector<zmq::message_t> makeRequestPacket(uint64_t req_id, T&& t) {
+    std::vector<zmq::message_t> makeRequestPacket(const std::string& req_id, T&& t) {
         auto header = std::make_tuple(req_id, type);
         auto buffer = frpc::pack<decltype(header)>(header);
         auto packet = frpc::pack<T>(std::forward<T>(t));
@@ -187,7 +187,7 @@ private:
         return snd_bufs;
     }
 
-    void callTimeoutCallback(uint64_t req_id) {
+    void callTimeoutCallback(const std::string& req_id) {
         std::unique_lock lk(m_mtx);
         if (m_timeout_cb.find(req_id) == m_timeout_cb.end())
             return;
@@ -204,7 +204,7 @@ private:
             return;
         }
         try {
-            using FrpcHeader = std::tuple<uint64_t, {{value.caller}}{{value.callee}}>;
+            using FrpcHeader = std::tuple<std::string, {{value.caller}}{{value.callee}}>;
             auto [req_id, req_type] = frpc::unpack<FrpcHeader>(recv_bufs[0].data(), recv_bufs[0].size());
             std::unique_lock lk(m_mtx);
             if (m_cb.find(req_id) == m_cb.end())
@@ -237,10 +237,9 @@ private:
     std::unique_ptr<frpc::BiChannel> m_channel;
     std::function<void(std::string)> m_error;
     std::mutex m_mtx;
-    std::unordered_map<uint64_t, std::any> m_cb;
-    std::unordered_map<uint64_t, std::function<void()>> m_timeout_cb;
-    std::atomic_uint64_t m_req_id{0};
-}; 
+    std::unordered_map<std::string, std::any> m_cb;
+    std::unordered_map<std::string, std::function<void()>> m_timeout_cb;
+};
 
 struct {{value.callee}}Handler {
     {% for func in value.definitions %}
@@ -372,7 +371,7 @@ private:
             return;
         }
         try {
-            using FrpcHeader = std::tuple<uint64_t, {{value.caller}}{{value.callee}}>;
+            using FrpcHeader = std::tuple<std::string, {{value.caller}}{{value.callee}}>;
             [[maybe_unused]] auto [req_id, req_type] = frpc::unpack<FrpcHeader>(recv_bufs[1].data(), recv_bufs[1].size());
             switch(req_type) {
             {% for func in value.definitions %}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -136,4 +136,3 @@ Stream:

		## Contact
		* Issue - You are very welcome to post questions to [issues](https://github.com/fantasy-peak/frpc/issues) list.