Backport2/v5.12 #1335
Merged
Backport2/v5.12 #1335
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…apply_sample threadsafe. Co-authored-by: Rex Schilasky <[email protected]>
…lback_map Co-authored-by: Rex Schilasky <[email protected]>
Co-authored-by: Rex Schilasky <[email protected]>
…er (#1316) Probably cherry pick to 5.11 / 5.12. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
"Number" and "Rule" were mixed up, before
- Properly implement destructor (in inherited classes)! -> Destroy may not be called in base CMsgSubscriber class as this can lead to stack unwinding (most likely causes an exception in destructor, or leads to already deleted functions of derived class being called when they are already deleted) - Correct order of RemReceiveCallback and resetting internal pointer - protect function pointer with mutex. - Make testcase "harder" to more easily trigger race conditions.
This PR protects the m_payload member variable and thus makes the Send() function reentrant, as it may be called simultaneously from different threads. Co-authored-by: Florian Reimold <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -219,9 +222,12 @@ namespace eCAL | |||
| **/ | |||
| bool RemReceiveCallback() | |||
| { | |||
| bool ret = CSubscriber::RemReceiveCallback(); | |||
There was a problem hiding this comment.
warning: variable 'ret' is not initialized [cppcoreguidelines-init-variables]
Suggested change
| bool ret = CSubscriber::RemReceiveCallback(); | |
| bool ret = 0 = CSubscriber::RemReceiveCallback(); |
| @@ -245,7 +251,11 @@ namespace eCAL | |||
| private: | |||
| void ReceiveCallback(const char* topic_name_, const struct eCAL::SReceiveCallbackData* data_) | |||
| { | |||
| MsgReceiveCallbackT fn_callback(m_cb_callback); | |||
| MsgReceiveCallbackT fn_callback = nullptr; | |||
There was a problem hiding this comment.
warning: variable 'fn_callback' is not initialized [cppcoreguidelines-init-variables]
Suggested change
| MsgReceiveCallbackT fn_callback = nullptr; | |
| MsgReceiveCallbackT fn_callback = 0 = nullptr; |
| @@ -54,6 +54,11 @@ namespace eCAL | |||
| #endif //ECAL_NPCAP_SUPPORT | |||
| } | |||
|
|
|||
| CUDPReceiver::~CUDPReceiver() | |||
| { | |||
| Destroy(); | |||
There was a problem hiding this comment.
warning: Call to virtual method 'CUDPReceiver::Destroy' during destruction bypasses virtual dispatch [clang-analyzer-optin.cplusplus.VirtualCall]
Destroy();
^Additional context
ecal/core/src/io/udp_receiver.cpp:58: Call to virtual method 'CUDPReceiver::Destroy' during destruction bypasses virtual dispatch
Destroy();
^| @@ -35,6 +35,12 @@ namespace eCAL | |||
| { | |||
| public: | |||
| CUDPReceiver(); | |||
| ~CUDPReceiver(); | |||
There was a problem hiding this comment.
warning: annotate this function with 'override' or (rarely) 'final' [cppcoreguidelines-explicit-virtual-functions]
Suggested change
| ~CUDPReceiver(); | |
| ~CUDPReceiver() override; |
FlorianReimold
approved these changes
Jan 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of commits 18.01.24 - 25.01.24