Skip to content

Commit

Permalink
Refs #20567: Make TimeConversion private
Browse files Browse the repository at this point in the history
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
  • Loading branch information
EduPonz committed Mar 11, 2024
1 parent e3c515b commit 531e8d3
Show file tree
Hide file tree
Showing 31 changed files with 239 additions and 295 deletions.
47 changes: 0 additions & 47 deletions include/fastdds/rtps/rtps_all.h

This file was deleted.

25 changes: 0 additions & 25 deletions include/fastrtps/rtps/rtps_all.h

This file was deleted.

160 changes: 0 additions & 160 deletions include/fastrtps/utils/TimeConversion.h

This file was deleted.

12 changes: 6 additions & 6 deletions src/cpp/fastdds/publisher/DataWriterImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
#include <fastdds/rtps/RTPSDomain.h>
#include <fastdds/rtps/writer/RTPSWriter.h>
#include <fastdds/rtps/writer/StatefulWriter.h>
#include <fastrtps/utils/TimeConversion.h>

#include <rtps/builtin/liveliness/WLP.h>
#include <rtps/DataSharing/DataSharingPayloadPool.hpp>
#include <rtps/history/CacheChangePool.h>
#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/RTPSDomainImpl.hpp>
#include <utils/TimeConversion.hpp>

