1.12.23

fix: 修复使用StdioStream相关的示例没有initialize()的问题；
feat: 给TcpClient添加设置断连超时策略函数

Author: hevake

examples/main/03_nc_client_and_echo_server/nc_client/app.cpp

@@ -55,6 +55,8 @@ bool App::onInit(const tbox::Json &cfg)
     if (!client_->initialize(SockAddr::FromString(js_server.get<std::string>())))
         return false;
 
+    stdio_->initialize();
+
     client_->bind(stdio_);
     stdio_->bind(client_);
     return true;

examples/network/tcp_acceptor/tcp_nc_server/tcp_nc_server.cpp

@@ -62,6 +62,7 @@ int main(int argc, char **argv)
     SetScopeExitAction([sp_loop] { delete sp_loop; });
 
     StdioStream stdio(sp_loop);
+    stdio.initialize();
     stdio.enable();
 
     set<TcpConnection*> conns;

examples/network/tcp_client/tcp_hex_client/tcp_hex_client.cpp

@@ -61,6 +61,7 @@ int main(int argc, char **argv)
     SetScopeExitAction([sp_loop] { delete sp_loop; });
 
     StdioStream stdio(sp_loop);
+    stdio.initialize();
     stdio.enable();
 
     TcpClient client(sp_loop);

examples/network/tcp_client/tcp_nc_client/tcp_nc_client.cpp

@@ -61,10 +61,15 @@ int main(int argc, char **argv)
     SetScopeExitAction([sp_loop] { delete sp_loop; });
 
     StdioStream stdio(sp_loop);
+    stdio.initialize();
     stdio.enable();
 
     TcpClient client(sp_loop);
     client.initialize(bind_addr);
+    //! 设置重新延时策略，如不设置则固定延后1秒
+    client.setReconnectDelayCalcFunc(
+        [](int fail_time) { return 1 << std::min(6, fail_time - 1); }
+    );
     client.start();
 
     client.bind(&stdio);   //!< client绑定stdio

examples/network/tcp_connector/tcp_nc_client/tcp_nc_client.cpp

@@ -62,6 +62,7 @@ int main(int argc, char **argv)
     SetScopeExitAction([sp_loop] { delete sp_loop; });
 
     StdioStream stdio(sp_loop);
+    stdio.initialize();
     stdio.enable();
 
     TcpConnection *sp_curr = nullptr;

examples/network/tcp_server/tcp_nc_server/tcp_nc_server.cpp

@@ -60,6 +60,7 @@ int main(int argc, char **argv)
     SetScopeExitAction([sp_loop] { delete sp_loop; });
 
     StdioStream stdio(sp_loop);
+    stdio.initialize();
     stdio.enable();
 
     TcpServer server(sp_loop);

examples/network/uart/uart_tool/uart_tool.cpp

@@ -54,6 +54,8 @@ int main(int argc, char **argv)
         return 0;
     }
 
+    sp_stdio->initialize();
+
     //! 将终端与串口绑定到一起
     sp_stdio->bind(sp_uart);
     sp_uart->bind(sp_stdio);

examples/run/nc_client/nc_client.cpp

@@ -55,6 +55,8 @@ bool App::onInit(const tbox::Json &cfg)
     if (!client_->initialize(SockAddr::FromString(js_server.get<std::string>())))
         return false;
 
+    stdio_->initialize();
+
     client_->bind(stdio_);
     stdio_->bind(client_);
     return true;

modules/network/tcp_client.cpp

@@ -99,6 +99,11 @@ void TcpClient::setAutoReconnect(bool enable)
     d_->reconnect_enabled = enable;
 }
 
+void TcpClient::setReconnectDelayCalcFunc(const ReconnectDelayCalc &func)
+{
+    d_->sp_connector->setReconnectDelayCalcFunc(func);
+}
+
 bool TcpClient::start()
 {
     if (d_->state != State::kInited) {

modules/network/tcp_client.h

@@ -47,6 +47,7 @@ class TcpClient : public ByteStream {
 
     using ConnectedCallback    = std::function<void()>;
     using DisconnectedCallback = std::function<void()>;
+    using ReconnectDelayCalc   = std::function<int(int)>;
 
     //!< 状态
     enum class State {
@@ -61,6 +62,7 @@ class TcpClient : public ByteStream {
     void setConnectedCallback(const ConnectedCallback &cb);
     void setDisconnectedCallback(const DisconnectedCallback &cb);
     void setAutoReconnect(bool enable);
+    void setReconnectDelayCalcFunc(const ReconnectDelayCalc &func);
 
     bool start();   //!< 开始连接服务端
     void stop();    //!< 如果没有连接则成，则停止连接；否则断开连接