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

[20567] Make private the necessary headers from include/fastrtps #4545

Merged
merged 22 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
76134dd
Refs #20567: Include what you use in latency test
EduPonz Mar 7, 2024
9c0a79e
Refs #20567: Remove unnecesary and deprecated headers
EduPonz Mar 7, 2024
47ce65a
Refs #20567: Migrate allocations test to DDS
EduPonz Mar 7, 2024
d07f80a
Refs #20567: Make ParticipantAttributes private
EduPonz Mar 7, 2024
32a6397
Refs #20567: Make ReplierAttributes & RequesterAttributes private
EduPonz Mar 9, 2024
4b46f7c
Refs #20567: Make PublisherAttributes private
EduPonz Mar 9, 2024
9309221
Refs #20567: Make SubscriberAttributes private
EduPonz Mar 9, 2024
db6b676
Refs #20567: Make Discovery private
EduPonz Mar 10, 2024
efcfa5d
Refs #20567: Make ProxyPool private
EduPonz Mar 10, 2024
28b563d
Refs #20567: Make Semaphore private
EduPonz Mar 10, 2024
b6ed0cc
Refs #20567: Make MessageReceiver private
EduPonz Mar 10, 2024
76a6a18
Refs #20567: Make BuiltinProtocols private
EduPonz Mar 10, 2024
213eed7
Refs #20567: Make Liveliness private
EduPonz Mar 10, 2024
c607772
Refs #20567: Make LivelinessManager private
EduPonz Mar 10, 2024
d98134e
Refs #20567: Make LivelinessData private
EduPonz Mar 10, 2024
ac465c4
Refs #20567: Make shared_mutex private
EduPonz Mar 10, 2024
b379261
Refs #20567: Make StringMatching private
EduPonz Mar 10, 2024
739c754
Refs #20567: Make TimeConversion private
EduPonz Mar 11, 2024
fd4c36f
Refs #20567: Make DBQueue private
EduPonz Mar 11, 2024
4633f7c
Refs #20567: Add notes to versions.md
EduPonz Mar 11, 2024
5e1ee49
Refs #20567: Apply Eliana's suggestions
EduPonz Mar 25, 2024
4259298
Refs #20567: Correctly export API in Windows for ReplierQos and Reque…
EduPonz Mar 26, 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
1 change: 1 addition & 0 deletions fuzz/C++/fuzz_processCDRMsg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ message(STATUS "Configuring fuzz_processCDRMsg...")
file(GLOB SOURCES_CXX "fuzz_*.cxx")

add_executable(fuzz_processCDRMsg ${SOURCES_CXX})
target_include_directories(fuzz_processCDRMsg PRIVATE ${CMAKE_SOURCE_DIR}/src/cpp/rtps/messages)
target_link_libraries(fuzz_processCDRMsg fastdds fastcdr foonathan_memory $ENV{LIB_FUZZING_ENGINE})
3 changes: 2 additions & 1 deletion fuzz/C++/fuzz_processCDRMsg/fuzz_processCDRMsg.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
#include <string.h>

#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
#include <fastdds/rtps/messages/MessageReceiver.h>

#include <MessageReceiver.h>

#define MIN_SIZE RTPSMESSAGE_HEADER_SIZE
#define MAX_SIZE 64000
Expand Down
35 changes: 27 additions & 8 deletions include/fastdds/dds/domain/DomainParticipant.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,21 @@

#include <fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp>
#include <fastdds/dds/builtin/topic/TopicBuiltinTopicData.hpp>
#include <fastdds/dds/core/status/StatusMask.hpp>
#include <fastdds/dds/core/Entity.hpp>
#include <fastdds/dds/core/status/StatusMask.hpp>
#include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
#include <fastdds/dds/domain/qos/ReplierQos.hpp>
#include <fastdds/dds/domain/qos/RequesterQos.hpp>
#include <fastdds/dds/topic/ContentFilteredTopic.hpp>
#include <fastdds/dds/topic/IContentFilterFactory.hpp>
#include <fastdds/dds/topic/TypeSupport.hpp>
#include <fastdds/dds/topic/Topic.hpp>
#include <fastdds/dds/topic/TopicListener.hpp>
#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
#include <fastdds/dds/topic/TypeSupport.hpp>
#include <fastdds/rtps/common/Guid.h>
#include <fastdds/rtps/common/SampleIdentity.h>
#include <fastdds/rtps/common/Time_t.h>
#include <fastrtps/types/TypesBase.h>
#include <fastrtps/types/TypeIdentifier.h>
#include <fastrtps/types/TypesBase.h>

using eprosima::fastrtps::types::ReturnCode_t;

