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

[21129] Migrate fastrtps namespace to fastdds #135

Merged
merged 3 commits into from
Jun 18, 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
264 changes: 0 additions & 264 deletions fastdds_python/src/swig/fastdds.i
Original file line number Diff line number Diff line change
Expand Up @@ -167,259 +167,6 @@ namespace xtypes {
%include "fastdds/rtps/common/SampleIdentity.i"
%include "fastdds/rtps/common/WriteParams.i"

/*
%include "fastdds/rtps/common/SerializedPayload.i"
%include "fastdds/rtps/common/CDRMessage_t.i"
%include "fastdds/rtps/common/FragmentNumber.i"
%include "fastdds/rtps/common/LocatorSelector.i"
%include "fastdds/rtps/common/LocatorSelectorEntry.i"
%include "fastdds/rtps/common/CacheChange.i"
%include "fastdds/rtps/common/LocatorListComparisons.i"
%include "fastdds/rtps/common/Token.i"
%include "fastdds/rtps/common/MatchingInfo.i"
%include "fastdds/rtps/common/ChangeKind_t.i"
%include "fastdds/rtps/common/LocatorsIterator.i"
%include "fastdds/rtps/common/RemoteLocators.i"

%include "fastrtps/rtps/common/LocatorListComparisons.i"
%include "fastrtps/rtps/common/PortParameters.i"

%include "fastrtps/utils/Semaphore.i"
%include "fastrtps/utils/System.i"
%include "fastrtps/utils/fixed_size_string.i"
%include "fastrtps/utils/TimedMutex.i"
%include "fastrtps/utils/collections/foonathan_memory_helpers.i"
%include "fastrtps/utils/StringMatching.i"
%include "fastrtps/utils/string_convert.i"
%include "fastrtps/utils/IPFinder.i"
%include "fastrtps/utils/IPLocator.i"
%include "fastrtps/utils/TimedConditionVariable.i"
%include "fastrtps/utils/fixed_size_bitmap.i"
%include "fastrtps/utils/TimeConversion.i"
%include "fastrtps/utils/md5.i"
%include "fastrtps/utils/DBQueue.i"


%include "fastdds/statistics/IListeners.i"
%include "fastdds/statistics/topic_names.i"
%include "fastdds/statistics/rtps/StatisticsCommon.i"
%include "fastdds/statistics/dds/publisher/qos/DataWriterQos.i"
%include "fastdds/statistics/dds/domain/DomainParticipant.i"
%include "fastdds/statistics/dds/subscriber/qos/DataReaderQos.i"
%include "fastdds/rtps/builtin/discovery/endpoint/EDP.i"
%include "fastdds/rtps/builtin/discovery/endpoint/EDPStatic.i"
%include "fastdds/rtps/builtin/discovery/endpoint/EDPSimple.i"
%include "fastdds/rtps/builtin/discovery/participant/PDP.i"
%include "fastdds/rtps/builtin/discovery/participant/PDPListener.i"
%include "fastdds/rtps/builtin/discovery/participant/PDPSimple.i"
%include "fastdds/rtps/builtin/data/ReaderProxyData.i"
%include "fastdds/rtps/builtin/data/ParticipantProxyData.i"
%include "fastdds/rtps/builtin/data/WriterProxyData.i"
%include "fastdds/rtps/builtin/liveliness/WLP.i"
%include "fastdds/rtps/builtin/liveliness/WLPListener.i"
%include "fastdds/rtps/builtin/BuiltinProtocols.i"
%include "fastdds/rtps/attributes/HistoryAttributes.i"
%include "fastdds/rtps/attributes/EndpointAttributes.i"
%include "fastdds/rtps/reader/ReaderDiscoveryInfo.i"
%include "fastdds/rtps/reader/StatelessReader.i"
%include "fastdds/rtps/reader/StatefulReader.i"
%include "fastdds/rtps/reader/ReaderListener.i"
%include "fastdds/rtps/reader/StatefulPersistentReader.i"
%include "fastdds/rtps/reader/RTPSReader.i"
%include "fastdds/rtps/reader/StatelessPersistentReader.i"
%include "fastdds/rtps/Endpoint.i"
%include "fastdds/rtps/history/ReaderHistory.i"
%include "fastdds/rtps/history/WriterHistory.i"
%include "fastdds/rtps/history/IPayloadPool.i"
%include "fastdds/rtps/history/History.i"
%include "fastdds/rtps/history/IChangePool.i"
%include "fastdds/rtps/transport/TCPTransportDescriptor.i"
%include "fastdds/rtps/transport/test_UDPv4TransportDescriptor.i"
%include "fastdds/rtps/transport/UDPv4TransportDescriptor.i"
%include "fastdds/rtps/transport/UDPTransportDescriptor.i"
%include "fastdds/rtps/transport/UDPv6TransportDescriptor.i"
%include "fastdds/rtps/transport/TransportInterface.i"
%include "fastdds/rtps/transport/TCPv4TransportDescriptor.i"
%include "fastdds/rtps/transport/SocketTransportDescriptor.i"
%include "fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.i"
%include "fastdds/rtps/transport/TransportReceiverInterface.i"
%include "fastdds/rtps/transport/TransportDescriptorInterface.i"
%include "fastdds/rtps/transport/TCPv6TransportDescriptor.i"
%include "fastdds/rtps/exceptions/Exception.i"
%include "fastdds/rtps/RTPSDomain.i"
%include "fastdds/rtps/messages/RTPSMessageSenderInterface.i"
%include "fastdds/rtps/messages/MessageReceiver.i"
%include "fastdds/rtps/messages/RTPSMessageCreator.i"
%include "fastdds/rtps/messages/RTPSMessageGroup.i"
%include "fastdds/rtps/messages/CDRMessage.i"
%include "fastdds/rtps/messages/RTPS_messages.i"
%include "fastdds/rtps/messages/CDRMessage.i"
%include "fastdds/rtps/security/common/SharedSecretHandle.i"
%include "fastdds/rtps/security/common/ParticipantGenericMessage.i"
%include "fastdds/rtps/security/common/Handle.i"
%include "fastdds/rtps/security/accesscontrol/AccessControl.i"
%include "fastdds/rtps/security/accesscontrol/ParticipantSecurityAttributes.i"
%include "fastdds/rtps/security/accesscontrol/SecurityMaskUtilities.i"
%include "fastdds/rtps/security/accesscontrol/EndpointSecurityAttributes.i"
%include "fastdds/rtps/security/logging/LoggingLevel.i"
%include "fastdds/rtps/security/logging/LogOptions.i"
%include "fastdds/rtps/security/logging/BuiltinLoggingType.i"
%include "fastdds/rtps/security/logging/Logging.i"
%include "fastdds/rtps/security/logging/NameValuePair.i"
%include "fastdds/rtps/security/exceptions/SecurityException.i"
%include "fastdds/rtps/security/authentication/Handshake.i"
%include "fastdds/rtps/security/authentication/Authentication.i"
%include "fastdds/rtps/security/cryptography/CryptoTypes.i"
%include "fastdds/rtps/security/cryptography/CryptoKeyExchange.i"
%include "fastdds/rtps/security/cryptography/Cryptography.i"
%include "fastdds/rtps/security/cryptography/CryptoTransform.i"
%include "fastdds/rtps/security/cryptography/CryptoKeyFactory.i"
%include "fastdds/rtps/participant/ParticipantDiscoveryInfo.i"
%include "fastdds/rtps/participant/RTPSParticipantListener.i"
%include "fastdds/rtps/participant/RTPSParticipant.i"
%include "fastdds/rtps/network/NetworkFactory.i"
%include "fastdds/rtps/network/SenderResource.i"
%include "fastdds/rtps/network/ReceiverResource.i"
%include "fastdds/rtps/writer/StatelessWriter.i"
%include "fastdds/rtps/writer/LivelinessManager.i"
%include "fastdds/rtps/writer/LivelinessData.i"
%include "fastdds/rtps/writer/DeliveryRetCode.i"
%include "fastdds/rtps/writer/ChangeForReader.i"
%include "fastdds/rtps/writer/StatefulPersistentWriter.i"
%include "fastdds/rtps/writer/ReaderLocator.i"
%include "fastdds/rtps/writer/PersistentWriter.i"
%include "fastdds/rtps/writer/WriterListener.i"
%include "fastdds/rtps/writer/StatefulWriter.i"
%include "fastdds/rtps/writer/IReaderDataFilter.i"
%include "fastdds/rtps/writer/LocatorSelectorSender.i"
%include "fastdds/rtps/writer/ReaderProxy.i"
%include "fastdds/rtps/writer/WriterDiscoveryInfo.i"
%include "fastdds/rtps/writer/StatelessPersistentWriter.i"
%include "fastdds/rtps/writer/RTPSWriter.i"
%include "fastdds/rtps/flowcontrol/ThroughputControllerDescriptor.i"
%include "fastdds/rtps/flowcontrol/FlowControllerConsts.i"
%include "fastdds/rtps/resources/ResourceEvent.i"
%include "fastdds/rtps/resources/TimedEvent.i"
%include "fastdds/rtps/rtps_fwd.i"

%include "fastrtps/publisher/PublisherListener.i"
%include "fastrtps/publisher/PublisherHistory.i"
%include "fastrtps/publisher/Publisher.i"
%include "fastrtps/common/KeyedChanges.i"
%include "fastrtps/attributes/PublisherAttributes.i"
%include "fastrtps/attributes/LibrarySettingsAttributes.i"
%include "fastrtps/attributes/ParticipantAttributes.i"
%include "fastrtps/attributes/ReplierAttributes.i"
%include "fastrtps/attributes/TopicAttributes.i"
%include "fastrtps/attributes/all_attributes.i"
%include "fastrtps/attributes/SubscriberAttributes.i"
%include "fastrtps/attributes/RequesterAttributes.i"
%include "fastrtps/qos/WriterQos.i"
%include "fastrtps/qos/ReaderQos.i"
%include "fastrtps/qos/DeadlineMissedStatus.i"
%include "fastrtps/qos/IncompatibleQosStatus.i"
%include "fastrtps/qos/LivelinessLostStatus.i"
%include "fastrtps/qos/LivelinessChangedStatus.i"
%include "fastrtps/qos/SampleRejectedStatus.i"
%include "fastrtps/config/doxygen_modules.i"
%include "fastrtps/log/Log.i"
%include "fastrtps/log/StdoutConsumer.i"
%include "fastrtps/log/FileConsumer.i"
%include "fastrtps/log/Colors.i"
%include "fastrtps/transport/TCPTransportDescriptor.i"
%include "fastrtps/transport/test_UDPv4TransportDescriptor.i"
%include "fastrtps/transport/UDPv4TransportDescriptor.i"
%include "fastrtps/transport/UDPTransportDescriptor.i"
%include "fastrtps/transport/UDPv6TransportDescriptor.i"
%include "fastrtps/transport/TransportInterface.i"
%include "fastrtps/transport/TCPv4TransportDescriptor.i"
%include "fastrtps/transport/SocketTransportDescriptor.i"
%include "fastrtps/transport/TransportReceiverInterface.i"
%include "fastrtps/transport/TransportDescriptorInterface.i"
%include "fastrtps/transport/TCPv6TransportDescriptor.i"
%include "fastrtps/subscriber/SubscriberHistory.i"
%include "fastrtps/subscriber/SubscriberListener.i"
%include "fastrtps/subscriber/SampleInfo.i"
%include "fastrtps/subscriber/Subscriber.i"
%include "fastrtps/participant/ParticipantListener.i"
%include "fastrtps/participant/Participant.i"
%include "fastrtps/rtps/builtin/discovery/endpoint/EDP.i"
%include "fastrtps/rtps/builtin/discovery/endpoint/EDPStatic.i"
%include "fastrtps/rtps/builtin/discovery/endpoint/EDPSimple.i"
%include "fastrtps/rtps/builtin/discovery/participant/PDP.i"
%include "fastrtps/rtps/builtin/discovery/participant/PDPListener.i"
%include "fastrtps/rtps/builtin/discovery/participant/PDPSimple.i"
%include "fastrtps/rtps/builtin/data/ReaderProxyData.i"
%include "fastrtps/rtps/builtin/data/ParticipantProxyData.i"
%include "fastrtps/rtps/builtin/data/WriterProxyData.i"
%include "fastrtps/rtps/builtin/liveliness/WLP.i"
%include "fastrtps/rtps/builtin/liveliness/WLPListener.i"
%include "fastrtps/rtps/builtin/BuiltinProtocols.i"
%include "fastrtps/rtps/reader/ReaderDiscoveryInfo.i"
%include "fastrtps/rtps/reader/StatelessReader.i"
%include "fastrtps/rtps/reader/StatefulReader.i"
%include "fastrtps/rtps/reader/ReaderListener.i"
%include "fastrtps/rtps/reader/StatefulPersistentReader.i"
%include "fastrtps/rtps/reader/RTPSReader.i"
%include "fastrtps/rtps/reader/StatelessPersistentReader.i"
%include "fastrtps/rtps/Endpoint.i"
%include "fastrtps/rtps/history/ReaderHistory.i"
%include "fastrtps/rtps/history/WriterHistory.i"
%include "fastrtps/rtps/history/History.i"
%include "fastrtps/rtps/exceptions/Exception.i"
%include "fastrtps/rtps/RTPSDomain.i"
%include "fastrtps/rtps/messages/RTPSMessageSenderInterface.i"
%include "fastrtps/rtps/messages/MessageReceiver.i"
%include "fastrtps/rtps/messages/RTPSMessageCreator.i"
%include "fastrtps/rtps/messages/RTPSMessageGroup.i"
%include "fastrtps/rtps/messages/RTPS_messages.i"
%include "fastrtps/rtps/messages/CDRMessage.i"
%include "fastrtps/rtps/security/common/SharedSecretHandle.i"
%include "fastrtps/rtps/security/common/ParticipantGenericMessage.i"
%include "fastrtps/rtps/security/common/Handle.i"
%include "fastrtps/rtps/security/accesscontrol/AccessControl.i"
%include "fastrtps/rtps/security/accesscontrol/ParticipantSecurityAttributes.i"
%include "fastrtps/rtps/security/accesscontrol/SecurityMaskUtilities.i"
%include "fastrtps/rtps/security/accesscontrol/EndpointSecurityAttributes.i"
%include "fastrtps/rtps/security/exceptions/SecurityException.i"
%include "fastrtps/rtps/security/authentication/Handshake.i"
%include "fastrtps/rtps/security/authentication/Authentication.i"
%include "fastrtps/rtps/security/cryptography/CryptoTypes.i"
%include "fastrtps/rtps/security/cryptography/CryptoKeyExchange.i"
%include "fastrtps/rtps/security/cryptography/Cryptography.i"
%include "fastrtps/rtps/security/cryptography/CryptoTransform.i"
%include "fastrtps/rtps/security/cryptography/CryptoKeyFactory.i"
%include "fastrtps/rtps/participant/ParticipantDiscoveryInfo.i"
%include "fastrtps/rtps/participant/RTPSParticipantListener.i"
%include "fastrtps/rtps/participant/RTPSParticipant.i"
%include "fastrtps/rtps/network/NetworkFactory.i"
%include "fastrtps/rtps/network/SenderResource.i"
%include "fastrtps/rtps/network/ReceiverResource.i"
%include "fastrtps/rtps/writer/StatelessWriter.i"
%include "fastrtps/rtps/writer/LivelinessManager.i"
%include "fastrtps/rtps/writer/LivelinessData.i"
%include "fastrtps/rtps/writer/StatefulPersistentWriter.i"
%include "fastrtps/rtps/writer/ReaderLocator.i"
%include "fastrtps/rtps/writer/PersistentWriter.i"
%include "fastrtps/rtps/writer/WriterListener.i"
%include "fastrtps/rtps/writer/StatefulWriter.i"
%include "fastrtps/rtps/writer/ReaderProxy.i"
%include "fastrtps/rtps/writer/WriterDiscoveryInfo.i"
%include "fastrtps/rtps/writer/StatelessPersistentWriter.i"
%include "fastrtps/rtps/writer/RTPSWriter.i"
%include "fastrtps/rtps/flowcontrol/ThroughputControllerDescriptor.i"
%include "fastrtps/rtps/resources/ResourceEvent.i"
%include "fastrtps/rtps/resources/ResourceManagement.i"
%include "fastrtps/rtps/resources/TimedEvent.i"
%include "fastrtps/rtps/rtps_fwd.i"
%include "fastrtps/xmlparser/XMLParserCommon.i"
%include "fastrtps/xmlparser/XMLParser.i"
%include "fastrtps/xmlparser/XMLTree.i"
%include "fastrtps/xmlparser/XMLEndpointParser.i"
%include "fastrtps/xmlparser/XMLProfileManager.i"
%include "fastrtps/Domain.i"
*/

%include "fastdds/dds/common/InstanceHandle.i"
%include "fastdds/dds/core/ReturnCode.i"
%include "fastdds/dds/core/status/StatusMask.i"
Expand Down Expand Up @@ -484,14 +231,3 @@ namespace xtypes {
%include "fastdds/dds/domain/DomainParticipant.i"
%include "fastdds/dds/domain/DomainParticipantFactory.i"
%include "fastdds/dds/xtypes/type_representation/TypeObject.i"

// Log functionality not available in the bind
// Logs in the library is still available, only 'Log' class will not be available on Python
/*
%include "fastdds/dds/log/Log.i"
%include "fastdds/dds/log/OStreamConsumer.i"
%include "fastdds/dds/log/FileConsumer.i"
%include "fastdds/dds/log/StdoutErrConsumer.i"
%include "fastdds/dds/log/StdoutConsumer.i"
%include "fastdds/dds/log/Colors.i"
*/
22 changes: 11 additions & 11 deletions fastdds_python/src/swig/fastdds/dds/core/policy/QosPolicies.i
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
namespace eprosima {
namespace fastdds {
namespace dds {
struct ParticipantResourceLimitsQos : public fastrtps::rtps::RTPSParticipantAllocationAttributes {};
struct PropertyPolicyQos : public fastrtps::rtps::PropertyPolicy {};
struct ParticipantResourceLimitsQos : public fastdds::rtps::RTPSParticipantAllocationAttributes {};
struct PropertyPolicyQos : public fastdds::rtps::PropertyPolicy {};
}
}
}
Expand All @@ -63,21 +63,21 @@ class OctetResourceLimitedVectorStopIterator {};
class OctetResourceLimitedVectorIterator {
public:
OctetResourceLimitedVectorIterator(
eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>::iterator _cur,
eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>::iterator _end) : cur(_cur), end(_end) {}
eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>::iterator _cur,
eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>::iterator _end) : cur(_cur), end(_end) {}
OctetResourceLimitedVectorIterator* __iter__()
{
return this;
}
eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>::iterator cur;
eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>::iterator end;
eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>::iterator cur;
eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>::iterator end;
};
%}

