Skip to content

Commit ae4b597

Browse files
schlangsterschlangster
committed
Refactoring of engine mode names. X_queue -> X_concurrent.
1 parent 8912486 commit ae4b597

10 files changed

Lines changed: 62 additions & 54 deletions

File tree

‎include/react/detail/IReactiveEngine.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ struct EngineInterface
197197
///////////////////////////////////////////////////////////////////////////////////////////////////
198198
/// Engine traits
199199
///////////////////////////////////////////////////////////////////////////////////////////////////
200-
template <typename> struct EnableNodeUpdateTimer : std::false_type {};
201-
template <typename> struct EnableParallelUpdating : std::false_type {};
202-
template <typename> struct EnableConcurrentInput : std::false_type {};
200+
template <typename> struct NodeUpdateTimerEnabled : std::false_type {};
201+
template <typename> struct IsParallelEngine : std::false_type {};
202+
template <typename> struct IsConcurrentEngine : std::false_type {};
203203

204204
/****************************************/ REACT_IMPL_END /***************************************/
205205

‎include/react/detail/graph/EventNodes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class SignalNode;
3838
// Note: Weird design due to empty base class optimization
3939
template <typename D>
4040
struct BufferClearAccessPolicy :
41-
private ConditionalCriticalSection<tbb::spin_mutex, D::uses_parallel_updating>
41+
private ConditionalCriticalSection<tbb::spin_mutex, D::is_parallel>
4242
{
4343
template <typename F>
4444
void AccessBufferForClearing(const F& f) { this->Access(f); }

‎include/react/engine/PulsecountEngine.h‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class Node : public IReactiveNode
8888
ShiftMutexT ShiftMutex;
8989
NodeVector<Node> Successors;
9090

91-
ENodeState State { ENodeState::unchanged };
91+
ENodeState State = ENodeState::unchanged;
9292

9393
private:
9494
atomic<int> counter_ { 0 };
@@ -132,28 +132,33 @@ class QueuingEngine : public DefaultQueuingEngine<EngineBase,Turn> {};
132132
/*****************************************/ REACT_BEGIN /*****************************************/
133133

134134
struct parallel;
135-
struct parallel_queue;
135+
struct parallel_concurrent;
136136

137137
template <typename TMode>
138138
class PulsecountEngine;
139139

140140
template <> class PulsecountEngine<parallel> :
141141
public REACT_IMPL::pulsecount::BasicEngine {};
142142

143-
template <> class PulsecountEngine<parallel_queue> :
143+
template <> class PulsecountEngine<parallel_concurrent> :
144144
public REACT_IMPL::pulsecount::QueuingEngine {};
145145

146146
/******************************************/ REACT_END /******************************************/
147147

148148
/***************************************/ REACT_IMPL_BEGIN /**************************************/
149149

150-
template <typename> struct EnableNodeUpdateTimer;
151-
template <> struct EnableNodeUpdateTimer<PulsecountEngine<parallel>> : std::true_type {};
152-
template <> struct EnableNodeUpdateTimer<PulsecountEngine<parallel_queue>> : std::true_type {};
150+
template <typename> struct NodeUpdateTimerEnabled;
151+
template <> struct NodeUpdateTimerEnabled<PulsecountEngine<parallel>> : std::true_type {};
152+
template <> struct NodeUpdateTimerEnabled<PulsecountEngine<parallel_concurrent>> :
153+
std::true_type {};
153154

154-
template <typename> struct EnableParallelUpdating;
155-
template <> struct EnableParallelUpdating<PulsecountEngine<parallel>> : std::true_type {};
156-
template <> struct EnableParallelUpdating<PulsecountEngine<parallel_queue>> : std::true_type {};
155+
template <typename> struct IsParallelEngine;
156+
template <> struct IsParallelEngine<PulsecountEngine<parallel>> : std::true_type {};
157+
template <> struct IsParallelEngine<PulsecountEngine<parallel_concurrent>> : std::true_type {};
158+
159+
template <typename> struct IsConcurrentEngine;
160+
template <> struct IsConcurrentEngine<PulsecountEngine<parallel>> : std::false_type {};
161+
template <> struct IsConcurrentEngine<PulsecountEngine<parallel_concurrent>> : std::true_type {};
157162

158163
/****************************************/ REACT_IMPL_END /***************************************/
159164

‎include/react/engine/SubtreeEngine.h‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,28 +179,31 @@ class QueuingEngine : public DefaultQueuingEngine<EngineBase,Turn> {};
179179
/*****************************************/ REACT_BEGIN /*****************************************/
180180

181181
struct parallel;
182-
struct parallel_queue;
182+
struct parallel_concurrent;
183183

184184
template <typename TMode>
185185
class SubtreeEngine;
186186

187187
template <> class SubtreeEngine<parallel> :
188188
public REACT_IMPL::subtree::BasicEngine {};
189189

190-
template <> class SubtreeEngine<parallel_queue> :
190+
template <> class SubtreeEngine<parallel_concurrent> :
191191
public REACT_IMPL::subtree::QueuingEngine {};
192192

193193
/******************************************/ REACT_END /******************************************/
194194

195195
/***************************************/ REACT_IMPL_BEGIN /**************************************/
196196

197-
template <typename> struct EnableNodeUpdateTimer;
198-
template <> struct EnableNodeUpdateTimer<SubtreeEngine<parallel>> : std::true_type {};
199-
template <> struct EnableNodeUpdateTimer<SubtreeEngine<parallel_queue>> : std::true_type {};
197+
template <typename> struct NodeUpdateTimerEnabled;
198+
template <> struct NodeUpdateTimerEnabled<SubtreeEngine<parallel>> : std::true_type {};
199+
template <> struct NodeUpdateTimerEnabled<SubtreeEngine<parallel_concurrent>> : std::true_type {};
200200

201-
template <typename> struct EnableParallelUpdating;
202-
template <> struct EnableParallelUpdating<SubtreeEngine<parallel>> : std::true_type {};
203-
template <> struct EnableParallelUpdating<SubtreeEngine<parallel_queue>> : std::true_type {};
201+
template <typename> struct IsParallelEngine;
202+
template <> struct IsParallelEngine<SubtreeEngine<parallel>> : std::true_type {};
203+
template <> struct IsParallelEngine<SubtreeEngine<parallel_concurrent>> : std::true_type {};
204+
205+
template <typename> struct IsConcurrentEngine;
206+
template <> struct IsConcurrentEngine<SubtreeEngine<parallel_concurrent>> : std::true_type {};
204207

205208
/****************************************/ REACT_IMPL_END /***************************************/
206209

‎include/react/engine/ToposortEngine.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -202,40 +202,40 @@ class QueuingParEngine : public DefaultQueuingEngine<ParEngineBase,ExclusiveParT
202202
/*****************************************/ REACT_BEGIN /*****************************************/
203203

204204
struct sequential;
205-
struct sequential_queue;
205+
struct sequential_concurrent;
206206
struct parallel;
207-
struct parallel_queue;
207+
struct parallel_concurrent;
208208

209209
template <typename TMode>
210210
class ToposortEngine;
211211

212212
template <> class ToposortEngine<sequential> :
213213
public REACT_IMPL::toposort::BasicSeqEngine {};
214214

215-
template <> class ToposortEngine<sequential_queue> :
215+
template <> class ToposortEngine<sequential_concurrent> :
216216
public REACT_IMPL::toposort::QueuingSeqEngine {};
217217

218218
template <> class ToposortEngine<parallel> :
219219
public REACT_IMPL::toposort::BasicParEngine {};
220220

221-
template <> class ToposortEngine<parallel_queue> :
221+
template <> class ToposortEngine<parallel_concurrent> :
222222
public REACT_IMPL::toposort::QueuingParEngine {};
223223

224224
/******************************************/ REACT_END /******************************************/
225225

226226
/***************************************/ REACT_IMPL_BEGIN /**************************************/
227227

228-
template <typename> struct EnableNodeUpdateTimer;
229-
template <> struct EnableNodeUpdateTimer<ToposortEngine<parallel>> : std::true_type {};
230-
template <> struct EnableNodeUpdateTimer<ToposortEngine<parallel_queue>> : std::true_type {};
228+
template <typename> struct NodeUpdateTimerEnabled;
229+
template <> struct NodeUpdateTimerEnabled<ToposortEngine<parallel>> : std::true_type {};
230+
template <> struct NodeUpdateTimerEnabled<ToposortEngine<parallel_concurrent>> : std::true_type {};
231231

232-
template <typename> struct EnableParallelUpdating;
233-
template <> struct EnableParallelUpdating<ToposortEngine<parallel>> : std::true_type {};
234-
template <> struct EnableParallelUpdating<ToposortEngine<parallel_queue>> : std::true_type {};
232+
template <typename> struct IsParallelEngine;
233+
template <> struct IsParallelEngine<ToposortEngine<parallel>> : std::true_type {};
234+
template <> struct IsParallelEngine<ToposortEngine<parallel_concurrent>> : std::true_type {};
235235

236-
template <typename> struct EnableConcurrentInput;
237-
template <> struct EnableConcurrentInput<ToposortEngine<sequential_queue>> : std::true_type {};
238-
template <> struct EnableConcurrentInput<ToposortEngine<parallel_queue>> : std::true_type {};
236+
template <typename> struct IsConcurrentEngine;
237+
template <> struct IsConcurrentEngine<ToposortEngine<sequential_concurrent>> : std::true_type {};
238+
template <> struct IsConcurrentEngine<ToposortEngine<parallel_concurrent>> : std::true_type {};
239239

240240
/****************************************/ REACT_IMPL_END /***************************************/
241241

‎tests/src/EventStreamTestQ.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ namespace {
1515

1616
using namespace react;
1717

18-
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposortQ, EventStreamTest, ToposortEngine<sequential_queue>);
19-
INSTANTIATE_TYPED_TEST_CASE_P(ParToposortQ, EventStreamTest, ToposortEngine<parallel_queue>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(PulsecountQ, EventStreamTest, PulsecountEngine<parallel_queue>);
21-
INSTANTIATE_TYPED_TEST_CASE_P(SubtreeQ, EventStreamTest, SubtreeEngine<parallel_queue>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposortQ, EventStreamTest, ToposortEngine<sequential_concurrent>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(ParToposortQ, EventStreamTest, ToposortEngine<parallel_concurrent>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(PulsecountQ, EventStreamTest, PulsecountEngine<parallel_concurrent>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(SubtreeQ, EventStreamTest, SubtreeEngine<parallel_concurrent>);
2222

2323
} // ~namespace

‎tests/src/ObserverTestQ.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ namespace {
1515

1616
using namespace react;
1717

18-
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposortQ, ObserverTest, ToposortEngine<sequential_queue>);
19-
INSTANTIATE_TYPED_TEST_CASE_P(ParToposortQ, ObserverTest, ToposortEngine<parallel_queue>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(PulsecountQ, ObserverTest, PulsecountEngine<parallel_queue>);
21-
INSTANTIATE_TYPED_TEST_CASE_P(SubtreeQ, ObserverTest, SubtreeEngine<parallel_queue>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposortQ, ObserverTest, ToposortEngine<sequential_concurrent>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(ParToposortQ, ObserverTest, ToposortEngine<parallel_concurrent>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(PulsecountQ, ObserverTest, PulsecountEngine<parallel_concurrent>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(SubtreeQ, ObserverTest, SubtreeEngine<parallel_concurrent>);
2222

2323
} // ~namespace

‎tests/src/OperationsTestQ.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ namespace {
1515

1616
using namespace react;
1717

18-
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposortQ, OperationsTest, ToposortEngine<sequential_queue>);
19-
INSTANTIATE_TYPED_TEST_CASE_P(ParToposortQ, OperationsTest, ToposortEngine<parallel_queue>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(PulsecountQ, OperationsTest, PulsecountEngine<parallel_queue>);
21-
INSTANTIATE_TYPED_TEST_CASE_P(SubtreeQ, OperationsTest, SubtreeEngine<parallel_queue>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposortQ, OperationsTest, ToposortEngine<sequential_concurrent>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(ParToposortQ, OperationsTest, ToposortEngine<parallel_concurrent>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(PulsecountQ, OperationsTest, PulsecountEngine<parallel_concurrent>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(SubtreeQ, OperationsTest, SubtreeEngine<parallel_concurrent>);
2222

2323
} // ~namespace

‎tests/src/SignalTestQ.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ namespace {
1515

1616
using namespace react;
1717

18-
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposortQ, SignalTest, ToposortEngine<sequential_queue>);
19-
INSTANTIATE_TYPED_TEST_CASE_P(ParToposortQ, SignalTest, ToposortEngine<parallel_queue>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(PulsecountQ, SignalTest, PulsecountEngine<parallel_queue>);
21-
INSTANTIATE_TYPED_TEST_CASE_P(SubtreeQ, SignalTest, SubtreeEngine<parallel_queue>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposortQ, SignalTest, ToposortEngine<sequential_concurrent>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(ParToposortQ, SignalTest, ToposortEngine<parallel_concurrent>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(PulsecountQ, SignalTest, PulsecountEngine<parallel_concurrent>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(SubtreeQ, SignalTest, SubtreeEngine<parallel_concurrent>);
2222

2323
} // ~namespace

‎tests/src/TransactionTest.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ namespace {
1515

1616
using namespace react;
1717

18-
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposort, TransactionTest, ToposortEngine<sequential_queue>);
19-
INSTANTIATE_TYPED_TEST_CASE_P(ParToposort, TransactionTest, ToposortEngine<parallel_queue>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(Pulsecount, TransactionTest, PulsecountEngine<parallel_queue>);
21-
INSTANTIATE_TYPED_TEST_CASE_P(Subtree, TransactionTest, SubtreeEngine<parallel_queue>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposort, TransactionTest, ToposortEngine<sequential_concurrent>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(ParToposort, TransactionTest, ToposortEngine<parallel_concurrent>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(Pulsecount, TransactionTest, PulsecountEngine<parallel_concurrent>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(Subtree, TransactionTest, SubtreeEngine<parallel_concurrent>);
2222

2323
} // ~namespace

0 commit comments

Comments
 (0)