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

[core] Remove PubShareType / PubShareDescription (set via publisher c… #1834

Merged
merged 1 commit into from
Dec 4, 2024
+1 −53
Merged

[core] Remove PubShareType / PubShareDescription (set via publisher c… #1834

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions ecal/core/include/ecal/ecal_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,22 +92,6 @@ namespace eCAL
**/
ECAL_API void ShutdownCore();

/**
* @brief Enable process wide eCAL publisher topic type sharing
* that is needed for reflection on subscriber side.
*
* @param state_ Switch on type sharing
**/
ECAL_API void PubShareType(bool state_);

/**
* @brief Enable process wide eCAL publisher topic description sharing
* that is needed for reflection on subscriber side.
*
* @param state_ Switch on description sharing
**/
ECAL_API void PubShareDescription(bool state_);

/**
* @brief Splits the topic type (eCAL < 5.12) into encoding and types (>= eCAL 5.12)
*
Expand Down
14 changes: 0 additions & 14 deletions ecal/core/src/ecal_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,6 @@ namespace eCAL
{
namespace Util
{
void PubShareType(bool state_)
{
#if ECAL_CORE_PUBLISHER
if (g_pubgate() != nullptr) g_pubgate()->ShareType(state_);
#endif
}

void PubShareDescription(bool state_)
{
#if ECAL_CORE_PUBLISHER
if (g_pubgate() != nullptr) g_pubgate()->ShareDescription(state_);
#endif
}

#if ECAL_CORE_MONITORING
// take monitoring snapshot
static Monitoring::SMonitoring GetMonitoring()
Expand Down
16 changes: 1 addition & 15 deletions ecal/core/src/pubsub/ecal_pubgate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@ namespace eCAL
// CPubGate
//////////////////////////////////////////////////////////////////
std::atomic<bool> CPubGate::m_created;
CPubGate::CPubGate() :
m_share_type(true),
m_share_desc(true)
{
}
CPubGate::CPubGate() = default;

CPubGate::~CPubGate()
{
Expand Down Expand Up @@ -69,16 +65,6 @@ namespace eCAL
m_created = false;
}

void CPubGate::ShareType(bool state_)
{
m_share_type = state_;
}

void CPubGate::ShareDescription(bool state_)
{
m_share_desc = state_;
}

bool CPubGate::Register(const std::string& topic_name_, const std::shared_ptr<CDataWriter>& datawriter_)
{
if(!m_created) return(false);
Expand Down
8 changes: 0 additions & 8 deletions ecal/core/src/pubsub/ecal_pubgate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ namespace eCAL
void Start();
void Stop();

void ShareType(bool state_);
bool TypeShared() const { return m_share_type; };

void ShareDescription(bool state_);
bool DescriptionShared() const { return m_share_desc; };

bool Register(const std::string& topic_name_, const std::shared_ptr<CDataWriter>& datawriter_);
bool Unregister(const std::string& topic_name_, const std::shared_ptr<CDataWriter>& datawriter_);

Expand All @@ -60,8 +54,6 @@ namespace eCAL

protected:
static std::atomic<bool> m_created;
bool m_share_type;
bool m_share_desc;

using TopicNameDataWriterMapT = std::multimap<std::string, std::shared_ptr<CDataWriter>>;
std::shared_timed_mutex m_topic_name_datawriter_sync;
Expand Down
Loading