Skip to content

Commit 0071c2f

Browse files
simpsont-ocisimpsont-oci
committed
Resolving peer review comments: misc formatting cleanup, direct use of TimeDuration
1 parent 968edb3 commit 0071c2f

25 files changed

+48
-49
lines changed

‎performance-tests/bench/builder/BuilderProcess.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "BuilderProcess.h"
22

3-
#include "dds/DCPS/Service_Participant.h"
3+
#include <dds/DCPS/Service_Participant.h>
44

55
namespace Builder {
66

‎performance-tests/bench/builder/ConfigSectionManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "ConfigSectionManager.h"
22

3-
#include "dds/DCPS/Service_Participant.h"
3+
#include <dds/DCPS/Service_Participant.h>
44

55
#include "ace/Configuration.h"
66

‎performance-tests/bench/builder/DataReader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "DataReaderListener.h"
44

5-
#include "dds/DCPS/transport/framework/TransportRegistry.h"
5+
#include <dds/DCPS/transport/framework/TransportRegistry.h>
66

77
namespace Builder {
88

‎performance-tests/bench/builder/DataReader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "TopicManager.h"
44

5-
#include "dds/DdsDcpsSubscriptionC.h"
5+
#include <dds/DdsDcpsSubscriptionC.h>
66

77
namespace Builder {
88

‎performance-tests/bench/builder/DataWriter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "DataWriterListener.h"
44

5-
#include "dds/DCPS/transport/framework/TransportRegistry.h"
5+
#include <dds/DCPS/transport/framework/TransportRegistry.h>
66

77
namespace Builder {
88

‎performance-tests/bench/builder/DataWriter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "ListenerFactory.h"
55
#include "TopicManager.h"
66

7-
#include "dds/DdsDcpsPublicationC.h"
7+
#include <dds/DdsDcpsPublicationC.h>
88

99
#include <map>
1010

‎performance-tests/bench/builder/ListenerFactory.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <iostream>
99
#include <sstream>
1010

11-
#include "dds/DdsDcpsDomainC.h"
11+
#include <dds/DdsDcpsDomainC.h>
1212

1313
namespace Builder {
1414

‎performance-tests/bench/builder/Participant.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include "ParticipantListener.h"
44

5-
#include "dds/DCPS/Service_Participant.h"
6-
#include "dds/DCPS/transport/framework/TransportRegistry.h"
5+
#include <dds/DCPS/Service_Participant.h>
6+
#include <dds/DCPS/transport/framework/TransportRegistry.h>
77

88
namespace Builder {
99

‎performance-tests/bench/builder/Participant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "SubscriberManager.h"
88
#include "TopicManager.h"
99

10-
#include "dds/DdsDcpsDomainC.h"
10+
#include <dds/DdsDcpsDomainC.h>
1111

1212
namespace Builder {
1313

‎performance-tests/bench/builder/Publisher.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include "PublisherListener.h"
44

5-
#include "dds/DdsDcpsDomainC.h"
6-
#include "dds/DCPS/transport/framework/TransportRegistry.h"
5+
#include <dds/DdsDcpsDomainC.h>
6+
#include <dds/DCPS/transport/framework/TransportRegistry.h>
77

88
namespace Builder {
99

‎performance-tests/bench/builder/Subscriber.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include "SubscriberListener.h"
44

5-
#include "dds/DdsDcpsDomainC.h"
6-
#include "dds/DCPS/transport/framework/TransportRegistry.h"
5+
#include <dds/DdsDcpsDomainC.h>
6+
#include <dds/DCPS/transport/framework/TransportRegistry.h>
77

88
namespace Builder {
99

‎performance-tests/bench/builder/Topic.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include "TopicListener.h"
44
#include "TypeSupportRegistry.h"
55

6-
#include "dds/DdsDcpsDomainC.h"
7-
#include "dds/DCPS/transport/framework/TransportRegistry.h"
6+
#include <dds/DdsDcpsDomainC.h>
7+
#include <dds/DCPS/transport/framework/TransportRegistry.h>
88

99
namespace Builder {
1010

‎performance-tests/bench/builder/Topic.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "dds/DdsDcpsTopicC.h"
3+
#include <dds/DdsDcpsTopicC.h>
44

55
#include "Common.h"
66
#include "ListenerFactory.h"

‎performance-tests/bench/builder/TypeSupportRegistry.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include "Common.h"
4-
#include "dds/DdsDcpsTopicC.h"
4+
#include <dds/DdsDcpsTopicC.h>
55

66
#include <map>
77
#include <mutex>

‎performance-tests/bench/worker/ForwardAction.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
namespace {
77

8-
const ACE_Time_Value ZERO(0, 0);
98
const size_t DEFAULT_QUEUE_SIZE(10u);
109

1110
}
@@ -108,7 +107,7 @@ bool ForwardAction::init(const ActionConfig& config, ActionReport& report,
108107
// hence 0 and 1 are not valid vector sizes and will not work
109108
data_queue_.resize(queue_size > 0 ? queue_size + 1 : 2);
110109

111-
event_ = OpenDDS::DCPS::make_rch<MemFunEvent<ForwardAction> >(shared_from_this(), &ForwardAction::do_writes);
110+
event_ = OpenDDS::DCPS::make_rch<MemFunEvent<ForwardAction>>(shared_from_this(), &ForwardAction::do_writes);
112111

113112
return true;
114113
}

‎performance-tests/bench/worker/ForwardAction.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "dds/DCPS/EventDispatcher.h"
3+
#include <dds/DCPS/EventDispatcher.h>
44

55
#include "Action.h"
66
#include "DataHandler.h"

‎performance-tests/bench/worker/MemFunEvent.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "dds/DCPS/EventDispatcher.h"
3+
#include <dds/DCPS/EventDispatcher.h>
44

55
#include <memory>
66

‎performance-tests/bench/worker/ReadAction.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "MemFunEvent.h"
44
#include "util.h"
55

6-
#include "dds/DCPS/WaitSet.h"
6+
#include <dds/DCPS/WaitSet.h>
77

88
namespace Bench {
99

@@ -48,7 +48,7 @@ bool ReadAction::init(const ActionConfig& config, ActionReport& report, Builder:
4848
double period = 1.0 / read_frequency_prop->value.double_prop();
4949
int64_t sec = static_cast<int64_t>(period);
5050
uint64_t usec = static_cast<uint64_t>((period - static_cast<double>(sec)) * 1000000u);
51-
read_period_ = ACE_Time_Value(sec, static_cast<suseconds_t>(usec));
51+
read_period_ = OpenDDS::DCPS::TimeDuration(sec, static_cast<suseconds_t>(usec));
5252
}
5353

5454
// Then check period as double (seconds)
@@ -57,13 +57,13 @@ bool ReadAction::init(const ActionConfig& config, ActionReport& report, Builder:
5757
double period = read_period_prop->value.double_prop();
5858
int64_t sec = static_cast<int64_t>(period);
5959
uint64_t usec = static_cast<uint64_t>((period - static_cast<double>(sec)) * 1000000u);
60-
read_period_ = ACE_Time_Value(sec, static_cast<suseconds_t>(usec));
60+
read_period_ = OpenDDS::DCPS::TimeDuration(sec, static_cast<suseconds_t>(usec));
6161
}
6262

6363
// Finally check period as TimeStamp
6464
read_period_prop = get_property(config.params, "read_period", Builder::PVK_TIME);
6565
if (read_period_prop) {
66-
read_period_ = ACE_Time_Value(read_period_prop->value.time_prop().sec, static_cast<suseconds_t>(read_period_prop->value.time_prop().nsec / 1000u));
66+
read_period_ = OpenDDS::DCPS::TimeDuration(read_period_prop->value.time_prop().sec, static_cast<suseconds_t>(read_period_prop->value.time_prop().nsec / 1000u));
6767
}
6868

6969
event_ = OpenDDS::DCPS::make_rch<MemFunEvent<ReadAction> >(shared_from_this(), &ReadAction::do_read);
@@ -127,7 +127,7 @@ void ReadAction::do_read()
127127
bool_guard bg(in_do_read_, cv_);
128128
if (started_ && !stopped_) {
129129
DDS::ConditionSeq active;
130-
const DDS::Duration_t duration = {static_cast<CORBA::Long>(read_period_.sec()), static_cast<CORBA::ULong>(read_period_.usec() * 1000)};
130+
const DDS::Duration_t duration = read_period_.to_dds_duration();
131131
DDS::WaitSet_var ws_copy= ws_;
132132
DDS::ReturnCode_t ret;
133133

‎performance-tests/bench/worker/ReadAction.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
#include "BenchTypeSupportImpl.h"
77

8-
#include "dds/DCPS/GuardCondition.h"
9-
10-
#include "dds/DCPS/EventDispatcher.h"
8+
#include <dds/DCPS/EventDispatcher.h>
9+
#include <dds/DCPS/GuardCondition.h>
1110

1211
namespace Bench {
1312

@@ -34,7 +33,7 @@ class ReadAction : public virtual Action, public std::enable_shared_from_this<Re
3433
DataDataReader_var data_dr_;
3534
DDS::WaitSet_var ws_;
3635
WorkerDataReaderListener* dr_listener_;
37-
ACE_Time_Value read_period_;
36+
OpenDDS::DCPS::TimeDuration read_period_;
3837
OpenDDS::DCPS::EventBase_rch event_;
3938
bool in_do_read_;
4039
};

‎performance-tests/bench/worker/SetCftParametersAction.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ bool SetCftParametersAction::init(const ActionConfig& config, ActionReport& repo
9595
double period = 1.0 / set_frequency_prop->value.double_prop();
9696
int64_t sec = static_cast<int64_t>(period);
9797
uint64_t usec = static_cast<uint64_t>((period - static_cast<double>(sec)) * 1000000u);
98-
set_period_ = ACE_Time_Value(sec, static_cast<suseconds_t>(usec));
98+
set_period_ = OpenDDS::DCPS::TimeDuration(sec, static_cast<suseconds_t>(usec));
9999
}
100100

101101
// Then check period as double (seconds)
@@ -104,13 +104,13 @@ bool SetCftParametersAction::init(const ActionConfig& config, ActionReport& repo
104104
double period = set_period_prop->value.double_prop();
105105
int64_t sec = static_cast<int64_t>(period);
106106
uint64_t usec = static_cast<uint64_t>((period - static_cast<double>(sec)) * 1000000u);
107-
set_period_ = ACE_Time_Value(sec, static_cast<suseconds_t>(usec));
107+
set_period_ = OpenDDS::DCPS::TimeDuration(sec, static_cast<suseconds_t>(usec));
108108
}
109109

110110
// Finally check period as TimeStamp
111111
set_period_prop = get_property(config.params, "set_period", Builder::PVK_TIME);
112112
if (set_period_prop) {
113-
set_period_ = ACE_Time_Value(set_period_prop->value.time_prop().sec, static_cast<suseconds_t>(set_period_prop->value.time_prop().nsec / 1000u));
113+
set_period_ = OpenDDS::DCPS::TimeDuration(set_period_prop->value.time_prop().sec, static_cast<suseconds_t>(set_period_prop->value.time_prop().nsec / 1000u));
114114
}
115115

116116
event_ = OpenDDS::DCPS::make_rch<MemFunEvent<SetCftParametersAction> >(shared_from_this(), &SetCftParametersAction::do_set_expression_parameters);
@@ -157,7 +157,7 @@ void SetCftParametersAction::do_set_expression_parameters()
157157
}
158158
#endif
159159
}
160-
last_scheduled_time_ += OpenDDS::DCPS::TimeDuration(set_period_);
160+
last_scheduled_time_ += set_period_;
161161
event_dispatcher_->schedule(event_, last_scheduled_time_);
162162
}
163163
}

‎performance-tests/bench/worker/SetCftParametersAction.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#pragma once
22

3-
#include "dds/DdsDcpsTopicC.h"
4-
53
#include "Action.h"
6-
#include "dds/DCPS/EventDispatcher.h"
4+
75
#include "BenchTypeSupportImpl.h"
86

7+
#include <dds/DdsDcpsTopicC.h>
8+
#include <dds/DCPS/EventDispatcher.h>
9+
910
#include <random>
1011
#include <vector>
1112

@@ -27,7 +28,7 @@ class SetCftParametersAction : public virtual Action, public std::enable_shared_
2728
std::mutex mutex_;
2829
OpenDDS::DCPS::EventDispatcher_rch event_dispatcher_;
2930
bool started_, stopped_;
30-
ACE_Time_Value set_period_;
31+
OpenDDS::DCPS::TimeDuration set_period_;
3132
size_t max_count_;
3233
size_t param_count_;
3334
bool random_order_;

‎performance-tests/bench/worker/Utils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <map>
55
#include <vector>
66

7-
#include "dds/DCPS/DCPS_Utils.h"
7+
#include <dds/DCPS/DCPS_Utils.h>
88

99
// QosProfile
1010

‎performance-tests/bench/worker/WorkerDataReaderListener.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "DataReaderListener.h"
55
#include "PropertyStatBlock.h"
66

7-
#include "dds/DCPS/DisjointSequence.h"
7+
#include <dds/DCPS/DisjointSequence.h>
88

99
#include <unordered_map>
1010
#include <condition_variable>

‎performance-tests/bench/worker/WriteAction.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ bool WriteAction::init(const ActionConfig& config, ActionReport& report, Builder
108108
double period = 1.0 / write_frequency_prop->value.double_prop();
109109
int64_t sec = static_cast<int64_t>(period);
110110
uint64_t usec = static_cast<uint64_t>((period - static_cast<double>(sec)) * 1000000u);
111-
write_period_ = ACE_Time_Value(sec, static_cast<suseconds_t>(usec));
111+
write_period_ = OpenDDS::DCPS::TimeDuration(sec, static_cast<suseconds_t>(usec));
112112
}
113113

114114
// Then check period as double (seconds)
@@ -117,13 +117,13 @@ bool WriteAction::init(const ActionConfig& config, ActionReport& report, Builder
117117
double period = write_period_prop->value.double_prop();
118118
int64_t sec = static_cast<int64_t>(period);
119119
uint64_t usec = static_cast<uint64_t>((period - static_cast<double>(sec)) * 1000000u);
120-
write_period_ = ACE_Time_Value(sec, static_cast<suseconds_t>(usec));
120+
write_period_ = OpenDDS::DCPS::TimeDuration(sec, static_cast<suseconds_t>(usec));
121121
}
122122

123123
// Finally check period as TimeStamp
124124
write_period_prop = get_property(config.params, "write_period", Builder::PVK_TIME);
125125
if (write_period_prop) {
126-
write_period_ = ACE_Time_Value(write_period_prop->value.time_prop().sec, static_cast<suseconds_t>(write_period_prop->value.time_prop().nsec / 1000u));
126+
write_period_ = OpenDDS::DCPS::TimeDuration(write_period_prop->value.time_prop().sec, static_cast<suseconds_t>(write_period_prop->value.time_prop().nsec / 1000u));
127127
}
128128

129129
auto final_wait_for_ack_prop = get_property(config.params, "final_wait_for_ack", Builder::PVK_DOUBLE);
@@ -211,10 +211,10 @@ void WriteAction::do_write()
211211
}
212212

213213
if (relative_scheduling_) {
214-
last_scheduled_time_ = OpenDDS::DCPS::MonotonicTimePoint::now() + OpenDDS::DCPS::TimeDuration(write_period_);
215-
} else {
216-
last_scheduled_time_ += OpenDDS::DCPS::TimeDuration(write_period_);
214+
last_scheduled_time_ = OpenDDS::DCPS::MonotonicTimePoint::now();
217215
}
216+
last_scheduled_time_ += write_period_;
217+
218218
event_dispatcher_->schedule(event_, last_scheduled_time_);
219219
}
220220
}

‎performance-tests/bench/worker/WriteAction.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include "Action.h"
4-
#include "dds/DCPS/EventDispatcher.h"
4+
#include <dds/DCPS/EventDispatcher.h>
55
#include "BenchTypeSupportImpl.h"
66

77
#include <random>
@@ -26,7 +26,7 @@ class WriteAction : public virtual Action, public std::enable_shared_from_this<W
2626
bool started_, stopped_, relative_scheduling_;
2727
DataDataWriter_var data_dw_;
2828
Data data_;
29-
ACE_Time_Value write_period_;
29+
OpenDDS::DCPS::TimeDuration write_period_;
3030
OpenDDS::DCPS::MonotonicTimePoint last_scheduled_time_;
3131
size_t max_count_;
3232
size_t new_key_count_;

0 commit comments

Comments
 (0)