[INLONG-10799][SDK] Support fork child process for DataProxy CPP SDK (a…

…pache#10800)
youzhi886 · Aug 16, 2024 · 29612cd · 29612cd
1 parent 109e9ca
commit 29612cd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/src/config/sdk_conf.cc b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/src/config/sdk_conf.cc
@@ -28,8 +28,10 @@
 #include "../utils/utils.h"
 
 namespace inlong {
-SdkConfig *SdkConfig::instance_ = new SdkConfig();
-SdkConfig *SdkConfig::getInstance() { return SdkConfig::instance_; }
+SdkConfig *SdkConfig::getInstance() {
+  static SdkConfig instance;
+  return &instance;
+}
 
 bool SdkConfig::ParseConfig(const std::string &config_path) {
   // Ensure the data consistency of each sdk instance

diff --git a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/src/config/sdk_conf.h b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/src/config/sdk_conf.h
@@ -29,7 +29,6 @@
 namespace inlong {
 class SdkConfig {
 private:
-  static SdkConfig *instance_;
   std::string config_path_;
   std::mutex mutex_;
   void InitThreadParam(const rapidjson::Value &doc);
@@ -41,6 +40,7 @@ class SdkConfig {
   void InitAuthParm(const rapidjson::Value &doc);
   void OthersParam(const rapidjson::Value &doc);
   bool GetLocalIPV4Address(std::string& err_info, std::string& localhost);
+  SdkConfig() { defaultInit(); };
 
       public:
   // cache parameter
@@ -116,8 +116,6 @@ class SdkConfig {
   void defaultInit();
   static SdkConfig *getInstance();
 
-  SdkConfig() { defaultInit(); }
-
   bool ParseConfig(const std::string &config_path);
   void ShowClientConfig();
 

diff --git a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/src/manager/proxy_manager.cc b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/src/manager/proxy_manager.cc
@@ -28,17 +28,17 @@
 
 namespace inlong {
 const uint64_t MINUTE = 60000;
-ProxyManager *ProxyManager::instance_ = new ProxyManager();
 ProxyManager::~ProxyManager() {
-  if (update_conf_thread_.joinable()) {
-    update_conf_thread_.join();
-  }
-
+  LOG_INFO("~ProxyManager");
   exit_flag_ = true;
   std::unique_lock<std::mutex> con_lck(cond_mutex_);
   update_flag_ = true;
   con_lck.unlock();
   cond_.notify_one();
+
+  if (update_conf_thread_.joinable()) {
+    update_conf_thread_.join();
+  }
 }
 void ProxyManager::Init() {
   timeout_ = SdkConfig::getInstance()->manager_url_timeout_;

diff --git a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/src/manager/proxy_manager.h b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/src/manager/proxy_manager.h
@@ -29,7 +29,6 @@
 namespace inlong {
 class ProxyManager {
 private:
-  static ProxyManager *instance_;
   uint32_t timeout_;
   read_write_mutex groupid_2_cluster_id_rwmutex_;
   read_write_mutex groupid_2_proxy_map_rwmutex_;
@@ -59,7 +58,10 @@ class ProxyManager {
 public:
   ProxyManager(){};
   ~ProxyManager();
-  static ProxyManager *GetInstance() { return instance_; }
+  static ProxyManager *GetInstance() {
+    static ProxyManager instance;
+    return &instance;
+  }
   int32_t CheckBidConf(const std::string &inlong_group_id, bool is_inited);
   void Update();
   void DoUpdate();