update

xsync.cpp

@@ -10,6 +10,8 @@ Xsync &Xsync::Ins() {
 void Xsync::initialize(I_XSUDPFactory *xsync_udp_factory) { m_xsync_udp_factory = xsync_udp_factory; }
 
 xs_error_code_t Xsync::connect(string xsync_ip) {
+  lock_guard<recursive_mutex> lock(lock_);
+
   m_xsync_ip = xsync_ip;
   disConnect();
   /**
@@ -59,6 +61,8 @@ xs_error_code_t Xsync::connect(string xsync_ip) {
   return ecode;
 }
 xs_error_code_t Xsync::disConnect() {
+  lock_guard<recursive_mutex> lock(lock_);
+
   if (m_xsync_reg_udp != nullptr) {
     m_xsync_reg_udp->stopReceive();
     m_xsync_reg_udp = nullptr;
@@ -75,6 +79,7 @@ xs_error_code_t Xsync::disConnect() {
   }
 
   m_net_state = kxsync_net_state_disconnect;
+  return kxs_ec_success;
 }
 xsync_net_state_t Xsync::getNetState() { return m_net_state; }
 
@@ -82,6 +87,7 @@ void Xsync::regOnTimecodeMsg(xsync_on_timecode_msg_t on_timecode_msg_cb) { m_on_
 void Xsync::regOnCameraSyncMsg(xsync_on_camera_sync_msg_t on_camera_sync_msg_cb) { m_on_camera_sync_msg_cb = on_camera_sync_msg_cb; }
 
 xs_error_code_t Xsync::xsync_send_cmd_block(iflytop_xsync_packet_header_t *cmd, iflytop_xsync_packet_header_t *rx_data, int32_t buffersize) {
+  lock_guard<recursive_mutex> lock(lock_);
   if (!m_xsync_reg_udp) return kxs_ec_lose_connect;
   m_xsync_reg_udp->clearRxBuffer();
 

xsync.hpp

@@ -5,10 +5,12 @@
 #include <list>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <set>
 #include <sstream>
 #include <string>
 #include <vector>
+
 //
 #include "i_xsync_udp.hpp"
 #include "iflytop_xsync_protocol/iflytop_xsync_protocol.h"
@@ -58,6 +60,8 @@ class Xsync {
 
   xsync_net_state_t m_net_state = kxsync_net_state_disconnect;
 
+  std::recursive_mutex        lock_;
+
   Xsync(/* args */);
 
  public:
@@ -67,8 +71,8 @@ class Xsync {
 
   bool ping(string xsync_ip);
 
-  xs_error_code_t connect(string xsync_ip);
-  xs_error_code_t disConnect();
+  xs_error_code_t   connect(string xsync_ip);
+  xs_error_code_t   disConnect();
   xsync_net_state_t getNetState();
 
   void regOnTimecodeMsg(xsync_on_timecode_msg_t on_timecode_msg_cb);