// SWIG does not support templates in the generated binding,
// because not all output languages support them
// We must explicitly declare the specializations of the templates
%template(OctetResourceLimitedVector) eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>;
%template(OctetResourceLimitedVector) eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>;

%include "fastdds/dds/core/policy/QosPolicies.hpp"

Expand All @@ -96,7 +96,7 @@ public:

%extend OctetResourceLimitedVectorIterator
{
eprosima::fastrtps::rtps::octet __next__()
eprosima::fastdds::rtps::octet __next__()
{
if ($self->cur != $self->end)
{
Expand All @@ -108,7 +108,7 @@ public:
}
}

%exception eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>::__getitem__
%exception eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>::__getitem__
{
try
{
Expand All @@ -120,7 +120,7 @@ public:
}
}

%extend eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>
%extend eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>
{
OctetResourceLimitedVectorIterator __iter__()
{
Expand All @@ -133,7 +133,7 @@ public:
return self->size();
}

eprosima::fastrtps::rtps::octet __getitem__(int i)
eprosima::fastdds::rtps::octet __getitem__(int i)
{
if (self->size() <= i)
{
Expand Down
6 changes: 3 additions & 3 deletions fastdds_python/src/swig/fastdds/dds/publisher/DataWriter.i
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

// Deprecated function are ignored
%ignore eprosima::fastdds::dds::DataWriter::write_w_timestamp(void*, const InstanceHandle_t&,
const fastrtps::rtps::Time_t&);
const fastdds::rtps::Time_t&);
%ignore eprosima::fastdds::dds::DataWriter::register_instance_w_timestamp(void*,
const fastrtps::rtps::Time_t&);
const fastdds::rtps::Time_t&);
%ignore eprosima::fastdds::dds::DataWriter::unregister_instance_w_timestamp(void*, const InstanceHandle_t&,
const fastrtps::rtps::Time_t&);
const fastdds::rtps::Time_t&);

// Unsupported function on Python are ignored
%ignore loan_sample(void*&, LoanInitializationKind);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
%}

