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.

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

Hotfix/remove unused methods #1725

Merged
merged 5 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 ecal/core/include/ecal/config/transport_layer.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace eCAL
{
size_t number_executor_reader { 4 }; //!< Reader amount of threads that shall execute workload (Default: 4)
size_t number_executor_writer { 4 }; //!< Writer amount of threads that shall execute workload (Default: 4)
size_t max_reconnections { 5 }; //!< Reconnection attemps the session will try to reconnect in (Default: 5)
int max_reconnections { 5 }; //!< Reconnection attemps the session will try to reconnect in (Default: 5)
};
}

Expand Down
2 changes: 1 addition & 1 deletion ecal/core/include/ecal/ecal_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ namespace eCAL

ECAL_API size_t GetTcpPubsubReaderThreadpoolSize ();
ECAL_API size_t GetTcpPubsubWriterThreadpoolSize ();
ECAL_API size_t GetTcpPubsubMaxReconnectionAttemps ();
ECAL_API int GetTcpPubsubMaxReconnectionAttemps ();

ECAL_API std::string GetHostGroupName ();

Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/config/ecal_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace eCAL

ECAL_API size_t GetTcpPubsubReaderThreadpoolSize () { return GetConfiguration().transport_layer.tcp.number_executor_reader;}
ECAL_API size_t GetTcpPubsubWriterThreadpoolSize () { return GetConfiguration().transport_layer.tcp.number_executor_writer;}
ECAL_API size_t GetTcpPubsubMaxReconnectionAttemps () { return GetConfiguration().transport_layer.tcp.max_reconnections;}
ECAL_API int GetTcpPubsubMaxReconnectionAttemps () { return GetConfiguration().transport_layer.tcp.max_reconnections;}

ECAL_API std::string GetHostGroupName () { return GetConfiguration().registration.host_group_name; }

Expand Down
6 changes: 0 additions & 6 deletions ecal/core/src/config/ecal_config_initializer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -320,12 +320,6 @@ namespace eCAL
// Utils definitions from former ecal_config_reader.cpp
namespace
{
bool fileexists(const std::string& fname_)
{
const std::ifstream infile(fname_);
return infile.good();
}

bool direxists(const std::string& path_)
{
const EcalUtils::Filesystem::FileStatus status(path_, EcalUtils::Filesystem::Current);
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/ecal_globals.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ namespace eCAL
Finalize();
}

int CGlobals::Initialize(unsigned int components_, std::vector<std::string>* config_keys_ /*= nullptr*/)
int CGlobals::Initialize(unsigned int components_)
{
// will be set if any new module was initialized
bool new_initialization(false);
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/ecal_globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace eCAL
CGlobals();
~CGlobals();

int Initialize ( unsigned int components_, std::vector<std::string>* config_keys_ = nullptr);
int Initialize ( unsigned int components_);
bool IsInitialized ( unsigned int component_ );

unsigned int GetComponents() const { return(components); };
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/registration/ecal_registration_receiver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ namespace eCAL
, m_timeout_provider_thread(nullptr)
, m_registration_receiver_udp(nullptr)
, m_registration_receiver_shm(nullptr)
, m_attributes(attr_)
, m_sample_applier(Registration::SampleApplier::BuildSampleApplierAttributes(attr_))
, m_attributes(attr_)
{
// Connect User registration callback and gates callback with the sample applier
m_sample_applier.SetCustomApplySampleCallback("gates", [](const eCAL::Registration::Sample& sample_)
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/registration/ecal_registration_receiver.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,6 @@ namespace eCAL
// The custom user callbacks (who receive serialized samples), e.g. registration events.
Registration::CSampleApplierUser m_user_applier;

Registration::SAttributes m_attributes;
Registration::SAttributes m_attributes;
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace eCAL
struct SAttributes
{
std::string domain;
unsigned int queue_size;
size_t queue_size;
};
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ using namespace eCAL;
eCAL::CRegistrationReceiverUDP::CRegistrationReceiverUDP(RegistrationApplySampleCallbackT apply_sample_callback, const Registration::UDP::SReceiverAttributes& attr_)
: m_registration_receiver(std::make_unique<UDP::CSampleReceiver>(
Registration::UDP::ConvertToIOUDPReceiverAttributes(attr_),
[](const std::string& sample_name_) {return true; },
[](const std::string& /*sample_name_*/) {return true; },
[apply_sample_callback](const char* serialized_sample_data_, size_t serialized_sample_size_) {
Registration::Sample sample;
if (!DeserializeFromBuffer(serialized_sample_data_, serialized_sample_size_, sample)) return false;
Expand Down
Loading