Expand All @@ -60,10 +61,6 @@ namespace types {
class TypeInformation;
} // namespace types

class ParticipantAttributes;
class PublisherAttributes;
class SubscriberAttributes;

} //namespace fastrtps

namespace fastdds {
Expand Down Expand Up @@ -668,6 +665,28 @@ class DomainParticipant : public Entity
const std::string& profile_name,
TopicQos& qos) const;

/**
* Fills the ReplierQos with the values of the XML profile.
*
* @param profile_name Replier profile name.
* @param qos ReplierQos object where the qos is returned.
* @return RETCODE_OK if the profile exists. RETCODE_BAD_PARAMETER otherwise.
*/
FASTDDS_EXPORTED_API ReturnCode_t get_replier_qos_from_profile(
const std::string& profile_name,
ReplierQos& qos) const;

/**
* Fills the RequesterQos with the values of the XML profile.
*
* @param profile_name Requester profile name.
* @param qos RequesterQos object where the qos is returned.
* @return RETCODE_OK if the profile exists. RETCODE_BAD_PARAMETER otherwise.
*/
FASTDDS_EXPORTED_API ReturnCode_t get_requester_qos_from_profile(
const std::string& profile_name,
RequesterQos& qos) const;

/**
* Retrieves the list of DomainParticipants that have been discovered in the domain and are not "ignored".
*
Expand Down
80 changes: 80 additions & 0 deletions include/fastdds/dds/domain/qos/ReplierQos.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
// Copyright 2024 Proyectos y Sistemas de Mantenimiento SL (eProsima).
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

/**
* @file ReplierQos.hpp
*/

#ifndef _FASTDDS_REPLIERQOS_HPP_
#define _FASTDDS_REPLIERQOS_HPP_

#include <string>

#include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
#include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
#include <fastdds/fastdds_dll.hpp>

namespace eprosima {
namespace fastdds {
namespace dds {

class ReplierQos
{
public:

/**
* @brief Constructor
*/
FASTDDS_EXPORTED_API ReplierQos() = default;

/**
* @brief Equal comparison operator
*/
FASTDDS_EXPORTED_API bool operator ==(
const ReplierQos& b) const
{
return (this->service_name == b.service_name) &&
(this->request_topic_name == b.request_topic_name) &&
(this->reply_topic_name == b.reply_topic_name) &&
(this->writer_qos == b.writer_qos) &&
(this->reader_qos == b.reader_qos);
}

//! Service name
std::string service_name;

//! Request type
std::string request_type;

//! Reply type
std::string reply_type;

//! Request topic name
std::string request_topic_name;

//! Reply topic name
std::string reply_topic_name;

//! DataWriter QoS for the reply writer
DataWriterQos writer_qos;

//! DataReader QoS for the reply reader
DataReaderQos reader_qos;
};

} /* namespace dds */
} /* namespace fastdds */
} /* namespace eprosima */

#endif /* _FASTDDS_REPLIERQOS_HPP_ */
80 changes: 80 additions & 0 deletions include/fastdds/dds/domain/qos/RequesterQos.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
// Copyright 2024 Proyectos y Sistemas de Mantenimiento SL (eProsima).
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

/**
* @file RequesterQos.hpp
*/

#ifndef _FASTDDS_REQUESTERQOS_HPP_
#define _FASTDDS_REQUESTERQOS_HPP_

#include <string>

#include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
#include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
#include <fastdds/fastdds_dll.hpp>

namespace eprosima {
namespace fastdds {
namespace dds {

class RequesterQos
{
public:

/**
* @brief Constructor
*/
FASTDDS_EXPORTED_API RequesterQos() = default;

/**
* @brief Equal comparison operator
*/
FASTDDS_EXPORTED_API bool operator ==(
const RequesterQos& b) const
{
return (this->service_name == b.service_name) &&
(this->request_topic_name == b.request_topic_name) &&
(this->reply_topic_name == b.reply_topic_name) &&
(this->writer_qos == b.writer_qos) &&
(this->reader_qos == b.reader_qos);
}

//! Service name
std::string service_name;

//! Request type
std::string request_type;

//! Reply type
std::string reply_type;

//! Request topic name
std::string request_topic_name;

//! Reply topic name
std::string reply_topic_name;

//! DataWriter QoS for the request writer
DataWriterQos writer_qos;

//! DataReader QoS for the request reader
DataReaderQos reader_qos;
};

} /* namespace dds */
} /* namespace fastdds */
} /* namespace eprosima */

#endif /* _FASTDDS_REQUESTERQOS_HPP_ */
41 changes: 0 additions & 41 deletions include/fastdds/rtps/rtps_all.h

This file was deleted.

Loading
Loading