// Ignore overloaded constructor that have no effect on target language
%ignore eprosima::fastrtps::rtps::PropertyPolicy::PropertyPolicy(PropertyPolicy &&);
%ignore eprosima::fastrtps::rtps::PropertyPolicyHelper;
%ignore eprosima::fastdds::rtps::PropertyPolicy::PropertyPolicy(PropertyPolicy &&);
%ignore eprosima::fastdds::rtps::PropertyPolicyHelper;

%include "fastdds/rtps/attributes/PropertyPolicy.h"
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
%}

// Ignore deprecated methods
%ignore eprosima::fastrtps::rtps::DiscoverySettings::setStaticEndpointXMLFilename;
%ignore eprosima::fastrtps::rtps::DiscoverySettings::getStaticEndpointXMLFilename;
%ignore eprosima::fastrtps::rtps::RTPSParticipantAttributes;
%ignore eprosima::fastrtps::rtps::operator <<(std::ostream&, const DiscoveryProtocol&);;
%ignore eprosima::fastdds::rtps::DiscoverySettings::setStaticEndpointXMLFilename;
%ignore eprosima::fastdds::rtps::DiscoverySettings::getStaticEndpointXMLFilename;
%ignore eprosima::fastdds::rtps::RTPSParticipantAttributes;
%ignore eprosima::fastdds::rtps::operator <<(std::ostream&, const DiscoveryProtocol&);;

%include "fastdds/rtps/attributes/RTPSParticipantAttributes.h"
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
#include "fastdds/rtps/attributes/ReaderAttributes.h"
%}

%ignore eprosima::fastrtps::rtps::ReaderAttributes;
%ignore eprosima::fastdds::rtps::ReaderAttributes;

%include "fastdds/rtps/attributes/ReaderAttributes.h"
Loading