ecalc mutex protection corrected (#1402)

eclipse-ecal · Mar 1, 2024 · 490e4f2 · 490e4f2
1 parent 5397da4
commit 490e4f2
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/ecal/core/src/ecalc.cpp b/ecal/core/src/ecalc.cpp
@@ -534,10 +534,10 @@ extern "C"
 /////////////////////////////////////////////////////////
 // Publisher
 /////////////////////////////////////////////////////////
-static std::recursive_mutex g_pub_callback_mtx;
+static std::recursive_mutex g_pub_event_callback_mtx;
 static void g_pub_event_callback(const char* topic_name_, const struct eCAL::SPubEventCallbackData* data_, const PubEventCallbackCT callback_, void* par_)
 {
-  const std::lock_guard<std::recursive_mutex> lock(g_pub_callback_mtx);
+  const std::lock_guard<std::recursive_mutex> lock(g_pub_event_callback_mtx);
   SPubEventCallbackDataC data;
   data.type      = data_->type;
   data.time      = data_->time;
@@ -747,10 +747,10 @@ extern "C"
 /////////////////////////////////////////////////////////
 // Subscriber
 /////////////////////////////////////////////////////////
-static std::recursive_mutex g_sub_callback_mtx;
+static std::recursive_mutex g_sub_receive_callback_mtx;
 static void g_sub_receive_callback(const char* topic_name_, const struct eCAL::SReceiveCallbackData* data_, const ReceiveCallbackCT callback_, void* par_)
 {
-  const std::lock_guard<std::recursive_mutex> lock(g_sub_callback_mtx);
+  const std::lock_guard<std::recursive_mutex> lock(g_sub_receive_callback_mtx);
   SReceiveCallbackDataC data;
   data.buf   = data_->buf;
   data.size  = data_->size;
@@ -760,9 +760,10 @@ static void g_sub_receive_callback(const char* topic_name_, const struct eCAL::S
   callback_(topic_name_, &data, par_);
 }
 
+static std::recursive_mutex g_sub_event_callback_mtx;
 static void g_sub_event_callback(const char* topic_name_, const struct eCAL::SSubEventCallbackData* data_, const SubEventCallbackCT callback_, void* par_)
 {
-  const std::lock_guard<std::recursive_mutex> lock(g_sub_callback_mtx);
+  const std::lock_guard<std::recursive_mutex> lock(g_sub_event_callback_mtx);
   SSubEventCallbackDataC data;
   data.type      = data_->type;
   data.time      = data_->time;
@@ -1195,10 +1196,10 @@ extern "C"
 /////////////////////////////////////////////////////////
 extern "C"
 {
-  static std::recursive_mutex g_request_callback_mtx;
+  static std::recursive_mutex g_method_callback_mtx;
   static int g_method_callback(const std::string& method_, const std::string& req_type_, const std::string& resp_type_, const std::string& request_, std::string& response_, MethodCallbackCT callback_, void* par_)
   {
-    const std::lock_guard<std::recursive_mutex> lock(g_request_callback_mtx);
+    const std::lock_guard<std::recursive_mutex> lock(g_method_callback_mtx);
     void* response(nullptr);
     int   response_len(ECAL_ALLOCATE_4ME);
     const int ret_state = callback_(method_.c_str(), req_type_.c_str(), resp_type_.c_str(), request_.c_str(), static_cast<int>(request_.size()), &response, &response_len, par_);
@@ -1209,9 +1210,10 @@ extern "C"
     return ret_state;
   }
 
+  static std::recursive_mutex g_server_event_callback_mtx;
   static void g_server_event_callback(const char* name_, const struct eCAL::SServerEventCallbackData* data_, const ServerEventCallbackCT callback_, void* par_)
   {
-    const std::lock_guard<std::recursive_mutex> lock(g_sub_callback_mtx);
+    const std::lock_guard<std::recursive_mutex> lock(g_server_event_callback_mtx);
     SServerEventCallbackDataC data;
     data.time = data_->time;
     data.type = data_->type;
@@ -1315,9 +1317,10 @@ extern "C"
     callback_(&service_response, par_);
   }
 
+  static std::recursive_mutex g_client_event_callback_mtx;
   static void g_client_event_callback(const char* name_, const struct eCAL::SClientEventCallbackData* data_, const ClientEventCallbackCT callback_, void* par_)
   {
-    const std::lock_guard<std::recursive_mutex> lock(g_sub_callback_mtx);
+    const std::lock_guard<std::recursive_mutex> lock(g_client_event_callback_mtx);
     SClientEventCallbackDataC data;
     data.time = data_->time;
     data.type = data_->type;