Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[core] ecalc mutex protection corrected #1402

Merged
merged 1 commit into from Feb 27, 2024
Merged

[core] ecalc mutex protection corrected #1402

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 12 additions & 9 deletions ecal/core/src/ecalc.cpp
View file
Open in desktop
Expand Up @@ -485,10 +485,10 @@ extern "C"
/////////////////////////////////////////////////////////
// Publisher
/////////////////////////////////////////////////////////
static std::recursive_mutex g_pub_callback_mtx;
static std::recursive_mutex g_pub_event_callback_mtx;
KerstinKeller marked this conversation as resolved.
Show resolved Hide resolved
KerstinKeller marked this conversation as resolved.
Show resolved Hide resolved
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;
Expand Down Expand Up @@ -670,10 +670,10 @@ extern "C"
/////////////////////////////////////////////////////////
// Subscriber
/////////////////////////////////////////////////////////
static std::recursive_mutex g_sub_callback_mtx;
static std::recursive_mutex g_sub_receive_callback_mtx;
KerstinKeller marked this conversation as resolved.
Show resolved Hide resolved
KerstinKeller marked this conversation as resolved.
Show resolved Hide resolved
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;
Expand All @@ -683,9 +683,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;
KerstinKeller marked this conversation as resolved.
Show resolved Hide resolved
KerstinKeller marked this conversation as resolved.
Show resolved Hide resolved
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;
Expand Down Expand Up @@ -1058,10 +1059,10 @@ extern "C"
/////////////////////////////////////////////////////////
extern "C"
{
static std::recursive_mutex g_request_callback_mtx;
static std::recursive_mutex g_method_callback_mtx;
KerstinKeller marked this conversation as resolved.
Show resolved Hide resolved
KerstinKeller marked this conversation as resolved.
Show resolved Hide resolved
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_);
Expand All @@ -1072,9 +1073,10 @@ extern "C"
return ret_state;
}

static std::recursive_mutex g_server_event_callback_mtx;
KerstinKeller marked this conversation as resolved.
Show resolved Hide resolved
KerstinKeller marked this conversation as resolved.
Show resolved Hide resolved
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;
Expand Down Expand Up @@ -1178,9 +1180,10 @@ extern "C"
callback_(&service_response, par_);
}

static std::recursive_mutex g_client_event_callback_mtx;
KerstinKeller marked this conversation as resolved.
Show resolved Hide resolved
KerstinKeller marked this conversation as resolved.
Show resolved Hide resolved
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;
Expand Down