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

[21295] Participant discovery structures refactor #99

Merged
merged 5 commits into from
Jul 24, 2024
Merged

[21295] Participant discovery structures refactor #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f243ae
Compile examples
elianalf Jul 22, 2024
dfaf9ee
Remove discovery-server.xsd
elianalf Jul 22, 2024
97316e1
remove discovery server example
elianalf Jul 22, 2024
33c0417
Apply suggestions
elianalf Jul 22, 2024
9439c8c
Refs #21295: Substitute ParticipantDiscoveryInfo with ParticipantBuil…
elianalf Jul 16, 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
5 changes: 3 additions & 2 deletions include/DiscoveryServerManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ class DiscoveryServerManager
// callback discovery functions
void on_participant_discovery(
DomainParticipant* participant,
ParticipantDiscoveryInfo&& info,
ParticipantDiscoveryStatus status,
const ParticipantBuiltinTopicData& info,
bool& should_be_ignored) override;

void on_data_reader_discovery(
Expand Down Expand Up @@ -339,7 +340,7 @@ class DiscoveryServerManager

std::ostream& operator <<(
std::ostream&,
ParticipantDiscoveryInfo::DISCOVERY_STATUS);
ParticipantDiscoveryStatus);
std::ostream& operator <<(
std::ostream&,
ReaderDiscoveryStatus);
Expand Down
29 changes: 14 additions & 15 deletions src/DiscoveryServerManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1584,11 +1584,12 @@ void DiscoveryServerManager::MapServerInfo(

void DiscoveryServerManager::on_participant_discovery(
DomainParticipant* participant,
ParticipantDiscoveryInfo&& info,
ParticipantDiscoveryStatus status,
const ParticipantBuiltinTopicData& info,
bool& should_be_ignored)
{
bool server = false;
const GUID_t& partid = info.info.m_guid;
const GUID_t& partid = info.guid;
static_cast<void>(should_be_ignored);

// if the callback origin was removed ignore
Expand All @@ -1601,7 +1602,7 @@ void DiscoveryServerManager::on_participant_discovery(
}

LOG_INFO("Participant " << participant->get_qos().name().to_string() << " reports a participant "
<< info.info.m_participantName << " is " << info.status << ". Prefix " << partid);
<< info.participant_name << " is " << status << ". Prefix " << partid);

std::chrono::steady_clock::time_point callback_time = std::chrono::steady_clock::now();
{
Expand All @@ -1620,16 +1621,16 @@ void DiscoveryServerManager::on_participant_discovery(
// add to database, it has its own mtx
// note that when a participant is destroyed he will wait for all his callbacks to return
// state will be alive during all callbacks
switch (info.status)
switch (status)
{
case ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT:
case ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT:
{
state.AddParticipant(srcGuid, srcName, partid, info.info.m_participantName.to_string(), callback_time,
state.AddParticipant(srcGuid, srcName, partid, info.participant_name.to_string(), callback_time,
server);
break;
}
case ParticipantDiscoveryInfo::REMOVED_PARTICIPANT:
case ParticipantDiscoveryInfo::DROPPED_PARTICIPANT:
case ParticipantDiscoveryStatus::REMOVED_PARTICIPANT:
case ParticipantDiscoveryStatus::DROPPED_PARTICIPANT:
{
state.RemoveParticipant(srcGuid, partid);
break;
Expand Down Expand Up @@ -1819,19 +1820,17 @@ void DiscoveryServerManager::on_liveliness_changed(

std::ostream& eprosima::discovery_server::operator <<(
std::ostream& o,
ParticipantDiscoveryInfo::DISCOVERY_STATUS s)
ParticipantDiscoveryStatus s)
{
typedef ParticipantDiscoveryInfo::DISCOVERY_STATUS DS;

switch (s)
{
case DS::DISCOVERED_PARTICIPANT:
case ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT:
return o << "DISCOVERED_PARTICIPANT";
case DS::CHANGED_QOS_PARTICIPANT:
case ParticipantDiscoveryStatus::CHANGED_QOS_PARTICIPANT:
return o << "CHANGED_QOS_PARTICIPANT";
case DS::REMOVED_PARTICIPANT:
case ParticipantDiscoveryStatus::REMOVED_PARTICIPANT:
return o << "REMOVED_PARTICIPANT";
case DS::DROPPED_PARTICIPANT:
case ParticipantDiscoveryStatus::DROPPED_PARTICIPANT:
return o << "DROPPED_PARTICIPANT";
default: // unknown value, error
o.setstate(std::ios::failbit);
Expand Down
Loading