Skip to content

Commit

Permalink
[core] description gate refactoring (#1476)
Browse files Browse the repository at this point in the history
* fixed data race in reader, writer, client, server create/register/unregister logic
* descgate refactored, now using registration provider and registration receiver to collect information
  • Loading branch information
rex-schilasky authored Mar 22, 2024
1 parent 61e0e92 commit f1d8efe
Show file tree
Hide file tree
Showing 29 changed files with 635 additions and 806 deletions.
2 changes: 1 addition & 1 deletion app/play/play_gui/src/main.cpp
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
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
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
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

0 comments on commit f1d8efe

Please sign in to comment.