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

Backport/v5.13 #1411

Merged
merged 4 commits into from
Mar 1, 2024
Merged

Backport/v5.13 #1411

merged 4 commits into from
Mar 1, 2024

Conversation

FlorianReimold
Copy link
Member

Rebase merge!!!

rex-schilasky and others added 4 commits March 1, 2024 16:17
@rex-schilasky @FlorianReimold
ecalc mutex protection corrected (#1402)
490e4f2
@FlorianReimold
[Submodule fineftp-server] Updated fineftp-server to 1.4.2 => Fixes e…
afc3595 
…mpty-file-issue (#1408)

FineFTP 1.4.2 fixes a bug that caused empty files to be not downloadable.
@FlorianReimold
[GH Actions] Updated steps to non-deprecated versions and separated w…
ddcfda3 
…indows sign-installer job (#1409)

- Updated steps to non-deprecated versions
- Moved sign-installer job for windows to its own job, so we don't need to re-run everything if that one fails
- Increased timeout for sign-installer job from 100s to 300s
@FlorianReimold
[Qwt] Default to static build for all operating systems and builds (#…
902efd3 
…1406)

- QWT can now be built static
- static is the default option
- GH Actions for Ubuntu now build QWT from the submodule
- This fixes issues when building with Qt6 on Linux
github-actions[bot]
github-actions bot reviewed Mar 1, 2024
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

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;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: variable 'g_pub_event_callback_mtx' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

static std::recursive_mutex g_pub_event_callback_mtx;
                            ^

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;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: variable 'g_pub_event_callback_mtx' declared 'static', move to anonymous namespace instead [misc-use-anonymous-namespace]

static std::recursive_mutex g_pub_event_callback_mtx;
                            ^

ecal/core/src/ecalc.cpp
@@ -747,10 +747,10 @@ extern "C"
/////////////////////////////////////////////////////////
// Subscriber
/////////////////////////////////////////////////////////
static std::recursive_mutex g_sub_callback_mtx;
static std::recursive_mutex g_sub_receive_callback_mtx;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: variable 'g_sub_receive_callback_mtx' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

static std::recursive_mutex g_sub_receive_callback_mtx;
                            ^

ecal/core/src/ecalc.cpp
@@ -747,10 +747,10 @@ extern "C"
/////////////////////////////////////////////////////////
// Subscriber
/////////////////////////////////////////////////////////
static std::recursive_mutex g_sub_callback_mtx;
static std::recursive_mutex g_sub_receive_callback_mtx;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: variable 'g_sub_receive_callback_mtx' declared 'static', move to anonymous namespace instead [misc-use-anonymous-namespace]

static std::recursive_mutex g_sub_receive_callback_mtx;
                            ^

ecal/core/src/ecalc.cpp
@@ -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;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: variable 'g_sub_event_callback_mtx' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

static std::recursive_mutex g_sub_event_callback_mtx;
                            ^

ecal/core/src/ecalc.cpp
@@ -1195,10 +1196,10 @@ extern "C"
/////////////////////////////////////////////////////////
extern "C"
{
static std::recursive_mutex g_request_callback_mtx;
static std::recursive_mutex g_method_callback_mtx;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: variable 'g_method_callback_mtx' declared 'static', move to anonymous namespace instead [misc-use-anonymous-namespace]

  static std::recursive_mutex g_method_callback_mtx;
                              ^

ecal/core/src/ecalc.cpp
@@ -1209,9 +1210,10 @@ extern "C"
return ret_state;
}

static std::recursive_mutex g_server_event_callback_mtx;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: variable 'g_server_event_callback_mtx' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

  static std::recursive_mutex g_server_event_callback_mtx;
                              ^

ecal/core/src/ecalc.cpp
@@ -1209,9 +1210,10 @@ extern "C"
return ret_state;
}

static std::recursive_mutex g_server_event_callback_mtx;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: variable 'g_server_event_callback_mtx' declared 'static', move to anonymous namespace instead [misc-use-anonymous-namespace]

  static std::recursive_mutex g_server_event_callback_mtx;
                              ^

ecal/core/src/ecalc.cpp
@@ -1315,9 +1317,10 @@ extern "C"
callback_(&service_response, par_);
}

static std::recursive_mutex g_client_event_callback_mtx;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: variable 'g_client_event_callback_mtx' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

  static std::recursive_mutex g_client_event_callback_mtx;
                              ^

ecal/core/src/ecalc.cpp
@@ -1315,9 +1317,10 @@ extern "C"
callback_(&service_response, par_);
}

static std::recursive_mutex g_client_event_callback_mtx;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: variable 'g_client_event_callback_mtx' declared 'static', move to anonymous namespace instead [misc-use-anonymous-namespace]

  static std::recursive_mutex g_client_event_callback_mtx;
                              ^

@FlorianReimold FlorianReimold merged commit ad63e8b into support/v5.13 Mar 1, 2024
10 checks passed
@FlorianReimold FlorianReimold deleted the backport/v5.13 branch March 1, 2024 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@rex-schilasky rex-schilasky rex-schilasky approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FlorianReimold @rex-schilasky