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] description gate refactoring #1476

Merged
merged 14 commits into from
Mar 22, 2024
Merged

[core] description gate refactoring #1476

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ab8fa6b
data race in reader, writer, client, server create/register/unregiste…
rex-schilasky Mar 18, 2024
57bff30
atomic usage fixed
rex-schilasky Mar 18, 2024
5a6438f
descgate refactored, now using registration provider and registration…
rex-schilasky Mar 20, 2024
7123bf4
pubsub_test adapted to new, simple descgate logic
rex-schilasky Mar 20, 2024
3cc7168
init flag ProcessReg removed
rex-schilasky Mar 20, 2024
10c6fbd
do not clear the sample list on registration provider destruction (to…
rex-schilasky Mar 21, 2024
f44181f
do unregistration "unforced", this will lead to much higher performan…
rex-schilasky Mar 21, 2024
85e6564
util test ParallelGetTopics added
rex-schilasky Mar 21, 2024
a72a59d
std::atomic<int> initialization fixed
rex-schilasky Mar 21, 2024
8c54eae
unregistration utilized in CDescGate
rex-schilasky Mar 21, 2024
55aff9d
quality logic reintroduced in description gate to get this PR done
rex-schilasky Mar 22, 2024
cd39afa
missing include fixed
rex-schilasky Mar 22, 2024
0665134
removed unused parameter and functions
rex-schilasky Mar 22, 2024
dcf1844
util test corrected (dependency from ECAL_CORE_PUBLISHER option)
rex-schilasky Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/play/play_gui/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ int main(int argc, char *argv[])
//////////////////////////////////////////////////////////////////////////////

// Just make sure that eCAL is initialized
eCAL::Initialize(0, nullptr, "eCALPlayGUI", eCAL::Init::Default | eCAL::Init::ProcessReg | eCAL::Init::Publisher | eCAL::Init::Service | eCAL::Init::Monitoring);
eCAL::Initialize(0, nullptr, "eCALPlayGUI", eCAL::Init::Default | eCAL::Init::Publisher | eCAL::Init::Service | eCAL::Init::Monitoring);

// For linux big measurements require more file descriptors than the default value
#ifdef ECAL_OS_LINUX
Expand Down
2 changes: 1 addition & 1 deletion contrib/mma/src/mma_application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ int main(int argc, char** argv)
std::cout << app_version_header << std::endl << ecal_version_header << std::endl << std::endl;

// initialize eCAL API
if (eCAL::Initialize(0, nullptr, MMA_APPLICATION_NAME, eCAL::Init::Publisher | eCAL::Init::ProcessReg) < 0)
if (eCAL::Initialize(0, nullptr, MMA_APPLICATION_NAME, eCAL::Init::Publisher) < 0)
{
std::cout << "eCAL initialization failed !";
return 1;
Expand Down
7 changes: 2 additions & 5 deletions ecal/core/include/ecal/cimpl/ecal_init_cimpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,18 @@
#define eCAL_Init_Monitoring 0x08 /*!< Initialize Monitoring API */
#define eCAL_Init_Logging 0x10 /*!< Initialize Logging API */
#define eCAL_Init_TimeSync 0x20 /*!< Initialize Time API */
#define eCAL_Init_ProcessReg 0x80 /*!< Initialize Process Registration API */

#define eCAL_Init_All (eCAL_Init_Publisher \
| eCAL_Init_Subscriber \
| eCAL_Init_Service \
| eCAL_Init_Monitoring \
| eCAL_Init_Logging \
| eCAL_Init_TimeSync \
| eCAL_Init_ProcessReg) /*!< Initialize complete eCAL API */
| eCAL_Init_TimeSync) /*!< Initialize complete eCAL API */

#define eCAL_Init_Default (eCAL_Init_Publisher \
| eCAL_Init_Subscriber \
| eCAL_Init_Service \
| eCAL_Init_Logging \
| eCAL_Init_TimeSync \
| eCAL_Init_ProcessReg) /*!< Initialize default eCAL API */
| eCAL_Init_TimeSync) /*!< Initialize default eCAL API */

#endif /*ecal_init_cimpl_h_included*/
7 changes: 2 additions & 5 deletions ecal/core/include/ecal/ecal_init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,19 @@ namespace eCAL
static const unsigned int Monitoring = 0x008;
static const unsigned int Logging = 0x010;
static const unsigned int TimeSync = 0x020;
static const unsigned int ProcessReg = 0x080;

static const unsigned int All = Publisher
| Subscriber
| Service
| Monitoring
| Logging
| TimeSync
| ProcessReg;
| TimeSync;

static const unsigned int Default = Publisher
| Subscriber
| Service
| Logging
| TimeSync
| ProcessReg;
| TimeSync;

static const unsigned int None = 0x000;
}
Expand Down
Loading
Loading