Skip to content

Commit 5c77c7d

Browse files
cferreiragonzcferreiragonz
committed
Fix conflicts
Signed-off-by: cferreiragonz <[email protected]>
1 parent ba125cf commit 5c77c7d

File tree

7 files changed

+44
-296
lines changed

7 files changed

+44
-296
lines changed

‎ddspipe_participants/include/ddspipe_participants/participant/dds/CommonParticipant.hpp‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,6 @@ class CommonParticipant : public core::IParticipant
106106
// LISTENER METHODS
107107
/////////////////////////
108108

109-
<<<<<<< HEAD
110-
virtual void on_participant_discovery(
111-
fastdds::dds::DomainParticipant* participant,
112-
fastrtps::rtps::ParticipantDiscoveryInfo&& info) override;
113-
114-
virtual void on_subscriber_discovery(
115-
fastdds::dds::DomainParticipant* participant,
116-
fastrtps::rtps::ReaderDiscoveryInfo&& info) override;
117-
118-
virtual void on_publisher_discovery(
119-
fastdds::dds::DomainParticipant* participant,
120-
fastrtps::rtps::WriterDiscoveryInfo&& info) override;
121-
=======
122109
class DdsListener : public fastdds::dds::DomainParticipantListener
123110
{
124111
public:
@@ -175,7 +162,6 @@ class CommonParticipant : public core::IParticipant
175162

176163
//! Unique pointer to the internal DDS Participant Listener
177164
std::unique_ptr<fastdds::dds::DomainParticipantListener> dds_participant_listener_;
178-
>>>>>>> ee0e639 (Fix Data Races on DDS-Pipe (#145))
179165

180166
protected:
181167

@@ -207,15 +193,6 @@ class CommonParticipant : public core::IParticipant
207193
DDSPIPE_PARTICIPANTS_DllAPI
208194
virtual
209195
fastdds::dds::DomainParticipantQos
210-
<<<<<<< HEAD
211-
=======
212-
add_qos_properties_(
213-
fastdds::dds::DomainParticipantQos& qos) const;
214-
215-
DDSPIPE_PARTICIPANTS_DllAPI
216-
virtual
217-
fastdds::dds::DomainParticipantQos
218-
>>>>>>> ee0e639 (Fix Data Races on DDS-Pipe (#145))
219196
reckon_participant_qos_() const;
220197

221198
DDSPIPE_PARTICIPANTS_DllAPI

‎ddspipe_participants/include/ddspipe_participants/participant/dynamic_types/DynTypesParticipant.hpp‎

Lines changed: 17 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace participants {
3636
*
3737
* TODO: separate these 2 participants
3838
*/
39-
class DynTypesParticipant : public rtps::SimpleParticipant, public eprosima::fastdds::dds::DomainParticipantListener
39+
class DynTypesParticipant : public rtps::SimpleParticipant
4040
{
4141
public:
4242

@@ -71,36 +71,15 @@ class DynTypesParticipant : public rtps::SimpleParticipant, public eprosima::fas
7171
std::shared_ptr<core::IReader> create_reader(
7272
const core::ITopic& topic) override;
7373

74-
<<<<<<< HEAD
75-
DDSPIPE_PARTICIPANTS_DllAPI
76-
void on_type_discovery(
77-
eprosima::fastdds::dds::DomainParticipant* participant,
78-
const eprosima::fastrtps::rtps::SampleIdentity& request_sample_id,
79-
const eprosima::fastrtps::string_255& topic,
80-
const eprosima::fastrtps::types::TypeIdentifier* identifier,
81-
const eprosima::fastrtps::types::TypeObject* object,
82-
eprosima::fastrtps::types::DynamicType_ptr dyn_type) override;
83-
84-
DDSPIPE_PARTICIPANTS_DllAPI
85-
virtual void on_type_information_received(
86-
eprosima::fastdds::dds::DomainParticipant* participant,
87-
const eprosima::fastrtps::string_255 topic_name,
88-
const eprosima::fastrtps::string_255 type_name,
89-
const eprosima::fastrtps::types::TypeInformation& type_information) override;
90-
9174
protected:
9275

93-
void internal_notify_type_object_(
94-
eprosima::fastrtps::types::DynamicType_ptr dynamic_type);
95-
9676
void initialize_internal_dds_participant_();
9777

9878
eprosima::fastdds::dds::DomainParticipant* dds_participant_;
9979

10080
//! Type Object Internal Reader
10181
std::shared_ptr<InternalReader> type_object_reader_;
102-
=======
103-
class DynTypesRtpsListener : public rtps::CommonParticipant::RtpsListener
82+
class DynTypesRtpsListener : public eprosima::fastdds::dds::DomainParticipantListener
10483
{
10584
public:
10685

@@ -111,18 +90,20 @@ class DynTypesParticipant : public rtps::SimpleParticipant, public eprosima::fas
11190
std::shared_ptr<InternalReader> internal_reader);
11291

11392
DDSPIPE_PARTICIPANTS_DllAPI
114-
void on_reader_discovery(
115-
fastdds::rtps::RTPSParticipant* participant,
116-
fastdds::rtps::ReaderDiscoveryStatus reason,
117-
const fastdds::rtps::SubscriptionBuiltinTopicData& info,
118-
bool& should_be_ignored) override;
93+
void on_type_discovery(
94+
eprosima::fastdds::dds::DomainParticipant* participant,
95+
const eprosima::fastrtps::rtps::SampleIdentity& request_sample_id,
96+
const eprosima::fastrtps::string_255& topic,
97+
const eprosima::fastrtps::types::TypeIdentifier* identifier,
98+
const eprosima::fastrtps::types::TypeObject* object,
99+
eprosima::fastrtps::types::DynamicType_ptr dyn_type) override;
119100

120101
DDSPIPE_PARTICIPANTS_DllAPI
121-
void on_writer_discovery(
122-
fastdds::rtps::RTPSParticipant* participant,
123-
fastdds::rtps::WriterDiscoveryStatus reason,
124-
const fastdds::rtps::PublicationBuiltinTopicData& info,
125-
bool& should_be_ignored) override;
102+
virtual void on_type_information_received(
103+
eprosima::fastdds::dds::DomainParticipant* participant,
104+
const eprosima::fastrtps::string_255 topic_name,
105+
const eprosima::fastrtps::string_255 type_name,
106+
const eprosima::fastrtps::types::TypeInformation& type_information) override;
126107

127108
//! Type Object Reader getter
128109
inline std::shared_ptr<InternalReader> type_object_reader() const
@@ -132,14 +113,11 @@ class DynTypesParticipant : public rtps::SimpleParticipant, public eprosima::fas
132113

133114
protected:
134115

116+
void internal_notify_type_object_(
117+
eprosima::fastrtps::types::DynamicType_ptr dynamic_type);
118+
135119
//! Copy of Type Object Internal Reader
136120
std::shared_ptr<InternalReader> type_object_reader_;
137-
//! Received types set
138-
std::set<std::string> received_types_;
139-
140-
void notify_type_discovered_(
141-
const fastdds::dds::xtypes::TypeInformation& type_info,
142-
const std::string& type_name);
143121

144122
};
145123

@@ -151,7 +129,6 @@ class DynTypesParticipant : public rtps::SimpleParticipant, public eprosima::fas
151129
//! Type Object Internal Reader
152130
std::shared_ptr<InternalReader> type_object_reader_;
153131

154-
>>>>>>> ee0e639 (Fix Data Races on DDS-Pipe (#145))
155132
};
156133

157134
} /* namespace participants */

‎ddspipe_participants/include/ddspipe_participants/participant/rtps/CommonParticipant.hpp‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ namespace rtps {
5050
*/
5151
class CommonParticipant
5252
: public core::IParticipant
53-
<<<<<<< HEAD
54-
, public fastrtps::rtps::RTPSParticipantListener
55-
=======
56-
>>>>>>> ee0e639 (Fix Data Races on DDS-Pipe (#145))
5753
{
5854
public:
5955

@@ -124,38 +120,7 @@ class CommonParticipant
124120
// RTPS LISTENER METHODS
125121
/////////////////////////
126122

127-
<<<<<<< HEAD
128-
/**
129-
* @brief Override method from \c RTPSParticipantListener .
130-
*
131-
* This method only is for debugging purposes.
132-
*/
133-
DDSPIPE_PARTICIPANTS_DllAPI
134-
virtual void onParticipantDiscovery(
135-
fastrtps::rtps::RTPSParticipant* participant,
136-
fastrtps::rtps::ParticipantDiscoveryInfo&& info) override;
137-
138-
/**
139-
* @brief Override method from \c RTPSParticipantListener .
140-
*
141-
* This method adds to database the endpoint discovered or modified.
142-
*/
143-
DDSPIPE_PARTICIPANTS_DllAPI
144-
virtual void onReaderDiscovery(
145-
fastrtps::rtps::RTPSParticipant* participant,
146-
fastrtps::rtps::ReaderDiscoveryInfo&& info) override;
147-
148-
/**
149-
* @brief Override method from \c RTPSParticipantListener .
150-
*
151-
* This method adds to database the endpoint discovered or modified.
152-
*/
153-
DDSPIPE_PARTICIPANTS_DllAPI
154-
virtual void onWriterDiscovery(
155-
fastrtps::rtps::RTPSParticipant* participant,
156-
fastrtps::rtps::WriterDiscoveryInfo&& info) override;
157-
=======
158-
class RtpsListener : public fastdds::rtps::RTPSParticipantListener
123+
class RtpsListener : public fastrtps::rtps::RTPSParticipantListener
159124
{
160125
public:
161126

@@ -211,7 +176,6 @@ class CommonParticipant
211176

212177
//! Unique pointer to the internal RTPS Participant Listener
213178
std::unique_ptr<fastdds::rtps::RTPSParticipantListener> rtps_participant_listener_;
214-
>>>>>>> ee0e639 (Fix Data Races on DDS-Pipe (#145))
215179

216180
//////////////////
217181
// STATIC METHODS

‎ddspipe_participants/src/cpp/participant/dds/CommonParticipant.cpp‎

Lines changed: 9 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -249,35 +249,20 @@ void CommonParticipant::DdsListener::on_participant_discovery(
249249
}
250250
}
251251

252-
<<<<<<< HEAD
253-
void CommonParticipant::on_subscriber_discovery(
254-
fastdds::dds::DomainParticipant*,
255-
fastrtps::rtps::ReaderDiscoveryInfo&& info)
256-
{
257-
// If reader is from other participant, store it in discovery database
258-
if (detail::come_from_same_participant_(info.info.guid(), this->dds_participant_->guid()))
259-
=======
260-
void CommonParticipant::DdsListener::on_data_reader_discovery(
252+
void CommonParticipant::DdsListener::on_subscriber_discovery(
261253
fastdds::dds::DomainParticipant* participant,
262-
fastdds::rtps::ReaderDiscoveryStatus reason,
263-
const fastdds::dds::SubscriptionBuiltinTopicData& info,
264-
bool& /*should_be_ignored*/)
254+
fastrtps::rtps::ReaderDiscoveryInfo&& info)
265255
{
266256
// If reader is from other participant, store it in discovery database
267-
if (detail::come_from_same_participant_(info.guid, participant->guid()))
268-
>>>>>>> ee0e639 (Fix Data Races on DDS-Pipe (#145))
257+
if (detail::come_from_same_participant_(info.info.guid(), participant->guid()))
269258
{
270259
// Come from this participant, do nothing
271260
return;
272261
}
273262

274263
// Calculate endpoint info
275264
core::types::Endpoint info_reader =
276-
<<<<<<< HEAD
277-
detail::create_endpoint_from_info_<fastrtps::rtps::ReaderDiscoveryInfo>(info, id());
278-
=======
279-
detail::create_endpoint_from_info_<fastdds::dds::SubscriptionBuiltinTopicData>(info, configuration_->id);
280-
>>>>>>> ee0e639 (Fix Data Races on DDS-Pipe (#145))
265+
detail::create_endpoint_from_info_<fastrtps::rtps::ReaderDiscoveryInfo>(info, configuration_->id);
281266

282267
// If new endpoint discovered
283268
if (info.status == fastrtps::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS::DISCOVERED_READER)
@@ -309,35 +294,20 @@ void CommonParticipant::DdsListener::on_data_reader_discovery(
309294
}
310295
}
311296

312-
<<<<<<< HEAD
313-
void CommonParticipant::on_publisher_discovery(
314-
fastdds::dds::DomainParticipant*,
315-
fastrtps::rtps::WriterDiscoveryInfo&& info)
316-
{
317-
// If writer is from other participant, store it in discovery database
318-
if (detail::come_from_same_participant_(info.info.guid(), this->dds_participant_->guid()))
319-
=======
320-
void CommonParticipant::DdsListener::on_data_writer_discovery(
297+
void CommonParticipant::DdsListener::on_publisher_discovery(
321298
fastdds::dds::DomainParticipant* participant,
322-
fastdds::rtps::WriterDiscoveryStatus reason,
323-
const fastdds::dds::PublicationBuiltinTopicData& info,
324-
bool& /*should_be_ignored*/)
299+
fastrtps::rtps::WriterDiscoveryInfo&& info)
325300
{
326301
// If writer is from other participant, store it in discovery database
327-
if (detail::come_from_same_participant_(info.guid, participant->guid()))
328-
>>>>>>> ee0e639 (Fix Data Races on DDS-Pipe (#145))
302+
if (detail::come_from_same_participant_(info.info.guid(), participant->guid()))
329303
{
330304
// Come from this participant, do nothing
331305
return;
332306
}
333307

334308
// Calculate endpoint info
335309
core::types::Endpoint info_writer =
336-
<<<<<<< HEAD
337-
detail::create_endpoint_from_info_<fastrtps::rtps::WriterDiscoveryInfo>(info, id());
338-
=======
339-
detail::create_endpoint_from_info_<fastdds::dds::PublicationBuiltinTopicData>(info, configuration_->id);
340-
>>>>>>> ee0e639 (Fix Data Races on DDS-Pipe (#145))
310+
detail::create_endpoint_from_info_<fastrtps::rtps::WriterDiscoveryInfo>(info, configuration_->id);
341311

342312
// If new endpoint discovered
343313
if (info.status == fastrtps::rtps::WriterDiscoveryInfo::DISCOVERY_STATUS::DISCOVERED_WRITER)
@@ -380,18 +350,13 @@ CommonParticipant::CommonParticipant(
380350
// Do nothing
381351
}
382352

383-
<<<<<<< HEAD
384-
fastdds::dds::DomainParticipantQos CommonParticipant::reckon_participant_qos_() const
385-
=======
386353
std::unique_ptr<fastdds::dds::DomainParticipantListener> CommonParticipant::create_listener_()
387354
{
388355
EPROSIMA_LOG_INFO(DDSPIPE_DDS_PARTICIPANT, "Creating DDS Listener from CommonParticipant.");
389356
return std::make_unique<DdsListener>(configuration_, discovery_database_);
390357
}
391358

392-
fastdds::dds::DomainParticipantQos CommonParticipant::add_qos_properties_(
393-
fastdds::dds::DomainParticipantQos& qos) const
394-
>>>>>>> ee0e639 (Fix Data Races on DDS-Pipe (#145))
359+
fastdds::dds::DomainParticipantQos CommonParticipant::reckon_participant_qos_() const
395360
{
396361
auto qos = fastdds::dds::DomainParticipantFactory::get_instance()->get_default_participant_qos();
397362

0 commit comments

Comments
 (0)