#ifdef FASTDDS_STATISTICS
#include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
Expand Down Expand Up @@ -462,7 +462,7 @@ ReturnCode_t DataWriterImpl::loan_sample(
{
// Block lowlevel writer
auto max_blocking_time = steady_clock::now() +
microseconds(::TimeConv::Time_t2MicroSecondsInt64(qos_.reliability().max_blocking_time));
microseconds(rtps::TimeConv::Time_t2MicroSecondsInt64(qos_.reliability().max_blocking_time));

// Type should be plain and have space for the representation header
if (!type_->is_plain() || SerializedPayload_t::representation_header_size > type_->m_typeSize)
Expand Down Expand Up @@ -764,7 +764,7 @@ InstanceHandle_t DataWriterImpl::do_register_instance(

// Block lowlevel writer
auto max_blocking_time = std::chrono::steady_clock::now() +
std::chrono::microseconds(::TimeConv::Time_t2MicroSecondsInt64(qos_.reliability().max_blocking_time));
std::chrono::microseconds(rtps::TimeConv::Time_t2MicroSecondsInt64(qos_.reliability().max_blocking_time));

#if HAVE_STRICT_REALTIME
std::unique_lock<RecursiveTimedMutex> lock(writer_->getMutex(), std::defer_lock);
Expand Down Expand Up @@ -882,7 +882,7 @@ ReturnCode_t DataWriterImpl::get_key_value(
// Block lowlevel writer
#if HAVE_STRICT_REALTIME
auto max_blocking_time = std::chrono::steady_clock::now() +
std::chrono::microseconds(::TimeConv::Time_t2MicroSecondsInt64(qos_.reliability().max_blocking_time));
std::chrono::microseconds(rtps::TimeConv::Time_t2MicroSecondsInt64(qos_.reliability().max_blocking_time));
std::unique_lock<RecursiveTimedMutex> lock(writer_->getMutex(), std::defer_lock);
if (!lock.try_lock_until(max_blocking_time))
{
Expand Down Expand Up @@ -943,7 +943,7 @@ ReturnCode_t DataWriterImpl::perform_create_new_change(
{
// Block lowlevel writer
auto max_blocking_time = steady_clock::now() +
microseconds(::TimeConv::Time_t2MicroSecondsInt64(qos_.reliability().max_blocking_time));
microseconds(rtps::TimeConv::Time_t2MicroSecondsInt64(qos_.reliability().max_blocking_time));

#if HAVE_STRICT_REALTIME
std::unique_lock<RecursiveTimedMutex> lock(writer_->getMutex(), std::defer_lock);
Expand Down Expand Up @@ -1378,7 +1378,7 @@ ReturnCode_t DataWriterImpl::wait_for_acknowledgments(

// Block low-level writer
auto max_blocking_time = steady_clock::now() +
microseconds(::TimeConv::Time_t2MicroSecondsInt64(max_wait));
microseconds(rtps::TimeConv::Time_t2MicroSecondsInt64(max_wait));

# if HAVE_STRICT_REALTIME
std::unique_lock<RecursiveTimedMutex> lock(writer_->getMutex(), std::defer_lock);
Expand Down
10 changes: 5 additions & 5 deletions src/cpp/fastdds/subscriber/DataReaderImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#endif // if defined(__has_include) && __has_include(<version>)

#include <fastdds/config.h>
#include <fastdds/core/condition/StatusConditionImpl.hpp>
#include <fastdds/core/policy/QosPolicyUtils.hpp>
#include <fastdds/dds/core/StackAllocatedSequence.hpp>
#include <fastdds/dds/domain/DomainParticipant.hpp>
#include <fastdds/dds/log/Log.hpp>
Expand All @@ -33,24 +35,22 @@
#include <fastdds/dds/subscriber/SubscriberListener.hpp>
#include <fastdds/dds/topic/Topic.hpp>
#include <fastdds/dds/topic/TypeSupport.hpp>
#include <fastdds/domain/DomainParticipantImpl.hpp>
#include <fastdds/rtps/participant/RTPSParticipant.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastdds/rtps/RTPSDomain.h>
#include <fastrtps/utils/TimeConversion.h>

#include <fastdds/core/condition/StatusConditionImpl.hpp>
#include <fastdds/core/policy/QosPolicyUtils.hpp>
#include <fastdds/domain/DomainParticipantImpl.hpp>
#include <fastdds/subscriber/DataReaderImpl.hpp>
#include <fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp>
#include <fastdds/subscriber/DataReaderImpl/StateFilter.hpp>
#include <fastdds/subscriber/ReadConditionImpl.hpp>
#include <fastdds/subscriber/SubscriberImpl.hpp>
#include <fastdds/topic/ContentFilteredTopicImpl.hpp>

#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <utils/TimeConversion.hpp>

#ifdef FASTDDS_STATISTICS
#include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
Expand Down
11 changes: 7 additions & 4 deletions src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
#include <fastdds/rtps/builtin/data/WriterProxyData.h>
#include <fastdds/rtps/common/VendorId_t.hpp>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastrtps/utils/TimeConversion.h>

#include <rtps/builtin/BuiltinProtocols.h>
#include <rtps/builtin/discovery/participant/PDPSimple.h>
#include <rtps/network/NetworkFactory.h>
#include <rtps/transport/shared_mem/SHMLocator.hpp>
#include <utils/TimeConversion.hpp>

#include "ProxyDataFilters.hpp"
#include "ProxyHashTables.hpp"
Expand Down Expand Up @@ -604,7 +604,7 @@ bool ParticipantProxyData::readFromCDRMessage(

m_leaseDuration = p.time.to_duration_t();
lease_duration_ =
std::chrono::microseconds(TimeConv::Duration_t2MicroSecondsInt64(
std::chrono::microseconds(fastdds::rtps::TimeConv::Duration_t2MicroSecondsInt64(
m_leaseDuration));
break;
}
Expand Down Expand Up @@ -767,7 +767,9 @@ void ParticipantProxyData::copy(
default_locators = pdata.default_locators;
m_participantName = pdata.m_participantName;
m_leaseDuration = pdata.m_leaseDuration;
lease_duration_ = std::chrono::microseconds(TimeConv::Duration_t2MicroSecondsInt64(pdata.m_leaseDuration));
lease_duration_ =
std::chrono::microseconds(fastdds::rtps::TimeConv::Duration_t2MicroSecondsInt64(
pdata.m_leaseDuration));
m_key = pdata.m_key;
isAlive = pdata.isAlive;
m_userData = pdata.m_userData;
Expand Down Expand Up @@ -801,7 +803,8 @@ bool ParticipantProxyData::updateData(
security_attributes_ = pdata.security_attributes_;
plugin_security_attributes_ = pdata.plugin_security_attributes_;
#endif // if HAVE_SECURITY
auto new_lease_duration = std::chrono::microseconds(TimeConv::Duration_t2MicroSecondsInt64(m_leaseDuration));
auto new_lease_duration =
std::chrono::microseconds(fastdds::rtps::TimeConv::Duration_t2MicroSecondsInt64(m_leaseDuration));
if (lease_duration_event != nullptr)
{
if (new_lease_duration < lease_duration_)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastrtps/utils/TimeConversion.h>

#include <rtps/builtin/discovery/endpoint/EDP.h>
#include <rtps/builtin/discovery/participant/PDP.h>
Expand Down
Loading

0 comments on commit 531e8d3

Please sign in to comment.