From 5d505d9c7dbbe365f373b60a095f162ab86a4d27 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Fri, 11 Aug 2023 17:52:47 +0100 Subject: [PATCH 01/17] Test std::any performance --- include/dspatch/SignalBus.h | 30 +++++++++++++++--------------- src/internal/CircuitThread.cpp | 1 - subprojects/fast_any | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/include/dspatch/SignalBus.h b/include/dspatch/SignalBus.h index dfd08629..cb86d7c4 100644 --- a/include/dspatch/SignalBus.h +++ b/include/dspatch/SignalBus.h @@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include +#include #include @@ -57,7 +57,7 @@ class DLLEXPORT SignalBus final inline void SetSignalCount( int signalCount ); inline int GetSignalCount() const; - inline fast_any::fast_any* GetSignal( int signalIndex ); + inline std::any* GetSignal( int signalIndex ); inline bool HasValue( int signalIndex ) const; @@ -70,15 +70,15 @@ class DLLEXPORT SignalBus final template inline void MoveValue( int signalIndex, ValueType&& newValue ); - inline void SetSignal( int toSignalIndex, const fast_any::fast_any& fromSignal ); - inline void MoveSignal( int toSignalIndex, fast_any::fast_any& fromSignal ); + inline void SetSignal( int toSignalIndex, const std::any& fromSignal ); + inline void MoveSignal( int toSignalIndex, std::any& fromSignal ); inline void ClearAllValues(); - inline fast_any::fast_any_type GetType( int signalIndex ) const; + inline const std::type_info& GetType( int signalIndex ) const; private: - std::vector _signals; + std::vector _signals; }; inline SignalBus::SignalBus() = default; @@ -99,7 +99,7 @@ inline int SignalBus::GetSignalCount() const return (int)_signals.size(); } -inline fast_any::fast_any* SignalBus::GetSignal( int signalIndex ) +inline std::any* SignalBus::GetSignal( int signalIndex ) { if ( (size_t)signalIndex < _signals.size() ) { @@ -128,7 +128,7 @@ inline ValueType* SignalBus::GetValue( int signalIndex ) const { if ( (size_t)signalIndex < _signals.size() ) { - return _signals[signalIndex].as(); + return const_cast( &std::any_cast( _signals[signalIndex] ) ); } else { @@ -141,7 +141,7 @@ inline void SignalBus::SetValue( int signalIndex, const ValueType& newValue ) { if ( (size_t)signalIndex < _signals.size() ) { - _signals[signalIndex].emplace( newValue ); + _signals[signalIndex].emplace( newValue ); } } @@ -150,19 +150,19 @@ inline void SignalBus::MoveValue( int signalIndex, ValueType&& newValue ) { if ( (size_t)signalIndex < _signals.size() ) { - _signals[signalIndex].emplace( std::move( newValue ) ); + _signals[signalIndex].emplace( std::move( newValue ) ); } } -inline void SignalBus::SetSignal( int toSignalIndex, const fast_any::fast_any& fromSignal ) +inline void SignalBus::SetSignal( int toSignalIndex, const std::any& fromSignal ) { if ( (size_t)toSignalIndex < _signals.size() ) { - _signals[toSignalIndex].emplace( fromSignal ); + _signals[toSignalIndex] = fromSignal; } } -inline void SignalBus::MoveSignal( int toSignalIndex, fast_any::fast_any& fromSignal ) +inline void SignalBus::MoveSignal( int toSignalIndex, std::any& fromSignal ) { if ( (size_t)toSignalIndex < _signals.size() ) { @@ -178,7 +178,7 @@ inline void SignalBus::ClearAllValues() } } -inline fast_any::fast_any_type SignalBus::GetType( int signalIndex ) const +inline const std::type_info& SignalBus::GetType( int signalIndex ) const { if ( (size_t)signalIndex < _signals.size() ) { @@ -186,7 +186,7 @@ inline fast_any::fast_any_type SignalBus::GetType( int signalIndex ) const } else { - return fast_any::type_id; + return typeid( void ); } } diff --git a/src/internal/CircuitThread.cpp b/src/internal/CircuitThread.cpp index 93291549..c1f4d475 100644 --- a/src/internal/CircuitThread.cpp +++ b/src/internal/CircuitThread.cpp @@ -117,7 +117,6 @@ void CircuitThread::SyncAndResume( DSPatch::Component::TickMode mode ) std::unique_lock lock( _resumeMutex ); - // cppcheck-suppress knownConditionTrueFalse if ( !_gotSync ) // if haven't already got sync { _syncCondt.wait( lock ); // wait for sync diff --git a/subprojects/fast_any b/subprojects/fast_any index 5fa78cb4..33bad8b0 160000 --- a/subprojects/fast_any +++ b/subprojects/fast_any @@ -1 +1 @@ -Subproject commit 5fa78cb43d2a66338f543bc806ed450242da96d9 +Subproject commit 33bad8b01e19e410452a8b9b16a054c1d0af0165 From 7dfde3d2d46d525e3b3232c46a65d28d8f87de51 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Fri, 11 Aug 2023 21:35:33 +0100 Subject: [PATCH 02/17] Update fast_any --- include/dspatch/SignalBus.h | 10 +++++----- subprojects/fast_any | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/dspatch/SignalBus.h b/include/dspatch/SignalBus.h index dfd08629..8150a023 100644 --- a/include/dspatch/SignalBus.h +++ b/include/dspatch/SignalBus.h @@ -75,7 +75,7 @@ class DLLEXPORT SignalBus final inline void ClearAllValues(); - inline fast_any::fast_any_type GetType( int signalIndex ) const; + inline const fast_any::type_info& GetType( int signalIndex ) const; private: std::vector _signals; @@ -141,7 +141,7 @@ inline void SignalBus::SetValue( int signalIndex, const ValueType& newValue ) { if ( (size_t)signalIndex < _signals.size() ) { - _signals[signalIndex].emplace( newValue ); + _signals[signalIndex].emplace( newValue ); } } @@ -150,7 +150,7 @@ inline void SignalBus::MoveValue( int signalIndex, ValueType&& newValue ) { if ( (size_t)signalIndex < _signals.size() ) { - _signals[signalIndex].emplace( std::move( newValue ) ); + _signals[signalIndex].emplace( std::move( newValue ) ); } } @@ -158,7 +158,7 @@ inline void SignalBus::SetSignal( int toSignalIndex, const fast_any::fast_any& f { if ( (size_t)toSignalIndex < _signals.size() ) { - _signals[toSignalIndex].emplace( fromSignal ); + _signals[toSignalIndex] = fromSignal; } } @@ -178,7 +178,7 @@ inline void SignalBus::ClearAllValues() } } -inline fast_any::fast_any_type SignalBus::GetType( int signalIndex ) const +inline const fast_any::type_info& SignalBus::GetType( int signalIndex ) const { if ( (size_t)signalIndex < _signals.size() ) { diff --git a/subprojects/fast_any b/subprojects/fast_any index 5fa78cb4..22616a26 160000 --- a/subprojects/fast_any +++ b/subprojects/fast_any @@ -1 +1 @@ -Subproject commit 5fa78cb43d2a66338f543bc806ed450242da96d9 +Subproject commit 22616a26a132ffd48de8437d27fb8cbd6cf7a670 From 7f32447506f97c88c5ac78eed9461a0f2d9b4ab3 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Fri, 11 Aug 2023 21:39:35 +0100 Subject: [PATCH 03/17] Update fast_any --- include/dspatch/SignalBus.h | 24 ++++++++++++------------ subprojects/fast_any | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/dspatch/SignalBus.h b/include/dspatch/SignalBus.h index dfd08629..6da5d97e 100644 --- a/include/dspatch/SignalBus.h +++ b/include/dspatch/SignalBus.h @@ -57,7 +57,7 @@ class DLLEXPORT SignalBus final inline void SetSignalCount( int signalCount ); inline int GetSignalCount() const; - inline fast_any::fast_any* GetSignal( int signalIndex ); + inline fast_any::any* GetSignal( int signalIndex ); inline bool HasValue( int signalIndex ) const; @@ -70,15 +70,15 @@ class DLLEXPORT SignalBus final template inline void MoveValue( int signalIndex, ValueType&& newValue ); - inline void SetSignal( int toSignalIndex, const fast_any::fast_any& fromSignal ); - inline void MoveSignal( int toSignalIndex, fast_any::fast_any& fromSignal ); + inline void SetSignal( int toSignalIndex, const fast_any::any& fromSignal ); + inline void MoveSignal( int toSignalIndex, fast_any::any& fromSignal ); inline void ClearAllValues(); - inline fast_any::fast_any_type GetType( int signalIndex ) const; + inline const fast_any::type_info& GetType( int signalIndex ) const; private: - std::vector _signals; + std::vector _signals; }; inline SignalBus::SignalBus() = default; @@ -99,7 +99,7 @@ inline int SignalBus::GetSignalCount() const return (int)_signals.size(); } -inline fast_any::fast_any* SignalBus::GetSignal( int signalIndex ) +inline fast_any::any* SignalBus::GetSignal( int signalIndex ) { if ( (size_t)signalIndex < _signals.size() ) { @@ -141,7 +141,7 @@ inline void SignalBus::SetValue( int signalIndex, const ValueType& newValue ) { if ( (size_t)signalIndex < _signals.size() ) { - _signals[signalIndex].emplace( newValue ); + _signals[signalIndex].emplace( newValue ); } } @@ -150,19 +150,19 @@ inline void SignalBus::MoveValue( int signalIndex, ValueType&& newValue ) { if ( (size_t)signalIndex < _signals.size() ) { - _signals[signalIndex].emplace( std::move( newValue ) ); + _signals[signalIndex].emplace( std::move( newValue ) ); } } -inline void SignalBus::SetSignal( int toSignalIndex, const fast_any::fast_any& fromSignal ) +inline void SignalBus::SetSignal( int toSignalIndex, const fast_any::any& fromSignal ) { if ( (size_t)toSignalIndex < _signals.size() ) { - _signals[toSignalIndex].emplace( fromSignal ); + _signals[toSignalIndex] = fromSignal; } } -inline void SignalBus::MoveSignal( int toSignalIndex, fast_any::fast_any& fromSignal ) +inline void SignalBus::MoveSignal( int toSignalIndex, fast_any::any& fromSignal ) { if ( (size_t)toSignalIndex < _signals.size() ) { @@ -178,7 +178,7 @@ inline void SignalBus::ClearAllValues() } } -inline fast_any::fast_any_type SignalBus::GetType( int signalIndex ) const +inline const fast_any::type_info& SignalBus::GetType( int signalIndex ) const { if ( (size_t)signalIndex < _signals.size() ) { diff --git a/subprojects/fast_any b/subprojects/fast_any index 5fa78cb4..f9abdd09 160000 --- a/subprojects/fast_any +++ b/subprojects/fast_any @@ -1 +1 @@ -Subproject commit 5fa78cb43d2a66338f543bc806ed450242da96d9 +Subproject commit f9abdd09a6c3c60f2670b5e39a365b4111880f20 From b71ddb621d4b9b10df859b5656239aa18d31c7cb Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Fri, 11 Aug 2023 21:43:29 +0100 Subject: [PATCH 04/17] Update fast_any --- include/dspatch/SignalBus.h | 26 +++++++++++++------------- subprojects/fast_any | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/dspatch/SignalBus.h b/include/dspatch/SignalBus.h index dfd08629..0a35962f 100644 --- a/include/dspatch/SignalBus.h +++ b/include/dspatch/SignalBus.h @@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include +#include #include @@ -57,7 +57,7 @@ class DLLEXPORT SignalBus final inline void SetSignalCount( int signalCount ); inline int GetSignalCount() const; - inline fast_any::fast_any* GetSignal( int signalIndex ); + inline fast_any::any* GetSignal( int signalIndex ); inline bool HasValue( int signalIndex ) const; @@ -70,15 +70,15 @@ class DLLEXPORT SignalBus final template inline void MoveValue( int signalIndex, ValueType&& newValue ); - inline void SetSignal( int toSignalIndex, const fast_any::fast_any& fromSignal ); - inline void MoveSignal( int toSignalIndex, fast_any::fast_any& fromSignal ); + inline void SetSignal( int toSignalIndex, const fast_any::any& fromSignal ); + inline void MoveSignal( int toSignalIndex, fast_any::any& fromSignal ); inline void ClearAllValues(); - inline fast_any::fast_any_type GetType( int signalIndex ) const; + inline const fast_any::type_info& GetType( int signalIndex ) const; private: - std::vector _signals; + std::vector _signals; }; inline SignalBus::SignalBus() = default; @@ -99,7 +99,7 @@ inline int SignalBus::GetSignalCount() const return (int)_signals.size(); } -inline fast_any::fast_any* SignalBus::GetSignal( int signalIndex ) +inline fast_any::any* SignalBus::GetSignal( int signalIndex ) { if ( (size_t)signalIndex < _signals.size() ) { @@ -141,7 +141,7 @@ inline void SignalBus::SetValue( int signalIndex, const ValueType& newValue ) { if ( (size_t)signalIndex < _signals.size() ) { - _signals[signalIndex].emplace( newValue ); + _signals[signalIndex].emplace( newValue ); } } @@ -150,19 +150,19 @@ inline void SignalBus::MoveValue( int signalIndex, ValueType&& newValue ) { if ( (size_t)signalIndex < _signals.size() ) { - _signals[signalIndex].emplace( std::move( newValue ) ); + _signals[signalIndex].emplace( std::move( newValue ) ); } } -inline void SignalBus::SetSignal( int toSignalIndex, const fast_any::fast_any& fromSignal ) +inline void SignalBus::SetSignal( int toSignalIndex, const fast_any::any& fromSignal ) { if ( (size_t)toSignalIndex < _signals.size() ) { - _signals[toSignalIndex].emplace( fromSignal ); + _signals[toSignalIndex] = fromSignal; } } -inline void SignalBus::MoveSignal( int toSignalIndex, fast_any::fast_any& fromSignal ) +inline void SignalBus::MoveSignal( int toSignalIndex, fast_any::any& fromSignal ) { if ( (size_t)toSignalIndex < _signals.size() ) { @@ -178,7 +178,7 @@ inline void SignalBus::ClearAllValues() } } -inline fast_any::fast_any_type SignalBus::GetType( int signalIndex ) const +inline const fast_any::type_info& SignalBus::GetType( int signalIndex ) const { if ( (size_t)signalIndex < _signals.size() ) { diff --git a/subprojects/fast_any b/subprojects/fast_any index 5fa78cb4..fa38c0f2 160000 --- a/subprojects/fast_any +++ b/subprojects/fast_any @@ -1 +1 @@ -Subproject commit 5fa78cb43d2a66338f543bc806ed450242da96d9 +Subproject commit fa38c0f29386be61739f83f3fe6e222b22b016c0 From 54ac24fdbdeb871943df313aacd424ad02fcd8d0 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Fri, 11 Aug 2023 22:03:08 +0100 Subject: [PATCH 05/17] Update fast_any --- include/dspatch/SignalBus.h | 26 +++++++++++++------------- subprojects/fast_any | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/dspatch/SignalBus.h b/include/dspatch/SignalBus.h index dfd08629..51860965 100644 --- a/include/dspatch/SignalBus.h +++ b/include/dspatch/SignalBus.h @@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include +#include #include @@ -57,7 +57,7 @@ class DLLEXPORT SignalBus final inline void SetSignalCount( int signalCount ); inline int GetSignalCount() const; - inline fast_any::fast_any* GetSignal( int signalIndex ); + inline fast_any::any* GetSignal( int signalIndex ); inline bool HasValue( int signalIndex ) const; @@ -70,15 +70,15 @@ class DLLEXPORT SignalBus final template inline void MoveValue( int signalIndex, ValueType&& newValue ); - inline void SetSignal( int toSignalIndex, const fast_any::fast_any& fromSignal ); - inline void MoveSignal( int toSignalIndex, fast_any::fast_any& fromSignal ); + inline void SetSignal( int toSignalIndex, const fast_any::any& fromSignal ); + inline void MoveSignal( int toSignalIndex, fast_any::any& fromSignal ); inline void ClearAllValues(); - inline fast_any::fast_any_type GetType( int signalIndex ) const; + inline const fast_any::type_info& GetType( int signalIndex ) const; private: - std::vector _signals; + std::vector _signals; }; inline SignalBus::SignalBus() = default; @@ -99,7 +99,7 @@ inline int SignalBus::GetSignalCount() const return (int)_signals.size(); } -inline fast_any::fast_any* SignalBus::GetSignal( int signalIndex ) +inline fast_any::any* SignalBus::GetSignal( int signalIndex ) { if ( (size_t)signalIndex < _signals.size() ) { @@ -141,7 +141,7 @@ inline void SignalBus::SetValue( int signalIndex, const ValueType& newValue ) { if ( (size_t)signalIndex < _signals.size() ) { - _signals[signalIndex].emplace( newValue ); + _signals[signalIndex].emplace( newValue ); } } @@ -150,19 +150,19 @@ inline void SignalBus::MoveValue( int signalIndex, ValueType&& newValue ) { if ( (size_t)signalIndex < _signals.size() ) { - _signals[signalIndex].emplace( std::move( newValue ) ); + _signals[signalIndex].emplace( std::move( newValue ) ); } } -inline void SignalBus::SetSignal( int toSignalIndex, const fast_any::fast_any& fromSignal ) +inline void SignalBus::SetSignal( int toSignalIndex, const fast_any::any& fromSignal ) { if ( (size_t)toSignalIndex < _signals.size() ) { - _signals[toSignalIndex].emplace( fromSignal ); + _signals[toSignalIndex] = fromSignal; } } -inline void SignalBus::MoveSignal( int toSignalIndex, fast_any::fast_any& fromSignal ) +inline void SignalBus::MoveSignal( int toSignalIndex, fast_any::any& fromSignal ) { if ( (size_t)toSignalIndex < _signals.size() ) { @@ -178,7 +178,7 @@ inline void SignalBus::ClearAllValues() } } -inline fast_any::fast_any_type SignalBus::GetType( int signalIndex ) const +inline const fast_any::type_info& SignalBus::GetType( int signalIndex ) const { if ( (size_t)signalIndex < _signals.size() ) { diff --git a/subprojects/fast_any b/subprojects/fast_any index 5fa78cb4..25c7951c 160000 --- a/subprojects/fast_any +++ b/subprojects/fast_any @@ -1 +1 @@ -Subproject commit 5fa78cb43d2a66338f543bc806ed450242da96d9 +Subproject commit 25c7951c6f296cc111a203771c59e6fd73d80e2f From 852ef0613115d6aac68704d3cc604df73e449c8a Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Fri, 11 Aug 2023 22:26:02 +0100 Subject: [PATCH 06/17] Fix crash in tests --- include/dspatch/SignalBus.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/dspatch/SignalBus.h b/include/dspatch/SignalBus.h index cb86d7c4..c7753c95 100644 --- a/include/dspatch/SignalBus.h +++ b/include/dspatch/SignalBus.h @@ -128,7 +128,14 @@ inline ValueType* SignalBus::GetValue( int signalIndex ) const { if ( (size_t)signalIndex < _signals.size() ) { - return const_cast( &std::any_cast( _signals[signalIndex] ) ); + try + { + return const_cast( &std::any_cast( _signals[signalIndex] ) ); + } + catch ( const std::exception& ) + { + return nullptr; + } } else { From f8b82983a21f06633483b3492e3799a1fb205f31 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Sat, 12 Aug 2023 15:17:27 +0100 Subject: [PATCH 07/17] Clean up SignalBus docs --- include/dspatch/SignalBus.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/include/dspatch/SignalBus.h b/include/dspatch/SignalBus.h index fa58dff3..70c16029 100644 --- a/include/dspatch/SignalBus.h +++ b/include/dspatch/SignalBus.h @@ -110,12 +110,13 @@ inline fast_any::any* SignalBus::GetSignal( int signalIndex ) { // You might be thinking: Why the raw pointer return here? - // This is for usability, performance, and readably. Usability, because a pointer allows the - // user to manipulate the contained value externally. Performance, because returning a smart - // pointer here means having to store the value as a smart pointer too. This adds yet another - // level of indirection to the value, as well as some reference counting overhead. These Get() - // and Set() methods are VERY frequently called, so doing as little as possible with the data - // here is best, which ultimately aids in the readably of the code too. + // This is for usability, design, and performance reasons. Usability, because a pointer allows + // the user to manipulate the contained value externally. Design, because DSPatch doesn't use + // exceptions - a nullptr return here is the equivalent of "signal does not exist". + // Performance, because returning a smart pointer means having to store the value as a smart + // pointer too - this adds yet another level of indirection to the value, as well as some + // reference counting overhead. These Get() and Set() methods are VERY frequently called, so + // doing as little as possible with the data here is best. if ( (size_t)signalIndex < _signals.size() ) { @@ -142,6 +143,10 @@ inline bool SignalBus::HasValue( int signalIndex ) const template inline ValueType* SignalBus::GetValue( int signalIndex ) const { + // You might be thinking: Why the raw pointer return here? + + // See: GetSignal(). + if ( (size_t)signalIndex < _signals.size() ) { return _signals[signalIndex].as(); From c2994fe76913ec73edfc9e6b7bc3c9b889680afc Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Sun, 13 Aug 2023 14:16:42 +0100 Subject: [PATCH 08/17] Update fast_any --- include/fast_any | 2 +- meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/fast_any b/include/fast_any index 93bf2667..c91ef7f2 160000 --- a/include/fast_any +++ b/include/fast_any @@ -1 +1 @@ -Subproject commit 93bf266731e1a16176ee57f7fa9107c895ffb0e3 +Subproject commit c91ef7f2912189f085a85701187276e0eb971683 diff --git a/meson.build b/meson.build index 1b717c89..c6c503a0 100644 --- a/meson.build +++ b/meson.build @@ -65,6 +65,7 @@ if find_program('cppcheck', required: false).found() '--force', '--quiet', '--suppress=missingIncludeSystem', + '--suppress=*:' + meson.current_source_dir() + '/include/fast_any/any.h', '-i', meson.current_source_dir() + '/build', '-i', meson.current_source_dir() + '/builddir', From 53884e6974028af3f15d645bb31779e850343417 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Sat, 19 Aug 2023 14:47:04 +0100 Subject: [PATCH 09/17] Run just the TenThousandComponents test --- src/Circuit.cpp | 3 + src/Component.cpp | 1 + tests/main.cpp | 2334 ++++++++++++++++++++++----------------------- 3 files changed, 1171 insertions(+), 1167 deletions(-) diff --git a/src/Circuit.cpp b/src/Circuit.cpp index dabb1b6c..a97ce131 100644 --- a/src/Circuit.cpp +++ b/src/Circuit.cpp @@ -91,6 +91,7 @@ bool Circuit::AddComponent( const Component::SPtr& component ) return true; } +// cppcheck-suppress unusedFunction bool Circuit::RemoveComponent( const Component::SPtr& component ) { if ( p->componentsSet.find( component ) == p->componentsSet.end() ) @@ -131,6 +132,7 @@ void Circuit::RemoveAllComponents() p->componentsSet.clear(); } +// cppcheck-suppress unusedFunction int Circuit::GetComponentCount() const { return (int)p->components.size(); @@ -219,6 +221,7 @@ void Circuit::SetBufferCount( int bufferCount ) } } +// cppcheck-suppress unusedFunction int Circuit::GetBufferCount() const { return (int)p->circuitThreads.size(); diff --git a/src/Component.cpp b/src/Component.cpp index 842fefca..7a482650 100644 --- a/src/Component.cpp +++ b/src/Component.cpp @@ -188,6 +188,7 @@ void Component::DisconnectAllInputs() p->inputWires.clear(); } +// cppcheck-suppress unusedFunction int Component::GetInputCount() const { return p->inputBuses[0].GetSignalCount(); diff --git a/tests/main.cpp b/tests/main.cpp index c7ef428f..0b23e871 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -27,1205 +27,1205 @@ using namespace DSPatch; -static double refEff; +// static double refEff; + +// TEST_CASE( "SignalBusTest" ) +// { +// SignalBus signalBus; + +// signalBus.SetSignalCount( 4 ); + +// signalBus.SetValue( 0, 1.0 ); +// REQUIRE( signalBus.HasValue( 0 ) ); +// REQUIRE( *signalBus.GetValue( 0 ) == 1.0 ); + +// signalBus.SetValue( 1, 1.0f ); +// REQUIRE( signalBus.HasValue( 1 ) ); +// REQUIRE( *signalBus.GetValue( 1 ) == 1.0f ); + +// signalBus.SetValue( 2, 1u ); +// REQUIRE( signalBus.HasValue( 2 ) ); +// REQUIRE( *signalBus.GetValue( 2 ) == 1u ); + +// signalBus.SetValue( 3, 1 ); +// REQUIRE( signalBus.HasValue( 3 ) ); +// REQUIRE( *signalBus.GetValue( 3 ) == 1 ); + +// // no 5th input so should return false and nullptr +// REQUIRE( !signalBus.HasValue( 4 ) ); +// REQUIRE( signalBus.GetValue( 4 ) == nullptr ); + +// REQUIRE( signalBus.GetType( 0 ) != signalBus.GetType( 1 ) ); +// REQUIRE( signalBus.GetType( 1 ) != signalBus.GetType( 2 ) ); +// REQUIRE( signalBus.GetType( 2 ) != signalBus.GetType( 3 ) ); +// // no 5th input so should return void type_info +// REQUIRE( signalBus.GetType( 3 ) != signalBus.GetType( 4 ) ); +// } + +// TEST_CASE( "SerialTest" ) +// { +// // Configure a circuit made up of a counter and 5 incrementers in series +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto inc_s1 = std::make_shared( 1 ); +// auto inc_s2 = std::make_shared( 2 ); +// auto inc_s3 = std::make_shared( 3 ); +// auto inc_s4 = std::make_shared( 4 ); +// auto inc_s5 = std::make_shared( 5 ); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); +// circuit->AddComponent( inc_s1 ); +// circuit->AddComponent( inc_s2 ); +// circuit->AddComponent( inc_s3 ); +// circuit->AddComponent( inc_s4 ); +// circuit->AddComponent( inc_s5 ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter, 0, inc_s1, 0 ); +// circuit->ConnectOutToIn( inc_s1, 0, inc_s2, 0 ); +// circuit->ConnectOutToIn( inc_s2, 0, inc_s3, 0 ); +// circuit->ConnectOutToIn( inc_s3, 0, inc_s4, 0 ); +// circuit->ConnectOutToIn( inc_s4, 0, inc_s5, 0 ); +// circuit->ConnectOutToIn( inc_s5, 0, probe, 0 ); + +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// circuit->Tick( Component::TickMode::Series ); +// } +// } + +// TEST_CASE( "ParallelTest" ) +// { +// // Configure a circuit made up of a counter and 5 incrementers in parallel +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto inc_p1 = std::make_shared( 1 ); +// auto inc_p2 = std::make_shared( 2 ); +// auto inc_p3 = std::make_shared( 3 ); +// auto inc_p4 = std::make_shared( 4 ); +// auto inc_p5 = std::make_shared( 5 ); +// auto probe = std::make_shared(); + +// REQUIRE( counter->GetInputCount() == 0 ); +// REQUIRE( inc_p1->GetInputCount() == 1 ); +// REQUIRE( probe->GetInputCount() == 5 ); + +// circuit->AddComponent( counter ); +// circuit->AddComponent( inc_p1 ); +// circuit->AddComponent( inc_p2 ); +// circuit->AddComponent( inc_p3 ); +// circuit->AddComponent( inc_p4 ); +// circuit->AddComponent( inc_p5 ); +// circuit->AddComponent( probe ); + +// REQUIRE( circuit->GetComponentCount() == 7 ); + +// REQUIRE( !circuit->AddComponent( counter ) ); +// REQUIRE( !circuit->AddComponent( inc_p1 ) ); +// REQUIRE( !circuit->AddComponent( probe ) ); + +// circuit->ConnectOutToIn( counter, 0, inc_p1, 0 ); +// circuit->ConnectOutToIn( counter, 0, inc_p2, 0 ); +// circuit->ConnectOutToIn( counter, 0, inc_p3, 0 ); +// circuit->ConnectOutToIn( counter, 0, inc_p4, 0 ); +// circuit->ConnectOutToIn( counter, 0, inc_p5, 0 ); +// circuit->ConnectOutToIn( inc_p1, 0, probe, 0 ); +// circuit->ConnectOutToIn( inc_p2, 0, probe, 1 ); +// circuit->ConnectOutToIn( inc_p3, 0, probe, 2 ); +// circuit->ConnectOutToIn( inc_p4, 0, probe, 3 ); +// circuit->ConnectOutToIn( inc_p5, 0, probe, 4 ); + +// // Tick the circuit for 100ms with 3 threads +// circuit->SetBufferCount( 3 ); + +// REQUIRE( counter->GetBufferCount() == 3 ); +// REQUIRE( inc_p1->GetBufferCount() == 3 ); +// REQUIRE( probe->GetBufferCount() == 3 ); + +// circuit->StartAutoTick( Component::TickMode::Series ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// circuit->StopAutoTick(); +// } + +// TEST_CASE( "BranchSyncTest" ) +// { +// // Configure a circuit made up of 3 parallel branches of 4, 2, and 1 component(s) respectively +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto inc_p1_s1 = std::make_shared(); +// auto inc_p1_s2 = std::make_shared(); +// auto inc_p1_s3 = std::make_shared(); +// auto inc_p1_s4 = std::make_shared(); +// auto inc_p2_s1 = std::make_shared(); +// auto inc_p2_s2 = std::make_shared(); +// auto inc_p3_s1 = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); + +// circuit->AddComponent( inc_p1_s1 ); +// circuit->AddComponent( inc_p1_s2 ); +// circuit->AddComponent( inc_p1_s3 ); +// circuit->AddComponent( inc_p1_s4 ); + +// circuit->AddComponent( inc_p2_s1 ); +// circuit->AddComponent( inc_p2_s2 ); + +// circuit->AddComponent( inc_p3_s1 ); + +// circuit->AddComponent( probe ); + +// // Wire branch 1 +// circuit->ConnectOutToIn( counter, 0, inc_p1_s1, 0 ); +// circuit->ConnectOutToIn( inc_p1_s1, 0, inc_p1_s2, 0 ); +// circuit->ConnectOutToIn( inc_p1_s2, 0, inc_p1_s3, 0 ); +// circuit->ConnectOutToIn( inc_p1_s3, 0, inc_p1_s4, 0 ); +// circuit->ConnectOutToIn( inc_p1_s4, 0, probe, 0 ); + +// // Wire branch 2 +// circuit->ConnectOutToIn( counter, 0, inc_p2_s1, 0 ); +// circuit->ConnectOutToIn( inc_p2_s1, 0, inc_p2_s2, 0 ); +// circuit->ConnectOutToIn( inc_p2_s2, 0, probe, 1 ); + +// // Wire branch 3 +// circuit->ConnectOutToIn( counter, 0, inc_p3_s1, 0 ); +// circuit->ConnectOutToIn( inc_p3_s1, 0, probe, 2 ); + +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// circuit->Tick( Component::TickMode::Series ); +// } +// } + +// TEST_CASE( "FeedbackTest" ) +// { +// // Configure a circuit made up of an adder that adds a counter to its own previous output +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto adder = std::make_shared(); +// auto passthrough = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); +// circuit->AddComponent( adder ); +// circuit->AddComponent( passthrough ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter, 0, adder, 0 ); +// circuit->ConnectOutToIn( adder, 0, passthrough, 0 ); + +// circuit->ConnectOutToIn( passthrough, 0, adder, 1 ); + +// circuit->ConnectOutToIn( adder, 0, probe, 0 ); + +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// circuit->Tick( Component::TickMode::Series ); +// } +// } + +// TEST_CASE( "FeedbackTestNoCircuit" ) +// { +// auto counter = std::make_shared(); +// auto adder = std::make_shared(); +// auto passthrough = std::make_shared(); +// auto probe = std::make_shared(); + +// adder->ConnectInput( counter, 0, 0 ); +// passthrough->ConnectInput( adder, 0, 0 ); + +// adder->ConnectInput( passthrough, 0, 1 ); + +// probe->ConnectInput( adder, 0, 0 ); + +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// counter->Tick( Component::TickMode::Series ); +// adder->Tick( Component::TickMode::Series ); +// passthrough->Tick( Component::TickMode::Series ); +// probe->Tick( Component::TickMode::Series ); + +// counter->Reset( Component::TickMode::Series ); +// adder->Reset( Component::TickMode::Series ); +// passthrough->Reset( Component::TickMode::Series ); +// probe->Reset( Component::TickMode::Series ); +// } +// } + +// TEST_CASE( "RefCountResetRegressionTest" ) +// { +// auto circuit = std::make_shared(); +// auto feedback = std::make_shared( 2 ); + +// circuit->AddComponent( feedback ); +// circuit->SetBufferCount( 2 ); + +// feedback->ConnectInput( feedback, 0, 0 ); +// feedback->SetValidInputs( 1 ); + +// circuit->StartAutoTick( Component::TickMode::Series ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// circuit->PauseAutoTick(); + +// feedback->ConnectInput( feedback, 0, 1 ); +// feedback->ConnectInput( feedback, 0, 2 ); +// feedback->ConnectInput( feedback, 0, 3 ); +// feedback->SetValidInputs( 4 ); + +// circuit->StartAutoTick( Component::TickMode::Series ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// circuit->PauseAutoTick(); + +// feedback->ConnectInput( feedback, 0, 4 ); +// feedback->ConnectInput( feedback, 0, 5 ); +// feedback->ConnectInput( feedback, 0, 6 ); +// feedback->ConnectInput( feedback, 0, 7 ); +// feedback->ConnectInput( feedback, 0, 8 ); +// feedback->ConnectInput( feedback, 0, 9 ); +// feedback->SetValidInputs( 10 ); + +// circuit->StartAutoTick( Component::TickMode::Series ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// circuit->StopAutoTick(); +// } + +// TEST_CASE( "NoOutputTest" ) +// { +// // Configure a circuit where the counter responds sporadically +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter, 0, probe, 0 ); + +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// circuit->Tick( Component::TickMode::Series ); +// } +// } + +// TEST_CASE( "ChangingOutputTest" ) +// { +// // Configure a circuit whereby a component outputs varying types (int, float, string, vector) +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter, 0, probe, 0 ); + +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// circuit->Tick( Component::TickMode::Series ); +// } +// } + +// TEST_CASE( "ThreadPerformanceTest" ) +// { +// // Configure a circuit made up of 4 parallel counters, then adjust the thread count +// auto circuit = std::make_shared(); + +// auto counter1 = std::make_shared(); +// auto counter2 = std::make_shared(); +// auto counter3 = std::make_shared(); +// auto counter4 = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter1 ); +// circuit->AddComponent( counter2 ); +// circuit->AddComponent( counter3 ); +// circuit->AddComponent( counter4 ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter1, 0, probe, 0 ); +// circuit->ConnectOutToIn( counter2, 0, probe, 1 ); +// circuit->ConnectOutToIn( counter3, 0, probe, 2 ); +// circuit->ConnectOutToIn( counter4, 0, probe, 3 ); + +// // Calculate reference efficiency + +// SignalBus testBus; +// auto measureRef = [&testBus]( std::shared_ptr& counter ) +// { +// for ( int i = 0; i < 1000; ++i ) +// { +// counter->Process_( testBus, testBus ); +// } +// }; + +// auto begin = std::chrono::high_resolution_clock::now(); +// auto t1 = std::thread( [&measureRef, &counter1]() { measureRef( counter1 ); } ); +// auto t2 = std::thread( [&measureRef, &counter2]() { measureRef( counter2 ); } ); +// auto t3 = std::thread( [&measureRef, &counter3]() { measureRef( counter3 ); } ); +// auto t4 = std::thread( [&measureRef, &counter4]() { measureRef( counter4 ); } ); +// t1.join(); +// t2.join(); +// t3.join(); +// t4.join(); +// auto end = std::chrono::high_resolution_clock::now(); +// refEff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + +// counter1->ResetCount(); +// counter2->ResetCount(); +// counter3->ResetCount(); +// counter4->ResetCount(); + +// std::cout << "Reference Efficiency: " << refEff << "%" << std::endl; + +// // Tick the circuit with no threads +// begin = std::chrono::high_resolution_clock::now(); +// for ( int i = 0; i < 1000; ++i ) +// { +// circuit->Tick( Component::TickMode::Series ); +// } +// end = std::chrono::high_resolution_clock::now(); +// auto eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + +// auto overhead = 100 - ( 100 * ( eff / refEff ) ); +// std::cout << "0x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// REQUIRE( eff >= refEff * 0.25 * 0.90 ); + +// // Tick the circuit with 1 thread, and check that no more ticks occurred +// if ( std::thread::hardware_concurrency() < 1 ) +// { +// return; +// } +// circuit->SetBufferCount( 1 ); + +// begin = std::chrono::high_resolution_clock::now(); +// for ( int i = 0; i < 1000; ++i ) +// { +// circuit->Tick( Component::TickMode::Series ); +// } +// end = std::chrono::high_resolution_clock::now(); +// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + +// overhead = 100 - ( 100 * ( eff / refEff ) ); +// std::cout << "1x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// REQUIRE( eff >= refEff * 0.25 * 0.90 ); + +// // Tick the circuit with 2 threads, and check that more ticks occurred +// if ( std::thread::hardware_concurrency() < 2 ) +// { +// return; +// } +// circuit->SetBufferCount( 2 ); + +// begin = std::chrono::high_resolution_clock::now(); +// for ( int i = 0; i < 1000; ++i ) +// { +// circuit->Tick( Component::TickMode::Series ); +// } +// end = std::chrono::high_resolution_clock::now(); +// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + +// overhead = 100 - ( 100 * ( eff / refEff ) ); +// std::cout << "2x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// REQUIRE( eff >= refEff * 0.5 * 0.90 ); + +// // Tick the circuit with 3 threads, and check that more ticks occurred +// if ( std::thread::hardware_concurrency() < 4 ) +// { +// return; +// } +// circuit->SetBufferCount( 3 ); + +// begin = std::chrono::high_resolution_clock::now(); +// for ( int i = 0; i < 1000; ++i ) +// { +// circuit->Tick( Component::TickMode::Series ); +// } +// end = std::chrono::high_resolution_clock::now(); +// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + +// overhead = 100 - ( 100 * ( eff / refEff ) ); +// std::cout << "3x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// REQUIRE( eff >= refEff * 0.75 * 0.90 ); + +// // Tick the circuit with 4 threads, and check that more ticks occurred +// if ( std::thread::hardware_concurrency() < 4 ) +// { +// return; +// } +// circuit->SetBufferCount( 4 ); + +// begin = std::chrono::high_resolution_clock::now(); +// for ( int i = 0; i < 1000; ++i ) +// { +// circuit->Tick( Component::TickMode::Series ); +// } +// end = std::chrono::high_resolution_clock::now(); +// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + +// overhead = 100 - ( 100 * ( eff / refEff ) ); +// std::cout << "4x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// REQUIRE( eff >= refEff * 0.90 ); +// } + +// TEST_CASE( "StopAutoTickRegressionTest" ) +// { +// auto circuit = std::make_shared(); + +// auto counter1 = std::make_shared(); +// auto counter2 = std::make_shared(); +// auto counter3 = std::make_shared(); +// auto counter4 = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter1 ); +// circuit->AddComponent( counter2 ); +// circuit->AddComponent( counter3 ); +// circuit->AddComponent( counter4 ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter1, 0, probe, 0 ); +// circuit->ConnectOutToIn( counter2, 0, probe, 1 ); +// circuit->ConnectOutToIn( counter3, 0, probe, 2 ); +// circuit->ConnectOutToIn( counter4, 0, probe, 3 ); + +// circuit->SetBufferCount( std::thread::hardware_concurrency() ); + +// circuit->StartAutoTick( Component::TickMode::Series ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// circuit->StopAutoTick(); +// circuit->RemoveComponent( counter1 ); +// circuit->RemoveComponent( counter2 ); +// circuit->RemoveComponent( counter3 ); +// circuit->RemoveComponent( counter4 ); +// circuit->RemoveComponent( probe ); + +// REQUIRE( !circuit->RemoveComponent( counter1 ) ); +// } + +// TEST_CASE( "ThreadAdjustmentTest" ) +// { +// // Configure a counter circuit, then adjust the thread count while it's running +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter, 0, probe, 0 ); +// circuit->ConnectOutToIn( counter, 0, probe, 1 ); +// circuit->ConnectOutToIn( counter, 0, probe, 2 ); +// circuit->ConnectOutToIn( counter, 0, probe, 3 ); + +// // Tick the circuit for 100ms with 1 thread +// circuit->StartAutoTick( Component::TickMode::Series ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// // Adjust the thread count while the circuit is running +// circuit->SetBufferCount( 2 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->SetBufferCount( 0 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->SetBufferCount( 4 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->SetBufferCount( 2 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->SetBufferCount( 3 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->StopAutoTick(); + +// REQUIRE( circuit->GetBufferCount() == 3 ); +// } + +// TEST_CASE( "WiringTest" ) +// { +// // Configure a counter circuit, then re-wire it while it's running +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->ConnectOutToIn( counter, 0, probe, 0 ); +// circuit->ConnectOutToIn( probe, 0, counter, 0 ); + +// // Tick the circuit for 100ms with 1 thread +// circuit->StartAutoTick( Component::TickMode::Series ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// // Re-wire + +// auto pass_s1 = std::make_shared(); +// circuit->AddComponent( pass_s1 ); + +// circuit->ConnectOutToIn( pass_s1, 0, probe, 0 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->ConnectOutToIn( counter, 0, pass_s1, 0 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// // Disconnect a component + +// circuit->PauseAutoTick(); +// probe->DisconnectInput( 0 ); +// circuit->ResumeAutoTick(); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// circuit->DisconnectComponent( probe ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// // Wire in a new component + +// auto pass_s2 = std::make_shared(); +// circuit->AddComponent( pass_s2 ); + +// circuit->ConnectOutToIn( probe, 0, counter, 0 ); +// circuit->ConnectOutToIn( pass_s2, 0, probe, 0 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->ConnectOutToIn( pass_s1, 0, pass_s2, 0 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->StopAutoTick(); +// } + +// //================================================================================================= + +// TEST_CASE( "SerialTest2" ) +// { +// // Configure a circuit made up of a counter and 5 incrementers in series +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto inc_s1 = std::make_shared( 1 ); +// auto inc_s2 = std::make_shared( 2 ); +// auto inc_s3 = std::make_shared( 3 ); +// auto inc_s4 = std::make_shared( 4 ); +// auto inc_s5 = std::make_shared( 5 ); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); +// circuit->AddComponent( inc_s1 ); +// circuit->AddComponent( inc_s2 ); +// circuit->AddComponent( inc_s3 ); +// circuit->AddComponent( inc_s4 ); +// circuit->AddComponent( inc_s5 ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter, 0, inc_s1, 0 ); +// circuit->ConnectOutToIn( inc_s1, 0, inc_s2, 0 ); +// circuit->ConnectOutToIn( inc_s2, 0, inc_s3, 0 ); +// circuit->ConnectOutToIn( inc_s3, 0, inc_s4, 0 ); +// circuit->ConnectOutToIn( inc_s4, 0, inc_s5, 0 ); +// circuit->ConnectOutToIn( inc_s5, 0, probe, 0 ); + +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// circuit->Tick( Component::TickMode::Parallel ); +// } +// } + +// TEST_CASE( "ParallelTest2" ) +// { +// // Configure a circuit made up of a counter and 5 incrementers in parallel +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto inc_p1 = std::make_shared( 1 ); +// auto inc_p2 = std::make_shared( 2 ); +// auto inc_p3 = std::make_shared( 3 ); +// auto inc_p4 = std::make_shared( 4 ); +// auto inc_p5 = std::make_shared( 5 ); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); +// circuit->AddComponent( inc_p1 ); +// circuit->AddComponent( inc_p2 ); +// circuit->AddComponent( inc_p3 ); +// circuit->AddComponent( inc_p4 ); +// circuit->AddComponent( inc_p5 ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter, 0, inc_p1, 0 ); +// circuit->ConnectOutToIn( counter, 0, inc_p2, 0 ); +// circuit->ConnectOutToIn( counter, 0, inc_p3, 0 ); +// circuit->ConnectOutToIn( counter, 0, inc_p4, 0 ); +// circuit->ConnectOutToIn( counter, 0, inc_p5, 0 ); +// circuit->ConnectOutToIn( inc_p1, 0, probe, 0 ); +// circuit->ConnectOutToIn( inc_p2, 0, probe, 1 ); +// circuit->ConnectOutToIn( inc_p3, 0, probe, 2 ); +// circuit->ConnectOutToIn( inc_p4, 0, probe, 3 ); +// circuit->ConnectOutToIn( inc_p5, 0, probe, 4 ); + +// // Tick the circuit for 100ms with 3 threads +// circuit->SetBufferCount( 3 ); +// circuit->StartAutoTick( Component::TickMode::Parallel ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// circuit->StopAutoTick(); +// } + +// TEST_CASE( "BranchSyncTest2" ) +// { +// // Configure a circuit made up of 3 parallel branches of 4, 2, and 1 component(s) respectively +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto inc_p1_s1 = std::make_shared(); +// auto inc_p1_s2 = std::make_shared(); +// auto inc_p1_s3 = std::make_shared(); +// auto inc_p1_s4 = std::make_shared(); +// auto inc_p2_s1 = std::make_shared(); +// auto inc_p2_s2 = std::make_shared(); +// auto inc_p3_s1 = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); + +// circuit->AddComponent( inc_p1_s1 ); +// circuit->AddComponent( inc_p1_s2 ); +// circuit->AddComponent( inc_p1_s3 ); +// circuit->AddComponent( inc_p1_s4 ); + +// circuit->AddComponent( inc_p2_s1 ); +// circuit->AddComponent( inc_p2_s2 ); + +// circuit->AddComponent( inc_p3_s1 ); + +// circuit->AddComponent( probe ); + +// // Wire branch 1 +// circuit->ConnectOutToIn( counter, 0, inc_p1_s1, 0 ); +// circuit->ConnectOutToIn( inc_p1_s1, 0, inc_p1_s2, 0 ); +// circuit->ConnectOutToIn( inc_p1_s2, 0, inc_p1_s3, 0 ); +// circuit->ConnectOutToIn( inc_p1_s3, 0, inc_p1_s4, 0 ); +// circuit->ConnectOutToIn( inc_p1_s4, 0, probe, 0 ); + +// // Wire branch 2 +// circuit->ConnectOutToIn( counter, 0, inc_p2_s1, 0 ); +// circuit->ConnectOutToIn( inc_p2_s1, 0, inc_p2_s2, 0 ); +// circuit->ConnectOutToIn( inc_p2_s2, 0, probe, 1 ); + +// // Wire branch 3 +// circuit->ConnectOutToIn( counter, 0, inc_p3_s1, 0 ); +// circuit->ConnectOutToIn( inc_p3_s1, 0, probe, 2 ); + +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// circuit->Tick( Component::TickMode::Parallel ); +// } +// } + +// TEST_CASE( "FeedbackTest2" ) +// { +// // Configure a circuit made up of an adder that adds a counter to its own previous output +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto adder = std::make_shared(); +// auto passthrough = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); +// circuit->AddComponent( adder ); +// circuit->AddComponent( passthrough ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter, 0, adder, 0 ); +// circuit->ConnectOutToIn( adder, 0, passthrough, 0 ); + +// circuit->ConnectOutToIn( passthrough, 0, adder, 1 ); + +// circuit->ConnectOutToIn( adder, 0, probe, 0 ); + +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// circuit->Tick( Component::TickMode::Parallel ); +// } +// } + +// TEST_CASE( "FeedbackTestNoCircuit2" ) +// { +// auto counter = std::make_shared(); +// auto adder = std::make_shared(); +// auto passthrough = std::make_shared(); +// auto probe = std::make_shared(); + +// adder->ConnectInput( counter, 0, 0 ); +// passthrough->ConnectInput( adder, 0, 0 ); + +// adder->ConnectInput( passthrough, 0, 1 ); + +// probe->ConnectInput( adder, 0, 0 ); + +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// counter->Tick( Component::TickMode::Parallel ); +// adder->Tick( Component::TickMode::Parallel ); +// passthrough->Tick( Component::TickMode::Parallel ); +// probe->Tick( Component::TickMode::Parallel ); + +// counter->Reset( Component::TickMode::Parallel ); +// adder->Reset( Component::TickMode::Parallel ); +// passthrough->Reset( Component::TickMode::Parallel ); +// probe->Reset( Component::TickMode::Parallel ); +// } +// } + +// TEST_CASE( "RefCountResetRegressionTest2" ) +// { +// auto circuit = std::make_shared(); +// auto feedback = std::make_shared( 2 ); + +// circuit->AddComponent( feedback ); +// circuit->SetBufferCount( 2 ); + +// feedback->ConnectInput( feedback, 0, 0 ); +// feedback->SetValidInputs( 1 ); + +// circuit->StartAutoTick( Component::TickMode::Parallel ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// circuit->PauseAutoTick(); + +// feedback->ConnectInput( feedback, 0, 1 ); +// feedback->ConnectInput( feedback, 0, 2 ); +// feedback->ConnectInput( feedback, 0, 3 ); +// feedback->SetValidInputs( 4 ); + +// circuit->StartAutoTick( Component::TickMode::Parallel ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// circuit->PauseAutoTick(); + +// feedback->ConnectInput( feedback, 0, 4 ); +// feedback->ConnectInput( feedback, 0, 5 ); +// feedback->ConnectInput( feedback, 0, 6 ); +// feedback->ConnectInput( feedback, 0, 7 ); +// feedback->ConnectInput( feedback, 0, 8 ); +// feedback->ConnectInput( feedback, 0, 9 ); +// feedback->SetValidInputs( 10 ); + +// circuit->StartAutoTick( Component::TickMode::Parallel ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// circuit->StopAutoTick(); +// } + +// TEST_CASE( "NoOutputTest2" ) +// { +// // Configure a circuit where the counter responds sporadically +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter, 0, probe, 0 ); + +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// circuit->Tick( Component::TickMode::Parallel ); +// } +// } + +// TEST_CASE( "ChangingOutputTest2" ) +// { +// // Configure a circuit whereby a component outputs varying types (int, float, string, vector) +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter, 0, probe, 0 ); + +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// circuit->Tick( Component::TickMode::Parallel ); +// } +// } + +// TEST_CASE( "ThreadPerformanceTest2" ) +// { +// double cores = std::thread::hardware_concurrency(); +// cores = cores == 3.0 ? 2.0 : cores; +// cores = cores > 4.0 ? 4.0 : cores; +// auto effFrac = cores / 4.0; + +// // Configure a circuit made up of 4 parallel counters, then adjust the thread count +// auto circuit = std::make_shared(); + +// auto counter1 = std::make_shared(); +// auto counter2 = std::make_shared(); +// auto counter3 = std::make_shared(); +// auto counter4 = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter1 ); +// circuit->AddComponent( counter2 ); +// circuit->AddComponent( counter3 ); +// circuit->AddComponent( counter4 ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter1, 0, probe, 0 ); +// circuit->ConnectOutToIn( counter2, 0, probe, 1 ); +// circuit->ConnectOutToIn( counter3, 0, probe, 2 ); +// circuit->ConnectOutToIn( counter4, 0, probe, 3 ); + +// // Tick the circuit with no threads +// auto begin = std::chrono::high_resolution_clock::now(); +// for ( int i = 0; i < 1000; ++i ) +// { +// circuit->Tick( Component::TickMode::Parallel ); +// } +// auto end = std::chrono::high_resolution_clock::now(); +// auto eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + +// auto overhead = 100 - ( 100 * ( eff / refEff ) ); +// std::cout << "0x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// REQUIRE( eff >= refEff * effFrac * 0.85 ); + +// // Tick the circuit with 1 thread, and check that no more ticks occurred +// if ( std::thread::hardware_concurrency() < 1 ) +// { +// return; +// } +// circuit->SetBufferCount( 1 ); + +// begin = std::chrono::high_resolution_clock::now(); +// for ( int i = 0; i < 1000; ++i ) +// { +// circuit->Tick( Component::TickMode::Parallel ); +// } +// end = std::chrono::high_resolution_clock::now(); +// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + +// overhead = 100 - ( 100 * ( eff / refEff ) ); +// std::cout << "1x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// REQUIRE( eff >= refEff * effFrac * 0.85 ); + +// // Tick the circuit with 2 threads, and check that more ticks occurred +// if ( std::thread::hardware_concurrency() < 2 ) +// { +// return; +// } +// circuit->SetBufferCount( 2 ); + +// begin = std::chrono::high_resolution_clock::now(); +// for ( int i = 0; i < 1000; ++i ) +// { +// circuit->Tick( Component::TickMode::Parallel ); +// } +// end = std::chrono::high_resolution_clock::now(); +// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + +// overhead = 100 - ( 100 * ( eff / refEff ) ); +// std::cout << "2x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// REQUIRE( eff >= refEff * effFrac * 0.90 ); + +// // Tick the circuit with 3 threads, and check that more ticks occurred +// if ( std::thread::hardware_concurrency() < 4 ) +// { +// return; +// } +// circuit->SetBufferCount( 3 ); + +// begin = std::chrono::high_resolution_clock::now(); +// for ( int i = 0; i < 1000; ++i ) +// { +// circuit->Tick( Component::TickMode::Parallel ); +// } +// end = std::chrono::high_resolution_clock::now(); +// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + +// overhead = 100 - ( 100 * ( eff / refEff ) ); +// std::cout << "3x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// REQUIRE( eff >= refEff * effFrac * 0.90 ); + +// // Tick the circuit with 4 threads, and check that more ticks occurred +// if ( std::thread::hardware_concurrency() < 4 ) +// { +// return; +// } +// circuit->SetBufferCount( 4 ); + +// begin = std::chrono::high_resolution_clock::now(); +// for ( int i = 0; i < 1000; ++i ) +// { +// circuit->Tick( Component::TickMode::Parallel ); +// } +// end = std::chrono::high_resolution_clock::now(); +// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + +// overhead = 100 - ( 100 * ( eff / refEff ) ); +// std::cout << "4x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// REQUIRE( eff >= refEff * effFrac * 0.90 ); +// } + +// TEST_CASE( "StopAutoTickRegressionTest2" ) +// { +// auto circuit = std::make_shared(); + +// auto counter1 = std::make_shared(); +// auto counter2 = std::make_shared(); +// auto counter3 = std::make_shared(); +// auto counter4 = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter1 ); +// circuit->AddComponent( counter2 ); +// circuit->AddComponent( counter3 ); +// circuit->AddComponent( counter4 ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter1, 0, probe, 0 ); +// circuit->ConnectOutToIn( counter2, 0, probe, 1 ); +// circuit->ConnectOutToIn( counter3, 0, probe, 2 ); +// circuit->ConnectOutToIn( counter4, 0, probe, 3 ); + +// circuit->SetBufferCount( std::thread::hardware_concurrency() ); + +// circuit->StartAutoTick( Component::TickMode::Parallel ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// circuit->StopAutoTick(); +// circuit->RemoveComponent( counter1 ); +// circuit->RemoveComponent( counter2 ); +// circuit->RemoveComponent( counter3 ); +// circuit->RemoveComponent( counter4 ); +// circuit->RemoveComponent( probe ); +// } + +// TEST_CASE( "ThreadAdjustmentTest2" ) +// { +// // Configure a counter circuit, then adjust the thread count while it's running +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->AddComponent( counter ); +// circuit->AddComponent( probe ); + +// circuit->ConnectOutToIn( counter, 0, probe, 0 ); +// circuit->ConnectOutToIn( counter, 0, probe, 1 ); +// circuit->ConnectOutToIn( counter, 0, probe, 2 ); +// circuit->ConnectOutToIn( counter, 0, probe, 3 ); + +// // Tick the circuit for 100ms with 1 thread +// circuit->StartAutoTick( Component::TickMode::Parallel ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// // Adjust the thread count while the circuit is running +// circuit->SetBufferCount( 2 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->SetBufferCount( 0 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->SetBufferCount( 4 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->SetBufferCount( 2 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->SetBufferCount( 3 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// circuit->StopAutoTick(); + +// REQUIRE( circuit->GetBufferCount() == 3 ); +// } + +// TEST_CASE( "WiringTest2" ) +// { +// // Configure a counter circuit, then re-wire it while it's running +// auto circuit = std::make_shared(); + +// auto counter = std::make_shared(); +// auto probe = std::make_shared(); + +// circuit->ConnectOutToIn( counter, 0, probe, 0 ); +// circuit->ConnectOutToIn( probe, 0, counter, 0 ); + +// // Tick the circuit for 100ms with 1 thread +// circuit->StartAutoTick( Component::TickMode::Parallel ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + +// // Re-wire -TEST_CASE( "SignalBusTest" ) -{ - SignalBus signalBus; - - signalBus.SetSignalCount( 4 ); - - signalBus.SetValue( 0, 1.0 ); - REQUIRE( signalBus.HasValue( 0 ) ); - REQUIRE( *signalBus.GetValue( 0 ) == 1.0 ); - - signalBus.SetValue( 1, 1.0f ); - REQUIRE( signalBus.HasValue( 1 ) ); - REQUIRE( *signalBus.GetValue( 1 ) == 1.0f ); - - signalBus.SetValue( 2, 1u ); - REQUIRE( signalBus.HasValue( 2 ) ); - REQUIRE( *signalBus.GetValue( 2 ) == 1u ); - - signalBus.SetValue( 3, 1 ); - REQUIRE( signalBus.HasValue( 3 ) ); - REQUIRE( *signalBus.GetValue( 3 ) == 1 ); - - // no 5th input so should return false and nullptr - REQUIRE( !signalBus.HasValue( 4 ) ); - REQUIRE( signalBus.GetValue( 4 ) == nullptr ); - - REQUIRE( signalBus.GetType( 0 ) != signalBus.GetType( 1 ) ); - REQUIRE( signalBus.GetType( 1 ) != signalBus.GetType( 2 ) ); - REQUIRE( signalBus.GetType( 2 ) != signalBus.GetType( 3 ) ); - // no 5th input so should return void type_info - REQUIRE( signalBus.GetType( 3 ) != signalBus.GetType( 4 ) ); -} - -TEST_CASE( "SerialTest" ) -{ - // Configure a circuit made up of a counter and 5 incrementers in series - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto inc_s1 = std::make_shared( 1 ); - auto inc_s2 = std::make_shared( 2 ); - auto inc_s3 = std::make_shared( 3 ); - auto inc_s4 = std::make_shared( 4 ); - auto inc_s5 = std::make_shared( 5 ); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - circuit->AddComponent( inc_s1 ); - circuit->AddComponent( inc_s2 ); - circuit->AddComponent( inc_s3 ); - circuit->AddComponent( inc_s4 ); - circuit->AddComponent( inc_s5 ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter, 0, inc_s1, 0 ); - circuit->ConnectOutToIn( inc_s1, 0, inc_s2, 0 ); - circuit->ConnectOutToIn( inc_s2, 0, inc_s3, 0 ); - circuit->ConnectOutToIn( inc_s3, 0, inc_s4, 0 ); - circuit->ConnectOutToIn( inc_s4, 0, inc_s5, 0 ); - circuit->ConnectOutToIn( inc_s5, 0, probe, 0 ); - - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - circuit->Tick( Component::TickMode::Series ); - } -} - -TEST_CASE( "ParallelTest" ) -{ - // Configure a circuit made up of a counter and 5 incrementers in parallel - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto inc_p1 = std::make_shared( 1 ); - auto inc_p2 = std::make_shared( 2 ); - auto inc_p3 = std::make_shared( 3 ); - auto inc_p4 = std::make_shared( 4 ); - auto inc_p5 = std::make_shared( 5 ); - auto probe = std::make_shared(); - - REQUIRE( counter->GetInputCount() == 0 ); - REQUIRE( inc_p1->GetInputCount() == 1 ); - REQUIRE( probe->GetInputCount() == 5 ); - - circuit->AddComponent( counter ); - circuit->AddComponent( inc_p1 ); - circuit->AddComponent( inc_p2 ); - circuit->AddComponent( inc_p3 ); - circuit->AddComponent( inc_p4 ); - circuit->AddComponent( inc_p5 ); - circuit->AddComponent( probe ); - - REQUIRE( circuit->GetComponentCount() == 7 ); - - REQUIRE( !circuit->AddComponent( counter ) ); - REQUIRE( !circuit->AddComponent( inc_p1 ) ); - REQUIRE( !circuit->AddComponent( probe ) ); - - circuit->ConnectOutToIn( counter, 0, inc_p1, 0 ); - circuit->ConnectOutToIn( counter, 0, inc_p2, 0 ); - circuit->ConnectOutToIn( counter, 0, inc_p3, 0 ); - circuit->ConnectOutToIn( counter, 0, inc_p4, 0 ); - circuit->ConnectOutToIn( counter, 0, inc_p5, 0 ); - circuit->ConnectOutToIn( inc_p1, 0, probe, 0 ); - circuit->ConnectOutToIn( inc_p2, 0, probe, 1 ); - circuit->ConnectOutToIn( inc_p3, 0, probe, 2 ); - circuit->ConnectOutToIn( inc_p4, 0, probe, 3 ); - circuit->ConnectOutToIn( inc_p5, 0, probe, 4 ); - - // Tick the circuit for 100ms with 3 threads - circuit->SetBufferCount( 3 ); - - REQUIRE( counter->GetBufferCount() == 3 ); - REQUIRE( inc_p1->GetBufferCount() == 3 ); - REQUIRE( probe->GetBufferCount() == 3 ); - - circuit->StartAutoTick( Component::TickMode::Series ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->StopAutoTick(); -} - -TEST_CASE( "BranchSyncTest" ) -{ - // Configure a circuit made up of 3 parallel branches of 4, 2, and 1 component(s) respectively - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto inc_p1_s1 = std::make_shared(); - auto inc_p1_s2 = std::make_shared(); - auto inc_p1_s3 = std::make_shared(); - auto inc_p1_s4 = std::make_shared(); - auto inc_p2_s1 = std::make_shared(); - auto inc_p2_s2 = std::make_shared(); - auto inc_p3_s1 = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - - circuit->AddComponent( inc_p1_s1 ); - circuit->AddComponent( inc_p1_s2 ); - circuit->AddComponent( inc_p1_s3 ); - circuit->AddComponent( inc_p1_s4 ); - - circuit->AddComponent( inc_p2_s1 ); - circuit->AddComponent( inc_p2_s2 ); - - circuit->AddComponent( inc_p3_s1 ); - - circuit->AddComponent( probe ); - - // Wire branch 1 - circuit->ConnectOutToIn( counter, 0, inc_p1_s1, 0 ); - circuit->ConnectOutToIn( inc_p1_s1, 0, inc_p1_s2, 0 ); - circuit->ConnectOutToIn( inc_p1_s2, 0, inc_p1_s3, 0 ); - circuit->ConnectOutToIn( inc_p1_s3, 0, inc_p1_s4, 0 ); - circuit->ConnectOutToIn( inc_p1_s4, 0, probe, 0 ); - - // Wire branch 2 - circuit->ConnectOutToIn( counter, 0, inc_p2_s1, 0 ); - circuit->ConnectOutToIn( inc_p2_s1, 0, inc_p2_s2, 0 ); - circuit->ConnectOutToIn( inc_p2_s2, 0, probe, 1 ); - - // Wire branch 3 - circuit->ConnectOutToIn( counter, 0, inc_p3_s1, 0 ); - circuit->ConnectOutToIn( inc_p3_s1, 0, probe, 2 ); - - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - circuit->Tick( Component::TickMode::Series ); - } -} - -TEST_CASE( "FeedbackTest" ) -{ - // Configure a circuit made up of an adder that adds a counter to its own previous output - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto adder = std::make_shared(); - auto passthrough = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - circuit->AddComponent( adder ); - circuit->AddComponent( passthrough ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter, 0, adder, 0 ); - circuit->ConnectOutToIn( adder, 0, passthrough, 0 ); - - circuit->ConnectOutToIn( passthrough, 0, adder, 1 ); - - circuit->ConnectOutToIn( adder, 0, probe, 0 ); - - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - circuit->Tick( Component::TickMode::Series ); - } -} - -TEST_CASE( "FeedbackTestNoCircuit" ) -{ - auto counter = std::make_shared(); - auto adder = std::make_shared(); - auto passthrough = std::make_shared(); - auto probe = std::make_shared(); - - adder->ConnectInput( counter, 0, 0 ); - passthrough->ConnectInput( adder, 0, 0 ); - - adder->ConnectInput( passthrough, 0, 1 ); - - probe->ConnectInput( adder, 0, 0 ); - - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - counter->Tick( Component::TickMode::Series ); - adder->Tick( Component::TickMode::Series ); - passthrough->Tick( Component::TickMode::Series ); - probe->Tick( Component::TickMode::Series ); - - counter->Reset( Component::TickMode::Series ); - adder->Reset( Component::TickMode::Series ); - passthrough->Reset( Component::TickMode::Series ); - probe->Reset( Component::TickMode::Series ); - } -} - -TEST_CASE( "RefCountResetRegressionTest" ) -{ - auto circuit = std::make_shared(); - auto feedback = std::make_shared( 2 ); - - circuit->AddComponent( feedback ); - circuit->SetBufferCount( 2 ); - - feedback->ConnectInput( feedback, 0, 0 ); - feedback->SetValidInputs( 1 ); - - circuit->StartAutoTick( Component::TickMode::Series ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->PauseAutoTick(); - - feedback->ConnectInput( feedback, 0, 1 ); - feedback->ConnectInput( feedback, 0, 2 ); - feedback->ConnectInput( feedback, 0, 3 ); - feedback->SetValidInputs( 4 ); - - circuit->StartAutoTick( Component::TickMode::Series ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->PauseAutoTick(); - - feedback->ConnectInput( feedback, 0, 4 ); - feedback->ConnectInput( feedback, 0, 5 ); - feedback->ConnectInput( feedback, 0, 6 ); - feedback->ConnectInput( feedback, 0, 7 ); - feedback->ConnectInput( feedback, 0, 8 ); - feedback->ConnectInput( feedback, 0, 9 ); - feedback->SetValidInputs( 10 ); - - circuit->StartAutoTick( Component::TickMode::Series ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->StopAutoTick(); -} - -TEST_CASE( "NoOutputTest" ) -{ - // Configure a circuit where the counter responds sporadically - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter, 0, probe, 0 ); - - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - circuit->Tick( Component::TickMode::Series ); - } -} - -TEST_CASE( "ChangingOutputTest" ) -{ - // Configure a circuit whereby a component outputs varying types (int, float, string, vector) - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter, 0, probe, 0 ); - - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - circuit->Tick( Component::TickMode::Series ); - } -} - -TEST_CASE( "ThreadPerformanceTest" ) -{ - // Configure a circuit made up of 4 parallel counters, then adjust the thread count - auto circuit = std::make_shared(); - - auto counter1 = std::make_shared(); - auto counter2 = std::make_shared(); - auto counter3 = std::make_shared(); - auto counter4 = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter1 ); - circuit->AddComponent( counter2 ); - circuit->AddComponent( counter3 ); - circuit->AddComponent( counter4 ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter1, 0, probe, 0 ); - circuit->ConnectOutToIn( counter2, 0, probe, 1 ); - circuit->ConnectOutToIn( counter3, 0, probe, 2 ); - circuit->ConnectOutToIn( counter4, 0, probe, 3 ); - - // Calculate reference efficiency - - SignalBus testBus; - auto measureRef = [&testBus]( std::shared_ptr& counter ) - { - for ( int i = 0; i < 1000; ++i ) - { - counter->Process_( testBus, testBus ); - } - }; - - auto begin = std::chrono::high_resolution_clock::now(); - auto t1 = std::thread( [&measureRef, &counter1]() { measureRef( counter1 ); } ); - auto t2 = std::thread( [&measureRef, &counter2]() { measureRef( counter2 ); } ); - auto t3 = std::thread( [&measureRef, &counter3]() { measureRef( counter3 ); } ); - auto t4 = std::thread( [&measureRef, &counter4]() { measureRef( counter4 ); } ); - t1.join(); - t2.join(); - t3.join(); - t4.join(); - auto end = std::chrono::high_resolution_clock::now(); - refEff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - - counter1->ResetCount(); - counter2->ResetCount(); - counter3->ResetCount(); - counter4->ResetCount(); - - std::cout << "Reference Efficiency: " << refEff << "%" << std::endl; - - // Tick the circuit with no threads - begin = std::chrono::high_resolution_clock::now(); - for ( int i = 0; i < 1000; ++i ) - { - circuit->Tick( Component::TickMode::Series ); - } - end = std::chrono::high_resolution_clock::now(); - auto eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - - auto overhead = 100 - ( 100 * ( eff / refEff ) ); - std::cout << "0x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; - REQUIRE( eff >= refEff * 0.25 * 0.90 ); - - // Tick the circuit with 1 thread, and check that no more ticks occurred - if ( std::thread::hardware_concurrency() < 1 ) - { - return; - } - circuit->SetBufferCount( 1 ); - - begin = std::chrono::high_resolution_clock::now(); - for ( int i = 0; i < 1000; ++i ) - { - circuit->Tick( Component::TickMode::Series ); - } - end = std::chrono::high_resolution_clock::now(); - eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - - overhead = 100 - ( 100 * ( eff / refEff ) ); - std::cout << "1x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; - REQUIRE( eff >= refEff * 0.25 * 0.90 ); - - // Tick the circuit with 2 threads, and check that more ticks occurred - if ( std::thread::hardware_concurrency() < 2 ) - { - return; - } - circuit->SetBufferCount( 2 ); - - begin = std::chrono::high_resolution_clock::now(); - for ( int i = 0; i < 1000; ++i ) - { - circuit->Tick( Component::TickMode::Series ); - } - end = std::chrono::high_resolution_clock::now(); - eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - - overhead = 100 - ( 100 * ( eff / refEff ) ); - std::cout << "2x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; - REQUIRE( eff >= refEff * 0.5 * 0.90 ); - - // Tick the circuit with 3 threads, and check that more ticks occurred - if ( std::thread::hardware_concurrency() < 4 ) - { - return; - } - circuit->SetBufferCount( 3 ); - - begin = std::chrono::high_resolution_clock::now(); - for ( int i = 0; i < 1000; ++i ) - { - circuit->Tick( Component::TickMode::Series ); - } - end = std::chrono::high_resolution_clock::now(); - eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - - overhead = 100 - ( 100 * ( eff / refEff ) ); - std::cout << "3x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; - REQUIRE( eff >= refEff * 0.75 * 0.90 ); - - // Tick the circuit with 4 threads, and check that more ticks occurred - if ( std::thread::hardware_concurrency() < 4 ) - { - return; - } - circuit->SetBufferCount( 4 ); - - begin = std::chrono::high_resolution_clock::now(); - for ( int i = 0; i < 1000; ++i ) - { - circuit->Tick( Component::TickMode::Series ); - } - end = std::chrono::high_resolution_clock::now(); - eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - - overhead = 100 - ( 100 * ( eff / refEff ) ); - std::cout << "4x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; - REQUIRE( eff >= refEff * 0.90 ); -} - -TEST_CASE( "StopAutoTickRegressionTest" ) -{ - auto circuit = std::make_shared(); - - auto counter1 = std::make_shared(); - auto counter2 = std::make_shared(); - auto counter3 = std::make_shared(); - auto counter4 = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter1 ); - circuit->AddComponent( counter2 ); - circuit->AddComponent( counter3 ); - circuit->AddComponent( counter4 ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter1, 0, probe, 0 ); - circuit->ConnectOutToIn( counter2, 0, probe, 1 ); - circuit->ConnectOutToIn( counter3, 0, probe, 2 ); - circuit->ConnectOutToIn( counter4, 0, probe, 3 ); - - circuit->SetBufferCount( std::thread::hardware_concurrency() ); - - circuit->StartAutoTick( Component::TickMode::Series ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->StopAutoTick(); - circuit->RemoveComponent( counter1 ); - circuit->RemoveComponent( counter2 ); - circuit->RemoveComponent( counter3 ); - circuit->RemoveComponent( counter4 ); - circuit->RemoveComponent( probe ); - - REQUIRE( !circuit->RemoveComponent( counter1 ) ); -} - -TEST_CASE( "ThreadAdjustmentTest" ) -{ - // Configure a counter circuit, then adjust the thread count while it's running - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter, 0, probe, 0 ); - circuit->ConnectOutToIn( counter, 0, probe, 1 ); - circuit->ConnectOutToIn( counter, 0, probe, 2 ); - circuit->ConnectOutToIn( counter, 0, probe, 3 ); - - // Tick the circuit for 100ms with 1 thread - circuit->StartAutoTick( Component::TickMode::Series ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - // Adjust the thread count while the circuit is running - circuit->SetBufferCount( 2 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->SetBufferCount( 0 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->SetBufferCount( 4 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->SetBufferCount( 2 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->SetBufferCount( 3 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->StopAutoTick(); - - REQUIRE( circuit->GetBufferCount() == 3 ); -} - -TEST_CASE( "WiringTest" ) -{ - // Configure a counter circuit, then re-wire it while it's running - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto probe = std::make_shared(); - - circuit->ConnectOutToIn( counter, 0, probe, 0 ); - circuit->ConnectOutToIn( probe, 0, counter, 0 ); - - // Tick the circuit for 100ms with 1 thread - circuit->StartAutoTick( Component::TickMode::Series ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - // Re-wire - - auto pass_s1 = std::make_shared(); - circuit->AddComponent( pass_s1 ); - - circuit->ConnectOutToIn( pass_s1, 0, probe, 0 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->ConnectOutToIn( counter, 0, pass_s1, 0 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - // Disconnect a component - - circuit->PauseAutoTick(); - probe->DisconnectInput( 0 ); - circuit->ResumeAutoTick(); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->DisconnectComponent( probe ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - // Wire in a new component - - auto pass_s2 = std::make_shared(); - circuit->AddComponent( pass_s2 ); - - circuit->ConnectOutToIn( probe, 0, counter, 0 ); - circuit->ConnectOutToIn( pass_s2, 0, probe, 0 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->ConnectOutToIn( pass_s1, 0, pass_s2, 0 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// auto pass_s1 = std::make_shared(); +// circuit->AddComponent( pass_s1 ); - circuit->StopAutoTick(); -} +// circuit->ConnectOutToIn( pass_s1, 0, probe, 0 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -//================================================================================================= +// circuit->ConnectOutToIn( counter, 0, pass_s1, 0 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -TEST_CASE( "SerialTest2" ) -{ - // Configure a circuit made up of a counter and 5 incrementers in series - auto circuit = std::make_shared(); +// // Disconnect a component - auto counter = std::make_shared(); - auto inc_s1 = std::make_shared( 1 ); - auto inc_s2 = std::make_shared( 2 ); - auto inc_s3 = std::make_shared( 3 ); - auto inc_s4 = std::make_shared( 4 ); - auto inc_s5 = std::make_shared( 5 ); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - circuit->AddComponent( inc_s1 ); - circuit->AddComponent( inc_s2 ); - circuit->AddComponent( inc_s3 ); - circuit->AddComponent( inc_s4 ); - circuit->AddComponent( inc_s5 ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter, 0, inc_s1, 0 ); - circuit->ConnectOutToIn( inc_s1, 0, inc_s2, 0 ); - circuit->ConnectOutToIn( inc_s2, 0, inc_s3, 0 ); - circuit->ConnectOutToIn( inc_s3, 0, inc_s4, 0 ); - circuit->ConnectOutToIn( inc_s4, 0, inc_s5, 0 ); - circuit->ConnectOutToIn( inc_s5, 0, probe, 0 ); - - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - circuit->Tick( Component::TickMode::Parallel ); - } -} +// circuit->PauseAutoTick(); +// probe->DisconnectInput( 0 ); +// circuit->ResumeAutoTick(); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); +// circuit->DisconnectComponent( probe ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -TEST_CASE( "ParallelTest2" ) -{ - // Configure a circuit made up of a counter and 5 incrementers in parallel - auto circuit = std::make_shared(); +// // Wire in a new component - auto counter = std::make_shared(); - auto inc_p1 = std::make_shared( 1 ); - auto inc_p2 = std::make_shared( 2 ); - auto inc_p3 = std::make_shared( 3 ); - auto inc_p4 = std::make_shared( 4 ); - auto inc_p5 = std::make_shared( 5 ); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - circuit->AddComponent( inc_p1 ); - circuit->AddComponent( inc_p2 ); - circuit->AddComponent( inc_p3 ); - circuit->AddComponent( inc_p4 ); - circuit->AddComponent( inc_p5 ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter, 0, inc_p1, 0 ); - circuit->ConnectOutToIn( counter, 0, inc_p2, 0 ); - circuit->ConnectOutToIn( counter, 0, inc_p3, 0 ); - circuit->ConnectOutToIn( counter, 0, inc_p4, 0 ); - circuit->ConnectOutToIn( counter, 0, inc_p5, 0 ); - circuit->ConnectOutToIn( inc_p1, 0, probe, 0 ); - circuit->ConnectOutToIn( inc_p2, 0, probe, 1 ); - circuit->ConnectOutToIn( inc_p3, 0, probe, 2 ); - circuit->ConnectOutToIn( inc_p4, 0, probe, 3 ); - circuit->ConnectOutToIn( inc_p5, 0, probe, 4 ); - - // Tick the circuit for 100ms with 3 threads - circuit->SetBufferCount( 3 ); - circuit->StartAutoTick( Component::TickMode::Parallel ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->StopAutoTick(); -} +// auto pass_s2 = std::make_shared(); +// circuit->AddComponent( pass_s2 ); -TEST_CASE( "BranchSyncTest2" ) -{ - // Configure a circuit made up of 3 parallel branches of 4, 2, and 1 component(s) respectively - auto circuit = std::make_shared(); +// circuit->ConnectOutToIn( probe, 0, counter, 0 ); +// circuit->ConnectOutToIn( pass_s2, 0, probe, 0 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - auto counter = std::make_shared(); - auto inc_p1_s1 = std::make_shared(); - auto inc_p1_s2 = std::make_shared(); - auto inc_p1_s3 = std::make_shared(); - auto inc_p1_s4 = std::make_shared(); - auto inc_p2_s1 = std::make_shared(); - auto inc_p2_s2 = std::make_shared(); - auto inc_p3_s1 = std::make_shared(); - auto probe = std::make_shared(); +// circuit->ConnectOutToIn( pass_s1, 0, pass_s2, 0 ); +// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->AddComponent( counter ); +// circuit->StopAutoTick(); +// } - circuit->AddComponent( inc_p1_s1 ); - circuit->AddComponent( inc_p1_s2 ); - circuit->AddComponent( inc_p1_s3 ); - circuit->AddComponent( inc_p1_s4 ); +// //================================================================================================= - circuit->AddComponent( inc_p2_s1 ); - circuit->AddComponent( inc_p2_s2 ); +// TEST_CASE( "ThreadStopRegressionTest" ) +// { +// // Configure a circuit made up of 3 parallel branches of 4, 2, and 1 component(s) respectively +// auto circuit = std::make_shared(); - circuit->AddComponent( inc_p3_s1 ); +// auto counter = std::make_shared(); +// auto inc_p1_s1 = std::make_shared(); +// auto inc_p1_s2 = std::make_shared(); +// auto inc_p1_s3 = std::make_shared(); +// auto inc_p1_s4 = std::make_shared(); +// auto inc_p2_s1 = std::make_shared(); +// auto inc_p2_s2 = std::make_shared(); +// auto inc_p3_s1 = std::make_shared(); +// auto probe = std::make_shared(); - circuit->AddComponent( probe ); +// circuit->AddComponent( counter ); - // Wire branch 1 - circuit->ConnectOutToIn( counter, 0, inc_p1_s1, 0 ); - circuit->ConnectOutToIn( inc_p1_s1, 0, inc_p1_s2, 0 ); - circuit->ConnectOutToIn( inc_p1_s2, 0, inc_p1_s3, 0 ); - circuit->ConnectOutToIn( inc_p1_s3, 0, inc_p1_s4, 0 ); - circuit->ConnectOutToIn( inc_p1_s4, 0, probe, 0 ); +// circuit->AddComponent( inc_p1_s1 ); +// circuit->AddComponent( inc_p1_s2 ); +// circuit->AddComponent( inc_p1_s3 ); +// circuit->AddComponent( inc_p1_s4 ); - // Wire branch 2 - circuit->ConnectOutToIn( counter, 0, inc_p2_s1, 0 ); - circuit->ConnectOutToIn( inc_p2_s1, 0, inc_p2_s2, 0 ); - circuit->ConnectOutToIn( inc_p2_s2, 0, probe, 1 ); +// circuit->AddComponent( inc_p2_s1 ); +// circuit->AddComponent( inc_p2_s2 ); - // Wire branch 3 - circuit->ConnectOutToIn( counter, 0, inc_p3_s1, 0 ); - circuit->ConnectOutToIn( inc_p3_s1, 0, probe, 2 ); +// circuit->AddComponent( inc_p3_s1 ); - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - circuit->Tick( Component::TickMode::Parallel ); - } -} +// circuit->AddComponent( probe ); -TEST_CASE( "FeedbackTest2" ) -{ - // Configure a circuit made up of an adder that adds a counter to its own previous output - auto circuit = std::make_shared(); +// // Wire branch 1 +// circuit->ConnectOutToIn( counter, 0, inc_p1_s1, 0 ); +// circuit->ConnectOutToIn( inc_p1_s1, 0, inc_p1_s2, 0 ); +// circuit->ConnectOutToIn( inc_p1_s2, 0, inc_p1_s3, 0 ); +// circuit->ConnectOutToIn( inc_p1_s3, 0, inc_p1_s4, 0 ); +// circuit->ConnectOutToIn( inc_p1_s4, 0, probe, 0 ); - auto counter = std::make_shared(); - auto adder = std::make_shared(); - auto passthrough = std::make_shared(); - auto probe = std::make_shared(); +// // Wire branch 2 +// circuit->ConnectOutToIn( counter, 0, inc_p2_s1, 0 ); +// circuit->ConnectOutToIn( inc_p2_s1, 0, inc_p2_s2, 0 ); +// circuit->ConnectOutToIn( inc_p2_s2, 0, probe, 1 ); - circuit->AddComponent( counter ); - circuit->AddComponent( adder ); - circuit->AddComponent( passthrough ); - circuit->AddComponent( probe ); +// // Wire branch 3 +// circuit->ConnectOutToIn( counter, 0, inc_p3_s1, 0 ); +// circuit->ConnectOutToIn( inc_p3_s1, 0, probe, 2 ); - circuit->ConnectOutToIn( counter, 0, adder, 0 ); - circuit->ConnectOutToIn( adder, 0, passthrough, 0 ); +// // Tick the circuit 100 times +// for ( int i = 0; i < 100; ++i ) +// { +// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick( Component::TickMode::Parallel ); +// } - circuit->ConnectOutToIn( passthrough, 0, adder, 1 ); +// circuit->SetBufferCount( 30 ); - circuit->ConnectOutToIn( adder, 0, probe, 0 ); +// for ( int i = 0; i < 100; ++i ) +// { +// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick( Component::TickMode::Parallel ); +// } +// } - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - circuit->Tick( Component::TickMode::Parallel ); - } -} +// TEST_CASE( "DisconnectComponentRegressionTest" ) +// { +// auto circuit = std::make_shared(); -TEST_CASE( "FeedbackTestNoCircuit2" ) -{ - auto counter = std::make_shared(); - auto adder = std::make_shared(); - auto passthrough = std::make_shared(); - auto probe = std::make_shared(); +// auto counter = std::make_shared(); +// auto probe = std::make_shared(); - adder->ConnectInput( counter, 0, 0 ); - passthrough->ConnectInput( adder, 0, 0 ); +// circuit->AddComponent( counter ); +// circuit->AddComponent( probe ); - adder->ConnectInput( passthrough, 0, 1 ); +// circuit->ConnectOutToIn( counter, 0, probe, 0 ); +// circuit->ConnectOutToIn( counter, 0, probe, 1 ); - probe->ConnectInput( adder, 0, 0 ); +// circuit->DisconnectComponent( counter ); - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - counter->Tick( Component::TickMode::Parallel ); - adder->Tick( Component::TickMode::Parallel ); - passthrough->Tick( Component::TickMode::Parallel ); - probe->Tick( Component::TickMode::Parallel ); - - counter->Reset( Component::TickMode::Parallel ); - adder->Reset( Component::TickMode::Parallel ); - passthrough->Reset( Component::TickMode::Parallel ); - probe->Reset( Component::TickMode::Parallel ); - } -} +// circuit->Tick( Component::TickMode::Series ); +// } + +// TEST_CASE( "AutoTickOnCircuitDestructRegressionTest" ) +// { +// auto circuit = std::make_shared(); +// auto counter = std::make_shared(); +// circuit->AddComponent( counter ); +// circuit->SetBufferCount( 3 ); + +// REQUIRE( counter->Count() == 0 ); +// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick( Component::TickMode::Series ); -TEST_CASE( "RefCountResetRegressionTest2" ) -{ - auto circuit = std::make_shared(); - auto feedback = std::make_shared( 2 ); - - circuit->AddComponent( feedback ); - circuit->SetBufferCount( 2 ); - - feedback->ConnectInput( feedback, 0, 0 ); - feedback->SetValidInputs( 1 ); - - circuit->StartAutoTick( Component::TickMode::Parallel ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->PauseAutoTick(); - - feedback->ConnectInput( feedback, 0, 1 ); - feedback->ConnectInput( feedback, 0, 2 ); - feedback->ConnectInput( feedback, 0, 3 ); - feedback->SetValidInputs( 4 ); - - circuit->StartAutoTick( Component::TickMode::Parallel ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->PauseAutoTick(); - - feedback->ConnectInput( feedback, 0, 4 ); - feedback->ConnectInput( feedback, 0, 5 ); - feedback->ConnectInput( feedback, 0, 6 ); - feedback->ConnectInput( feedback, 0, 7 ); - feedback->ConnectInput( feedback, 0, 8 ); - feedback->ConnectInput( feedback, 0, 9 ); - feedback->SetValidInputs( 10 ); - - circuit->StartAutoTick( Component::TickMode::Parallel ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->StopAutoTick(); -} - -TEST_CASE( "NoOutputTest2" ) -{ - // Configure a circuit where the counter responds sporadically - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter, 0, probe, 0 ); - - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - circuit->Tick( Component::TickMode::Parallel ); - } -} - -TEST_CASE( "ChangingOutputTest2" ) -{ - // Configure a circuit whereby a component outputs varying types (int, float, string, vector) - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter, 0, probe, 0 ); - - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - circuit->Tick( Component::TickMode::Parallel ); - } -} - -TEST_CASE( "ThreadPerformanceTest2" ) -{ - double cores = std::thread::hardware_concurrency(); - cores = cores == 3.0 ? 2.0 : cores; - cores = cores > 4.0 ? 4.0 : cores; - auto effFrac = cores / 4.0; - - // Configure a circuit made up of 4 parallel counters, then adjust the thread count - auto circuit = std::make_shared(); - - auto counter1 = std::make_shared(); - auto counter2 = std::make_shared(); - auto counter3 = std::make_shared(); - auto counter4 = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter1 ); - circuit->AddComponent( counter2 ); - circuit->AddComponent( counter3 ); - circuit->AddComponent( counter4 ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter1, 0, probe, 0 ); - circuit->ConnectOutToIn( counter2, 0, probe, 1 ); - circuit->ConnectOutToIn( counter3, 0, probe, 2 ); - circuit->ConnectOutToIn( counter4, 0, probe, 3 ); - - // Tick the circuit with no threads - auto begin = std::chrono::high_resolution_clock::now(); - for ( int i = 0; i < 1000; ++i ) - { - circuit->Tick( Component::TickMode::Parallel ); - } - auto end = std::chrono::high_resolution_clock::now(); - auto eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - - auto overhead = 100 - ( 100 * ( eff / refEff ) ); - std::cout << "0x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; - REQUIRE( eff >= refEff * effFrac * 0.85 ); - - // Tick the circuit with 1 thread, and check that no more ticks occurred - if ( std::thread::hardware_concurrency() < 1 ) - { - return; - } - circuit->SetBufferCount( 1 ); - - begin = std::chrono::high_resolution_clock::now(); - for ( int i = 0; i < 1000; ++i ) - { - circuit->Tick( Component::TickMode::Parallel ); - } - end = std::chrono::high_resolution_clock::now(); - eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - - overhead = 100 - ( 100 * ( eff / refEff ) ); - std::cout << "1x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; - REQUIRE( eff >= refEff * effFrac * 0.85 ); - - // Tick the circuit with 2 threads, and check that more ticks occurred - if ( std::thread::hardware_concurrency() < 2 ) - { - return; - } - circuit->SetBufferCount( 2 ); - - begin = std::chrono::high_resolution_clock::now(); - for ( int i = 0; i < 1000; ++i ) - { - circuit->Tick( Component::TickMode::Parallel ); - } - end = std::chrono::high_resolution_clock::now(); - eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - - overhead = 100 - ( 100 * ( eff / refEff ) ); - std::cout << "2x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; - REQUIRE( eff >= refEff * effFrac * 0.90 ); - - // Tick the circuit with 3 threads, and check that more ticks occurred - if ( std::thread::hardware_concurrency() < 4 ) - { - return; - } - circuit->SetBufferCount( 3 ); - - begin = std::chrono::high_resolution_clock::now(); - for ( int i = 0; i < 1000; ++i ) - { - circuit->Tick( Component::TickMode::Parallel ); - } - end = std::chrono::high_resolution_clock::now(); - eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - - overhead = 100 - ( 100 * ( eff / refEff ) ); - std::cout << "3x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; - REQUIRE( eff >= refEff * effFrac * 0.90 ); - - // Tick the circuit with 4 threads, and check that more ticks occurred - if ( std::thread::hardware_concurrency() < 4 ) - { - return; - } - circuit->SetBufferCount( 4 ); +// circuit = nullptr; + +// REQUIRE( counter->Count() == 4 ); +// } + +// TEST_CASE( "AutoTickOnBuffersUpdateRegressionTest" ) +// { +// auto circuit = std::make_shared(); +// auto counter = std::make_shared(); +// circuit->AddComponent( counter ); +// circuit->SetBufferCount( 3 ); + +// REQUIRE( counter->Count() == 0 ); +// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick( Component::TickMode::Series ); + +// circuit->SetBufferCount( 2 ); - begin = std::chrono::high_resolution_clock::now(); - for ( int i = 0; i < 1000; ++i ) - { - circuit->Tick( Component::TickMode::Parallel ); - } - end = std::chrono::high_resolution_clock::now(); - eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - - overhead = 100 - ( 100 * ( eff / refEff ) ); - std::cout << "4x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; - REQUIRE( eff >= refEff * effFrac * 0.90 ); -} - -TEST_CASE( "StopAutoTickRegressionTest2" ) -{ - auto circuit = std::make_shared(); - - auto counter1 = std::make_shared(); - auto counter2 = std::make_shared(); - auto counter3 = std::make_shared(); - auto counter4 = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter1 ); - circuit->AddComponent( counter2 ); - circuit->AddComponent( counter3 ); - circuit->AddComponent( counter4 ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter1, 0, probe, 0 ); - circuit->ConnectOutToIn( counter2, 0, probe, 1 ); - circuit->ConnectOutToIn( counter3, 0, probe, 2 ); - circuit->ConnectOutToIn( counter4, 0, probe, 3 ); - - circuit->SetBufferCount( std::thread::hardware_concurrency() ); - - circuit->StartAutoTick( Component::TickMode::Parallel ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->StopAutoTick(); - circuit->RemoveComponent( counter1 ); - circuit->RemoveComponent( counter2 ); - circuit->RemoveComponent( counter3 ); - circuit->RemoveComponent( counter4 ); - circuit->RemoveComponent( probe ); -} - -TEST_CASE( "ThreadAdjustmentTest2" ) -{ - // Configure a counter circuit, then adjust the thread count while it's running - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter, 0, probe, 0 ); - circuit->ConnectOutToIn( counter, 0, probe, 1 ); - circuit->ConnectOutToIn( counter, 0, probe, 2 ); - circuit->ConnectOutToIn( counter, 0, probe, 3 ); - - // Tick the circuit for 100ms with 1 thread - circuit->StartAutoTick( Component::TickMode::Parallel ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - // Adjust the thread count while the circuit is running - circuit->SetBufferCount( 2 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->SetBufferCount( 0 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->SetBufferCount( 4 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->SetBufferCount( 2 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->SetBufferCount( 3 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->StopAutoTick(); - - REQUIRE( circuit->GetBufferCount() == 3 ); -} - -TEST_CASE( "WiringTest2" ) -{ - // Configure a counter circuit, then re-wire it while it's running - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto probe = std::make_shared(); - - circuit->ConnectOutToIn( counter, 0, probe, 0 ); - circuit->ConnectOutToIn( probe, 0, counter, 0 ); - - // Tick the circuit for 100ms with 1 thread - circuit->StartAutoTick( Component::TickMode::Parallel ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - // Re-wire - - auto pass_s1 = std::make_shared(); - circuit->AddComponent( pass_s1 ); - - circuit->ConnectOutToIn( pass_s1, 0, probe, 0 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->ConnectOutToIn( counter, 0, pass_s1, 0 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - // Disconnect a component - - circuit->PauseAutoTick(); - probe->DisconnectInput( 0 ); - circuit->ResumeAutoTick(); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - circuit->DisconnectComponent( probe ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - // Wire in a new component - - auto pass_s2 = std::make_shared(); - circuit->AddComponent( pass_s2 ); - - circuit->ConnectOutToIn( probe, 0, counter, 0 ); - circuit->ConnectOutToIn( pass_s2, 0, probe, 0 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->ConnectOutToIn( pass_s1, 0, pass_s2, 0 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - - circuit->StopAutoTick(); -} - -//================================================================================================= - -TEST_CASE( "ThreadStopRegressionTest" ) -{ - // Configure a circuit made up of 3 parallel branches of 4, 2, and 1 component(s) respectively - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto inc_p1_s1 = std::make_shared(); - auto inc_p1_s2 = std::make_shared(); - auto inc_p1_s3 = std::make_shared(); - auto inc_p1_s4 = std::make_shared(); - auto inc_p2_s1 = std::make_shared(); - auto inc_p2_s2 = std::make_shared(); - auto inc_p3_s1 = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - - circuit->AddComponent( inc_p1_s1 ); - circuit->AddComponent( inc_p1_s2 ); - circuit->AddComponent( inc_p1_s3 ); - circuit->AddComponent( inc_p1_s4 ); - - circuit->AddComponent( inc_p2_s1 ); - circuit->AddComponent( inc_p2_s2 ); - - circuit->AddComponent( inc_p3_s1 ); - - circuit->AddComponent( probe ); - - // Wire branch 1 - circuit->ConnectOutToIn( counter, 0, inc_p1_s1, 0 ); - circuit->ConnectOutToIn( inc_p1_s1, 0, inc_p1_s2, 0 ); - circuit->ConnectOutToIn( inc_p1_s2, 0, inc_p1_s3, 0 ); - circuit->ConnectOutToIn( inc_p1_s3, 0, inc_p1_s4, 0 ); - circuit->ConnectOutToIn( inc_p1_s4, 0, probe, 0 ); - - // Wire branch 2 - circuit->ConnectOutToIn( counter, 0, inc_p2_s1, 0 ); - circuit->ConnectOutToIn( inc_p2_s1, 0, inc_p2_s2, 0 ); - circuit->ConnectOutToIn( inc_p2_s2, 0, probe, 1 ); - - // Wire branch 3 - circuit->ConnectOutToIn( counter, 0, inc_p3_s1, 0 ); - circuit->ConnectOutToIn( inc_p3_s1, 0, probe, 2 ); - - // Tick the circuit 100 times - for ( int i = 0; i < 100; ++i ) - { - circuit->Tick( Component::TickMode::Series ); - circuit->Tick( Component::TickMode::Parallel ); - } - - circuit->SetBufferCount( 30 ); - - for ( int i = 0; i < 100; ++i ) - { - circuit->Tick( Component::TickMode::Series ); - circuit->Tick( Component::TickMode::Parallel ); - } -} - -TEST_CASE( "DisconnectComponentRegressionTest" ) -{ - auto circuit = std::make_shared(); - - auto counter = std::make_shared(); - auto probe = std::make_shared(); - - circuit->AddComponent( counter ); - circuit->AddComponent( probe ); - - circuit->ConnectOutToIn( counter, 0, probe, 0 ); - circuit->ConnectOutToIn( counter, 0, probe, 1 ); - - circuit->DisconnectComponent( counter ); - - circuit->Tick( Component::TickMode::Series ); -} - -TEST_CASE( "AutoTickOnCircuitDestructRegressionTest" ) -{ - auto circuit = std::make_shared(); - auto counter = std::make_shared(); - circuit->AddComponent( counter ); - circuit->SetBufferCount( 3 ); - - REQUIRE( counter->Count() == 0 ); - circuit->Tick( Component::TickMode::Series ); - circuit->Tick( Component::TickMode::Series ); - circuit->Tick( Component::TickMode::Series ); - circuit->Tick( Component::TickMode::Series ); - - circuit = nullptr; - - REQUIRE( counter->Count() == 4 ); -} - -TEST_CASE( "AutoTickOnBuffersUpdateRegressionTest" ) -{ - auto circuit = std::make_shared(); - auto counter = std::make_shared(); - circuit->AddComponent( counter ); - circuit->SetBufferCount( 3 ); - - REQUIRE( counter->Count() == 0 ); - circuit->Tick( Component::TickMode::Series ); - circuit->Tick( Component::TickMode::Series ); - circuit->Tick( Component::TickMode::Series ); - circuit->Tick( Component::TickMode::Series ); - - circuit->SetBufferCount( 2 ); - - REQUIRE( counter->Count() == 4 ); -} +// REQUIRE( counter->Count() == 4 ); +// } TEST_CASE( "TenThousandComponents" ) { From 071c14f158036d3dab4bbca10b75e1080b08cebd Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Sun, 27 Aug 2023 20:28:44 +0100 Subject: [PATCH 10/17] Clean up Component.cpp --- src/Component.cpp | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/src/Component.cpp b/src/Component.cpp index b120167d..e645a7fc 100644 --- a/src/Component.cpp +++ b/src/Component.cpp @@ -47,22 +47,9 @@ class Component enum class TickStatus { NotTicked, - TickStarted, Ticking }; - struct MovableMutex - { - MovableMutex() = default; - - // cppcheck-suppress missingMemberCopy - MovableMutex( MovableMutex&& ) - { - } - - std::mutex mutex; - }; - struct MovableAtomicFlag { MovableAtomicFlag() = default; @@ -95,7 +82,6 @@ class Component std::vector outputBuses; std::vector>> refs; // ref_total:ref_counter per output, per buffer - std::vector> refMutexes; std::vector inputWires; @@ -229,7 +215,6 @@ void Component::SetBufferCount( int bufferCount ) p->releaseFlags.resize( bufferCount ); p->refs.resize( bufferCount ); - p->refMutexes.resize( bufferCount ); // init vector values for ( int i = 0; i < bufferCount; ++i ) @@ -247,8 +232,6 @@ void Component::SetBufferCount( int bufferCount ) // sync output reference counts p->refs[i][j] = p->refs[0][j]; } - - p->refMutexes[i].resize( p->refMutexes[0].size() ); } p->releaseFlags[0].flag.clear(); @@ -345,10 +328,6 @@ void Component::SetOutputCount_( int outputCount, const std::vector { ref.resize( outputCount ); } - for ( auto& refMutexes : p->refMutexes ) - { - refMutexes.resize( outputCount ); - } } void internal::Component::WaitForRelease( int threadNo ) @@ -391,15 +370,13 @@ void internal::Component::GetOutput( int bufferNo, int fromOutput, int toInput, } else if ( ++ref.second != ref.first ) { + // this is not the final reference, copy the signal toBus.SetSignal( toInput, signal ); return; } - else - { - // this is the final reference, reset the counter, move the signal - ref.second = 0; - } + // this is the final reference, reset the counter, move the signal + ref.second = 0; toBus.MoveSignal( toInput, signal ); } From 6a5cc3e8b3fc571291372ec4a43afa66c2be5401 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Sun, 27 Aug 2023 20:47:08 +0100 Subject: [PATCH 11/17] Merge branch 'master' into std_any-test --- CHANGES | 5 + CMakeLists.txt | 4 +- docs/Doxyfile | 2 +- docs/html/_auto_tick_thread_8h_source.html | 53 +- docs/html/_circuit_8h_source.html | 72 +-- docs/html/_circuit_thread_8h_source.html | 29 +- docs/html/_common_8h_source.html | 48 +- docs/html/_component_8h_source.html | 107 ++- docs/html/_d_s_patch_8h_source.html | 2 +- docs/html/_plugin_8h_source.html | 2 +- docs/html/_signal_bus_8h_source.html | 2 +- docs/html/_wire_8h_source.html | 2 +- docs/html/annotated.html | 13 +- .../class_d_s_patch_1_1_circuit-members.html | 6 +- docs/html/class_d_s_patch_1_1_circuit.html | 19 +- ...class_d_s_patch_1_1_component-members.html | 9 +- docs/html/class_d_s_patch_1_1_component.html | 48 +- .../class_d_s_patch_1_1_plugin-members.html | 2 +- docs/html/class_d_s_patch_1_1_plugin.html | 2 +- ...lass_d_s_patch_1_1_signal_bus-members.html | 2 +- docs/html/class_d_s_patch_1_1_signal_bus.html | 2 +- ...internal_1_1_auto_tick_thread-members.html | 15 +- ...atch_1_1internal_1_1_auto_tick_thread.html | 11 +- ..._1internal_1_1_circuit_thread-members.html | 4 +- ..._patch_1_1internal_1_1_circuit_thread.html | 8 +- docs/html/classes.html | 4 +- .../dir_3756d50f4003bc63fa3fe49460f9c79d.html | 4 +- .../dir_68267d1309a1af8e8297ef4c3efbcdba.html | 2 +- .../dir_96ae4afe4ae1b3c2e5b248f6fc6b60cd.html | 2 +- .../dir_d44c64559bbebec7f509842c48db8b23.html | 2 +- docs/html/files.html | 5 +- docs/html/index.html | 5 +- docs/html/search/all_1.js | 3 +- docs/html/search/classes_1.js | 3 +- ..._s_patch_1_1internal_1_1_wire-members.html | 2 +- ...struct_d_s_patch_1_1internal_1_1_wire.html | 2 +- include/DSPatch.h | 6 +- include/dspatch/Circuit.h | 10 +- include/dspatch/Component.h | 14 +- meson.build | 1 - src/Circuit.cpp | 16 +- src/Component.cpp | 202 ++---- src/internal/AutoTickThread.cpp | 10 +- src/internal/AutoTickThread.h | 5 +- src/internal/CircuitThread.cpp | 10 +- src/internal/CircuitThread.h | 3 +- src/internal/ComponentThread.cpp | 138 ---- src/internal/ComponentThread.h | 85 --- tests/main.cpp | 610 ++---------------- 49 files changed, 331 insertions(+), 1282 deletions(-) delete mode 100644 src/internal/ComponentThread.cpp delete mode 100644 src/internal/ComponentThread.h diff --git a/CHANGES b/CHANGES index 54417eb6..f583f5b7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +v.9.7.0 (27 August 2023) + - Improved tick performance by removing non-scalable "Parallel" mode. + - Replaced custom YieldThread() method with std::this_thread::yield(). + - Updated fast_any submodule (incl. inline initialization of value type). + v.9.6.1 (24 August 2023) - Reverted some "optimizations" that actually made things slower. diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a8d958b..c7fcc2ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ set(CMAKE_CXX_EXTENSIONS OFF) # Set version information. set(DSPATCH_MAJOR 9) -set(DSPATCH_MINOR 6) -set(DSPATCH_MICRO 1) +set(DSPATCH_MINOR 7) +set(DSPATCH_MICRO 0) if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W4") diff --git a/docs/Doxyfile b/docs/Doxyfile index 6d72b4e6..c4e91b0f 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = DSPatch # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v.9.6.1 +PROJECT_NUMBER = v.9.7.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/docs/html/_auto_tick_thread_8h_source.html b/docs/html/_auto_tick_thread_8h_source.html index f9aa4238..c89c63a0 100644 --- a/docs/html/_auto_tick_thread_8h_source.html +++ b/docs/html/_auto_tick_thread_8h_source.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -127,33 +127,30 @@
56 AutoTickThread();
57 ~AutoTickThread();
58
-
59 DSPatch::Component::TickMode Mode() const;
-
60
-
61 bool IsStopped() const;
-
62 bool IsPaused() const;
-
63
-
64 void Start( DSPatch::Circuit* circuit, DSPatch::Component::TickMode mode );
-
65 void Stop();
-
66 void Pause();
-
67 void Resume();
-
68
-
69private:
-
70 void _Run();
-
71
-
72private:
-
73 DSPatch::Component::TickMode _mode = DSPatch::Component::TickMode::Series;
-
74 std::thread _thread;
-
75 DSPatch::Circuit* _circuit = nullptr;
-
76 bool _stop = false;
-
77 bool _pause = false;
-
78 bool _stopped = true;
-
79 std::mutex _resumeMutex;
-
80 std::condition_variable _resumeCondt, _pauseCondt;
-
81};
-
82
-
83} // namespace internal
-
84} // namespace DSPatch
-
DSPatch::Circuit
Workspace for adding and routing components.
Definition Circuit.h:67
+
59 bool IsStopped() const;
+
60 bool IsPaused() const;
+
61
+
62 void Start( DSPatch::Circuit* circuit );
+
63 void Stop();
+
64 void Pause();
+
65 void Resume();
+
66
+
67private:
+
68 void _Run();
+
69
+
70private:
+
71 std::thread _thread;
+
72 DSPatch::Circuit* _circuit = nullptr;
+
73 bool _stop = false;
+
74 bool _pause = false;
+
75 bool _stopped = true;
+
76 std::mutex _resumeMutex;
+
77 std::condition_variable _resumeCondt, _pauseCondt;
+
78};
+
79
+
80} // namespace internal
+
81} // namespace DSPatch
+
DSPatch::Circuit
Workspace for adding and routing components.
Definition Circuit.h:61
DSPatch::internal::AutoTickThread
Thread class for auto-ticking a circuit.
Definition AutoTickThread.h:52
diff --git a/docs/html/_circuit_8h_source.html b/docs/html/_circuit_8h_source.html index fe32d8be..c1f0e686 100644 --- a/docs/html/_circuit_8h_source.html +++ b/docs/html/_circuit_8h_source.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -118,42 +118,42 @@
39}
40
42
-
66class DLLEXPORT Circuit final
-
67{
-
68public:
-
69 NONCOPYABLE( Circuit );
-
70
-
71 Circuit();
-
72 ~Circuit();
-
73
-
74 bool AddComponent( const Component::SPtr& component );
-
75
-
76 bool RemoveComponent( const Component::SPtr& component );
-
77 void RemoveAllComponents();
-
78
-
79 int GetComponentCount() const;
-
80
-
81 bool ConnectOutToIn( const Component::SPtr& fromComponent, int fromOutput, const Component::SPtr& toComponent, int toInput );
+
60class DLLEXPORT Circuit final
+
61{
+
62public:
+
63 NONCOPYABLE( Circuit );
+
64
+
65 Circuit();
+
66 ~Circuit();
+
67
+
68 bool AddComponent( const Component::SPtr& component );
+
69
+
70 bool RemoveComponent( const Component::SPtr& component );
+
71 void RemoveAllComponents();
+
72
+
73 int GetComponentCount() const;
+
74
+
75 bool ConnectOutToIn( const Component::SPtr& fromComponent, int fromOutput, const Component::SPtr& toComponent, int toInput );
+
76
+
77 bool DisconnectComponent( const Component::SPtr& component );
+
78 void DisconnectAllComponents();
+
79
+
80 void SetBufferCount( int bufferCount );
+
81 int GetBufferCount() const;
82
-
83 bool DisconnectComponent( const Component::SPtr& component );
-
84 void DisconnectAllComponents();
-
85
-
86 void SetBufferCount( int bufferCount );
-
87 int GetBufferCount() const;
-
88
-
89 void Tick( Component::TickMode mode = Component::TickMode::Series );
-
90
-
91 void StartAutoTick( Component::TickMode mode = Component::TickMode::Series );
-
92 void StopAutoTick();
-
93 void PauseAutoTick();
-
94 void ResumeAutoTick();
-
95
-
96private:
-
97 internal::Circuit* p;
-
98};
-
99
-
100} // namespace DSPatch
-
DSPatch::Circuit
Workspace for adding and routing components.
Definition Circuit.h:67
+
83 void Tick();
+
84
+
85 void StartAutoTick();
+
86 void StopAutoTick();
+
87 void PauseAutoTick();
+
88 void ResumeAutoTick();
+
89
+
90private:
+
91 internal::Circuit* p;
+
92};
+
93
+
94} // namespace DSPatch
+
DSPatch::Circuit
Workspace for adding and routing components.
Definition Circuit.h:61
diff --git a/docs/html/_circuit_thread_8h_source.html b/docs/html/_circuit_thread_8h_source.html index 81cc2ce6..0ad9fb8a 100644 --- a/docs/html/_circuit_thread_8h_source.html +++ b/docs/html/_circuit_thread_8h_source.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -130,25 +130,24 @@
70 void Start( std::vector<DSPatch::Component::SPtr>* components, int threadNo );
71 void Stop();
72 void Sync();
-
73 void SyncAndResume( DSPatch::Component::TickMode mode );
+
73 void SyncAndResume();
74
75private:
76 void _Run();
77
78private:
-
79 DSPatch::Component::TickMode _mode = DSPatch::Component::TickMode::Series;
-
80 std::thread _thread;
-
81 std::vector<DSPatch::Component::SPtr>* _components = nullptr;
-
82 int _threadNo = 0;
-
83 bool _stop = false;
-
84 bool _stopped = true;
-
85 bool _gotSync = true;
-
86 std::mutex _syncMutex;
-
87 std::condition_variable _resumeCondt, _syncCondt;
-
88};
-
89
-
90} // namespace internal
-
91} // namespace DSPatch
+
79 std::thread _thread;
+
80 std::vector<DSPatch::Component::SPtr>* _components = nullptr;
+
81 int _threadNo = 0;
+
82 bool _stop = false;
+
83 bool _stopped = true;
+
84 bool _gotSync = true;
+
85 std::mutex _syncMutex;
+
86 std::condition_variable _resumeCondt, _syncCondt;
+
87};
+
88
+
89} // namespace internal
+
90} // namespace DSPatch
DSPatch::internal::CircuitThread
Thread class for asynchronously ticking circuit components.
Definition CircuitThread.h:62
diff --git a/docs/html/_common_8h_source.html b/docs/html/_common_8h_source.html index ab3d1084..0f6f50a5 100644 --- a/docs/html/_common_8h_source.html +++ b/docs/html/_common_8h_source.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -138,35 +138,25 @@
59 SetThreadPriority( GetCurrentThread(), THREAD_PRIORITY_HIGHEST );
60}
61
-
62inline void YieldThread()
-
63{
-
64 Sleep( 0 );
-
65}
-
66
-
67} // namespace DSPatch
-
68
-
69#else
+
62} // namespace DSPatch
+
63
+
64#else
+
65
+
66#define DLLEXPORT
+
67
+
68namespace DSPatch
+
69{
70
-
71#define DLLEXPORT
-
72
-
73namespace DSPatch
-
74{
-
75
-
76inline void SetThreadHighPriority()
-
77{
-
78 sched_param sch_params;
-
79 sch_params.sched_priority = sched_get_priority_max( SCHED_RR );
-
80 pthread_setschedparam( pthread_self(), SCHED_RR, &sch_params );
-
81}
-
82
-
83inline void YieldThread()
-
84{
-
85 sched_yield();
-
86}
-
87
-
88} // namespace DSPatch
-
89
-
90#endif
+
71inline void SetThreadHighPriority()
+
72{
+
73 sched_param sch_params;
+
74 sch_params.sched_priority = sched_get_priority_max( SCHED_RR );
+
75 pthread_setschedparam( pthread_self(), SCHED_RR, &sch_params );
+
76}
+
77
+
78} // namespace DSPatch
+
79
+
80#endif
diff --git a/docs/html/_component_8h_source.html b/docs/html/_component_8h_source.html index 86819ec5..71546578 100644 --- a/docs/html/_component_8h_source.html +++ b/docs/html/_component_8h_source.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -118,67 +118,56 @@
39namespace internal
40{
41class Component;
-
42class ComponentThread;
-
43} // namespace internal
-
44
-
46
-
74class DLLEXPORT Component
-
75{
-
76public:
-
77 NONCOPYABLE( Component );
-
78
-
79 using SPtr = std::shared_ptr<Component>;
-
80
-
81 enum class ProcessOrder
-
82 {
-
83 InOrder,
-
84 OutOfOrder
-
85 };
-
86
-
87 enum class TickMode
-
88 {
-
89 Series,
-
90 Parallel
-
91 };
-
92
-
93 Component( ProcessOrder processOrder = ProcessOrder::InOrder );
-
94 virtual ~Component();
-
95
-
96 bool ConnectInput( const Component::SPtr& fromComponent, int fromOutput, int toInput );
+
42} // namespace internal
+
43
+
45
+
73class DLLEXPORT Component
+
74{
+
75public:
+
76 NONCOPYABLE( Component );
+
77
+
78 using SPtr = std::shared_ptr<Component>;
+
79
+
80 enum class ProcessOrder
+
81 {
+
82 InOrder,
+
83 OutOfOrder
+
84 };
+
85
+
86 Component( ProcessOrder processOrder = ProcessOrder::InOrder );
+
87 virtual ~Component();
+
88
+
89 bool ConnectInput( const Component::SPtr& fromComponent, int fromOutput, int toInput );
+
90
+
91 void DisconnectInput( int inputNo );
+
92 void DisconnectInput( const Component::SPtr& fromComponent );
+
93 void DisconnectAllInputs();
+
94
+
95 int GetInputCount() const;
+
96 int GetOutputCount() const;
97
-
98 void DisconnectInput( int inputNo );
-
99 void DisconnectInput( const Component::SPtr& fromComponent );
-
100 void DisconnectAllInputs();
-
101
-
102 int GetInputCount() const;
-
103 int GetOutputCount() const;
-
104
-
105 std::string GetInputName( int inputNo ) const;
-
106 std::string GetOutputName( int outputNo ) const;
-
107
-
108 void SetBufferCount( int bufferCount );
-
109 int GetBufferCount() const;
-
110
-
111 void Tick( TickMode mode = TickMode::Series, int bufferNo = 0 );
-
112 void Reset( TickMode mode = TickMode::Series, int bufferNo = 0 );
-
113
-
114protected:
-
115 virtual void Process_( SignalBus&, SignalBus& ) = 0;
+
98 std::string GetInputName( int inputNo ) const;
+
99 std::string GetOutputName( int outputNo ) const;
+
100
+
101 void SetBufferCount( int bufferCount );
+
102 int GetBufferCount() const;
+
103
+
104 void Tick( int bufferNo = 0 );
+
105 void Reset( int bufferNo = 0 );
+
106
+
107protected:
+
108 virtual void Process_( SignalBus&, SignalBus& ) = 0;
+
109
+
110 void SetInputCount_( int inputCount, const std::vector<std::string>& inputNames = {} );
+
111 void SetOutputCount_( int outputCount, const std::vector<std::string>& outputNames = {} );
+
112
+
113private:
+
114 internal::Component* p;
+
115};
116
-
117 void SetInputCount_( int inputCount, const std::vector<std::string>& inputNames = {} );
-
118 void SetOutputCount_( int outputCount, const std::vector<std::string>& outputNames = {} );
-
119
-
120private:
-
121 friend class internal::ComponentThread;
-
122 void _TickParallel( int bufferNo );
-
123
-
124 internal::Component* p;
-
125};
-
126
-
127} // namespace DSPatch
-
DSPatch::Component
Abstract base class for DSPatch components.
Definition Component.h:75
+
117} // namespace DSPatch
+
DSPatch::Component
Abstract base class for DSPatch components.
Definition Component.h:74
DSPatch::SignalBus
Signal container.
Definition SignalBus.h:57
-
DSPatch::internal::ComponentThread
Thread class for asynchronously ticking a single circuit component.
Definition ComponentThread.h:53
diff --git a/docs/html/_d_s_patch_8h_source.html b/docs/html/_d_s_patch_8h_source.html index bd90c00c..8216bfb2 100644 --- a/docs/html/_d_s_patch_8h_source.html +++ b/docs/html/_d_s_patch_8h_source.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
diff --git a/docs/html/_plugin_8h_source.html b/docs/html/_plugin_8h_source.html index babadb61..0a74708f 100644 --- a/docs/html/_plugin_8h_source.html +++ b/docs/html/_plugin_8h_source.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
diff --git a/docs/html/_signal_bus_8h_source.html b/docs/html/_signal_bus_8h_source.html index 6ce9702a..48923517 100644 --- a/docs/html/_signal_bus_8h_source.html +++ b/docs/html/_signal_bus_8h_source.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
diff --git a/docs/html/_wire_8h_source.html b/docs/html/_wire_8h_source.html index 00679a43..303c7cee 100644 --- a/docs/html/_wire_8h_source.html +++ b/docs/html/_wire_8h_source.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
diff --git a/docs/html/annotated.html b/docs/html/annotated.html index 5d21f30d..5b4bd5cd 100644 --- a/docs/html/annotated.html +++ b/docs/html/annotated.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -79,12 +79,11 @@  ▼Ninternal  CAutoTickThreadThread class for auto-ticking a circuit  CCircuitThreadThread class for asynchronously ticking circuit components - CComponentThreadThread class for asynchronously ticking a single circuit component - CWireConnection between two components - CCircuitWorkspace for adding and routing components - CComponentAbstract base class for DSPatch components - CPluginComponent plugin loader - CSignalBusSignal container + CWireConnection between two components + CCircuitWorkspace for adding and routing components + CComponentAbstract base class for DSPatch components + CPluginComponent plugin loader + CSignalBusSignal container
diff --git a/docs/html/class_d_s_patch_1_1_circuit-members.html b/docs/html/class_d_s_patch_1_1_circuit-members.html index 95d0b56f..130d0382 100644 --- a/docs/html/class_d_s_patch_1_1_circuit-members.html +++ b/docs/html/class_d_s_patch_1_1_circuit-members.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -93,9 +93,9 @@ RemoveComponent(const Component::SPtr &component) (defined in DSPatch::Circuit)DSPatch::Circuit ResumeAutoTick() (defined in DSPatch::Circuit)DSPatch::Circuit SetBufferCount(int bufferCount) (defined in DSPatch::Circuit)DSPatch::Circuit - StartAutoTick(Component::TickMode mode=Component::TickMode::Series) (defined in DSPatch::Circuit)DSPatch::Circuit + StartAutoTick() (defined in DSPatch::Circuit)DSPatch::Circuit StopAutoTick() (defined in DSPatch::Circuit)DSPatch::Circuit - Tick(Component::TickMode mode=Component::TickMode::Series) (defined in DSPatch::Circuit)DSPatch::Circuit + Tick() (defined in DSPatch::Circuit)DSPatch::Circuit ~Circuit() (defined in DSPatch::Circuit)DSPatch::Circuit
diff --git a/docs/html/class_d_s_patch_1_1_circuit.html b/docs/html/class_d_s_patch_1_1_circuit.html index 9a549857..f4fd1a64 100644 --- a/docs/html/class_d_s_patch_1_1_circuit.html +++ b/docs/html/class_d_s_patch_1_1_circuit.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -118,12 +118,12 @@ int GetBufferCount () const   - -void Tick (Component::TickMode mode=Component::TickMode::Series) -  - -void StartAutoTick (Component::TickMode mode=Component::TickMode::Series) -  + +void Tick () +  + +void StartAutoTick () +  void StopAutoTick ()   @@ -139,10 +139,9 @@

Components can be added to a Circuit via the AddComponent() method, and routed to and from other components via the ConnectOutToIn() methods.

NOTE: Each component input can only accept a single "wire" at a time. When a wire is connected to an input that already has a connected wire, that wire is replaced with the new one. One output, on the other hand, can be distributed to multiple inputs.

To boost performance in stream processing circuits, multi-buffering can be enabled via the SetBufferCount() method. A circuit's buffer count can be adjusted at runtime.

-

The Circuit Tick() method runs through its internal array of components and calls each component's Tick() and Reset() methods once. A circuit's Tick() method can be called in a loop from the main application thread, or alternatively, by calling StartAutoTick(), a separate thread will spawn, automatically calling Tick() continuously until PauseAutoTick() or StopAutoTick() is called.

-

TickMode::Parallel will spawn a thread per component in a circuit. The aim of this mode is to improve the performance of small circuits that contain parallel branches. TickMode::Series (default) on the other hand, tells the circuit to tick its components one-by-one in a single thread per buffer. This mode aims to improve the performance of large circuits, as well as small circuits that do not contain parallel branches.

+

The Circuit Tick() method runs through its internal array of components and calls each component's Tick() and Reset() methods once. A circuit's Tick() method can be called in a loop from the main application thread, or alternatively, by calling StartAutoTick(), a separate thread will spawn, automatically calling Tick() continuously until PauseAutoTick() or StopAutoTick() is called.

-

Definition at line 66 of file Circuit.h.

+

Definition at line 60 of file Circuit.h.

The documentation for this class was generated from the following file: diff --git a/docs/html/class_d_s_patch_1_1_component-members.html b/docs/html/class_d_s_patch_1_1_component-members.html index 15c8fe31..1ec61de2 100644 --- a/docs/html/class_d_s_patch_1_1_component-members.html +++ b/docs/html/class_d_s_patch_1_1_component-members.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -93,14 +93,13 @@ NONCOPYABLE(Component) (defined in DSPatch::Component)DSPatch::Component Process_(SignalBus &, SignalBus &)=0 (defined in DSPatch::Component)DSPatch::Componentprotectedpure virtual ProcessOrder enum name (defined in DSPatch::Component)DSPatch::Component - Reset(TickMode mode=TickMode::Series, int bufferNo=0) (defined in DSPatch::Component)DSPatch::Component + Reset(int bufferNo=0) (defined in DSPatch::Component)DSPatch::Component SetBufferCount(int bufferCount) (defined in DSPatch::Component)DSPatch::Component SetInputCount_(int inputCount, const std::vector< std::string > &inputNames={}) (defined in DSPatch::Component)DSPatch::Componentprotected SetOutputCount_(int outputCount, const std::vector< std::string > &outputNames={}) (defined in DSPatch::Component)DSPatch::Componentprotected SPtr typedef (defined in DSPatch::Component)DSPatch::Component - Tick(TickMode mode=TickMode::Series, int bufferNo=0) (defined in DSPatch::Component)DSPatch::Component - TickMode enum name (defined in DSPatch::Component)DSPatch::Component - ~Component() (defined in DSPatch::Component)DSPatch::Componentvirtual + Tick(int bufferNo=0) (defined in DSPatch::Component)DSPatch::Component + ~Component() (defined in DSPatch::Component)DSPatch::Componentvirtual
diff --git a/docs/html/class_d_s_patch_1_1_component.html b/docs/html/class_d_s_patch_1_1_component.html index efb05776..63e391a8 100644 --- a/docs/html/class_d_s_patch_1_1_component.html +++ b/docs/html/class_d_s_patch_1_1_component.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -94,10 +94,6 @@ , OutOfOrder }   -enum class  TickMode { Series -, Parallel - } -  using SPtr = std::shared_ptr< Component >   @@ -139,12 +135,12 @@ - - - - + + + +
int GetBufferCount () const
 
-void Tick (TickMode mode=TickMode::Series, int bufferNo=0)
 
-void Reset (TickMode mode=TickMode::Series, int bufferNo=0)
 
+void Tick (int bufferNo=0)
 
+void Reset (int bufferNo=0)
 
@@ -166,7 +162,7 @@

In order for a component to do any work it must be ticked. This is performed by repeatedly calling the Tick() and Reset() methods. The Tick() method is responsible for acquiring the next set of input signals from component input wires and populating the component's input bus. To insure that these inputs are up-to-date, the dependent component first calls all of its input components' Tick() methods - hence recursively called in all components going backward through the circuit. The acquired input bus is then passed to the Process_() method. The Reset() method informs the component that the last circuit traversal has completed and hence can execute the next Tick() request.

PERFORMANCE TIP: If a component's Process_() method is capable of processing buffers out-of-order within a stream processing circuit, consider initialising its base with ProcessOrder::OutOfOrder to improve performance. Note however that Process_() must be thread-safe to operate in this mode.

-

Definition at line 74 of file Component.h.

+

Definition at line 73 of file Component.h.

Member Typedef Documentation

◆ SPtr

@@ -180,7 +176,7 @@

-

Definition at line 79 of file Component.h.

+

Definition at line 78 of file Component.h.

@@ -205,31 +201,7 @@

-

Definition at line 81 of file Component.h.

- - - - -

◆ TickMode

- -
-
-

Protected Member Functions

- - - - -
- - - - -
enum class DSPatch::Component::TickMode
- 		-strong
-
- -

Definition at line 87 of file Component.h.

+

Definition at line 80 of file Component.h.

diff --git a/docs/html/class_d_s_patch_1_1_plugin-members.html b/docs/html/class_d_s_patch_1_1_plugin-members.html index c3e72c38..cc9c601b 100644 --- a/docs/html/class_d_s_patch_1_1_plugin-members.html +++ b/docs/html/class_d_s_patch_1_1_plugin-members.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
diff --git a/docs/html/class_d_s_patch_1_1_plugin.html b/docs/html/class_d_s_patch_1_1_plugin.html index 806c4d5d..62d99a40 100644 --- a/docs/html/class_d_s_patch_1_1_plugin.html +++ b/docs/html/class_d_s_patch_1_1_plugin.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
diff --git a/docs/html/class_d_s_patch_1_1_signal_bus-members.html b/docs/html/class_d_s_patch_1_1_signal_bus-members.html index 5a85b0be..778f8da8 100644 --- a/docs/html/class_d_s_patch_1_1_signal_bus-members.html +++ b/docs/html/class_d_s_patch_1_1_signal_bus-members.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
diff --git a/docs/html/class_d_s_patch_1_1_signal_bus.html b/docs/html/class_d_s_patch_1_1_signal_bus.html index 2f6b6dad..b81f4cbd 100644 --- a/docs/html/class_d_s_patch_1_1_signal_bus.html +++ b/docs/html/class_d_s_patch_1_1_signal_bus.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
diff --git a/docs/html/class_d_s_patch_1_1internal_1_1_auto_tick_thread-members.html b/docs/html/class_d_s_patch_1_1internal_1_1_auto_tick_thread-members.html index e904f63a..b7243532 100644 --- a/docs/html/class_d_s_patch_1_1internal_1_1_auto_tick_thread-members.html +++ b/docs/html/class_d_s_patch_1_1internal_1_1_auto_tick_thread-members.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -83,13 +83,12 @@ AutoTickThread() (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread IsPaused() const (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread IsStopped() const (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread - Mode() const (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread - NONCOPYABLE(AutoTickThread) (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread - Pause() (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread - Resume() (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread - Start(DSPatch::Circuit *circuit, DSPatch::Component::TickMode mode) (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread - Stop() (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread - ~AutoTickThread() (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread + NONCOPYABLE(AutoTickThread) (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread + Pause() (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread + Resume() (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread + Start(DSPatch::Circuit *circuit) (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread + Stop() (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread + ~AutoTickThread() (defined in DSPatch::internal::AutoTickThread)DSPatch::internal::AutoTickThread
diff --git a/docs/html/class_d_s_patch_1_1internal_1_1_auto_tick_thread.html b/docs/html/class_d_s_patch_1_1internal_1_1_auto_tick_thread.html index 7da1e8b3..073c5b15 100644 --- a/docs/html/class_d_s_patch_1_1internal_1_1_auto_tick_thread.html +++ b/docs/html/class_d_s_patch_1_1internal_1_1_auto_tick_thread.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -91,18 +91,15 @@  NONCOPYABLE (AutoTickThread)   - -DSPatch::Component::TickMode Mode () const -  bool IsStopped () const   bool IsPaused () const   - -void Start (DSPatch::Circuit *circuit, DSPatch::Component::TickMode mode) -  + +void Start (DSPatch::Circuit *circuit) +  void Stop ()   diff --git a/docs/html/class_d_s_patch_1_1internal_1_1_circuit_thread-members.html b/docs/html/class_d_s_patch_1_1internal_1_1_circuit_thread-members.html index c760683d..dea1bc6d 100644 --- a/docs/html/class_d_s_patch_1_1internal_1_1_circuit_thread-members.html +++ b/docs/html/class_d_s_patch_1_1internal_1_1_circuit_thread-members.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -86,7 +86,7 @@ Start(std::vector< DSPatch::Component::SPtr > *components, int threadNo) (defined in DSPatch::internal::CircuitThread)DSPatch::internal::CircuitThread Stop() (defined in DSPatch::internal::CircuitThread)DSPatch::internal::CircuitThread Sync() (defined in DSPatch::internal::CircuitThread)DSPatch::internal::CircuitThread - SyncAndResume(DSPatch::Component::TickMode mode) (defined in DSPatch::internal::CircuitThread)DSPatch::internal::CircuitThread + SyncAndResume() (defined in DSPatch::internal::CircuitThread)DSPatch::internal::CircuitThread ~CircuitThread() (defined in DSPatch::internal::CircuitThread)DSPatch::internal::CircuitThread
diff --git a/docs/html/class_d_s_patch_1_1internal_1_1_circuit_thread.html b/docs/html/class_d_s_patch_1_1internal_1_1_circuit_thread.html index f7fe05d0..61ef9a9c 100644 --- a/docs/html/class_d_s_patch_1_1internal_1_1_circuit_thread.html +++ b/docs/html/class_d_s_patch_1_1internal_1_1_circuit_thread.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -103,9 +103,9 @@ void Sync ()   - -void SyncAndResume (DSPatch::Component::TickMode mode) -  + +void SyncAndResume () + 

Detailed Description

Thread class for asynchronously ticking circuit components.

diff --git a/docs/html/classes.html b/docs/html/classes.html index a6dab98b..ba3372d8 100644 --- a/docs/html/classes.html +++ b/docs/html/classes.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -80,7 +80,7 @@
AutoTickThread (DSPatch::internal)
C
-
Circuit (DSPatch)
CircuitThread (DSPatch::internal)
Component (DSPatch)
ComponentThread (DSPatch::internal)
+
Circuit (DSPatch)
CircuitThread (DSPatch::internal)
Component (DSPatch)
P
Plugin (DSPatch)
diff --git a/docs/html/dir_3756d50f4003bc63fa3fe49460f9c79d.html b/docs/html/dir_3756d50f4003bc63fa3fe49460f9c79d.html index 818abfa1..f2140c5c 100644 --- a/docs/html/dir_3756d50f4003bc63fa3fe49460f9c79d.html +++ b/docs/html/dir_3756d50f4003bc63fa3fe49460f9c79d.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -84,8 +84,6 @@    CircuitThread.h   - ComponentThread.h -   Wire.h   diff --git a/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html b/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html index 9007e128..55b946f8 100644 --- a/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +++ b/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
diff --git a/docs/html/dir_96ae4afe4ae1b3c2e5b248f6fc6b60cd.html b/docs/html/dir_96ae4afe4ae1b3c2e5b248f6fc6b60cd.html index 017e46dd..fbd7d470 100644 --- a/docs/html/dir_96ae4afe4ae1b3c2e5b248f6fc6b60cd.html +++ b/docs/html/dir_96ae4afe4ae1b3c2e5b248f6fc6b60cd.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
diff --git a/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html b/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html index 0c228f16..8273520c 100644 --- a/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html +++ b/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
diff --git a/docs/html/files.html b/docs/html/files.html index cb7d0269..111313c6 100644 --- a/docs/html/files.html +++ b/docs/html/files.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -87,8 +87,7 @@  ▼ internal  AutoTickThread.h  CircuitThread.h - ComponentThread.h - Wire.h + Wire.h
diff --git a/docs/html/index.html b/docs/html/index.html index a2108975..346ee433 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -22,7 +22,7 @@ Logo -
DSPatch v.9.6.1 +
DSPatch v.9.7.0
@@ -89,8 +89,7 @@

  • Cross-platform - DSPatch is built and tested daily on Linux, Mac and Windows. Here we see DSPatch running flawlessly on a BeagleBone!
  • Easy-to-use object-oriented API - DSPatch is modelled around real-world circuit entities and concepts, making code more readable and easy to understand.
  • Feedback loops - Create true closed-circuit systems by feeding resultant signals back into previous component inputs.
    • -
  • High performance parallel processing - Circuits use advanced multi-threaded scheduling to maximize dataflow efficiency across parallel branches.
    • -
  • High performance stream processing - Utilize multi-buffering in stream processing circuits to further boost dataflow efficiency.
    • +
  • High performance parallel processing - Utilize parallel multi-buffering in stream processing circuits to maximize dataflow efficiency.
  • Optimised signal transfers - Wherever possible, data between components is transferred via move rather than copy.
  • Run-time adaptive signal types - Component inputs can accept values of run-time varying types allowing you to create more flexible, multi-purpose component processes.
  • Run-time circuit wiring - Connect and disconnect wires on the fly whilst maintaining steady dataflow through the system.
    • diff --git a/docs/html/search/all_1.js b/docs/html/search/all_1.js index 2b947e75..e67ae093 100644 --- a/docs/html/search/all_1.js +++ b/docs/html/search/all_1.js @@ -2,6 +2,5 @@ var searchData= [ ['circuit_0',['Circuit',['../class_d_s_patch_1_1_circuit.html',1,'DSPatch']]], ['circuitthread_1',['CircuitThread',['../class_d_s_patch_1_1internal_1_1_circuit_thread.html',1,'DSPatch::internal']]], - ['component_2',['Component',['../class_d_s_patch_1_1_component.html',1,'DSPatch']]], - ['componentthread_3',['ComponentThread',['../class_d_s_patch_1_1internal_1_1_component_thread.html',1,'DSPatch::internal']]] + ['component_2',['Component',['../class_d_s_patch_1_1_component.html',1,'DSPatch']]] ]; diff --git a/docs/html/search/classes_1.js b/docs/html/search/classes_1.js index 2b947e75..e67ae093 100644 --- a/docs/html/search/classes_1.js +++ b/docs/html/search/classes_1.js @@ -2,6 +2,5 @@ var searchData= [ ['circuit_0',['Circuit',['../class_d_s_patch_1_1_circuit.html',1,'DSPatch']]], ['circuitthread_1',['CircuitThread',['../class_d_s_patch_1_1internal_1_1_circuit_thread.html',1,'DSPatch::internal']]], - ['component_2',['Component',['../class_d_s_patch_1_1_component.html',1,'DSPatch']]], - ['componentthread_3',['ComponentThread',['../class_d_s_patch_1_1internal_1_1_component_thread.html',1,'DSPatch::internal']]] + ['component_2',['Component',['../class_d_s_patch_1_1_component.html',1,'DSPatch']]] ]; diff --git a/docs/html/struct_d_s_patch_1_1internal_1_1_wire-members.html b/docs/html/struct_d_s_patch_1_1internal_1_1_wire-members.html index 2ee29cd3..33407c0d 100644 --- a/docs/html/struct_d_s_patch_1_1internal_1_1_wire-members.html +++ b/docs/html/struct_d_s_patch_1_1internal_1_1_wire-members.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.9.6.1 +
    DSPatch v.9.7.0
    diff --git a/docs/html/struct_d_s_patch_1_1internal_1_1_wire.html b/docs/html/struct_d_s_patch_1_1internal_1_1_wire.html index 379411fd..531b808d 100644 --- a/docs/html/struct_d_s_patch_1_1internal_1_1_wire.html +++ b/docs/html/struct_d_s_patch_1_1internal_1_1_wire.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.9.6.1 +
    DSPatch v.9.7.0
    diff --git a/include/DSPatch.h b/include/DSPatch.h index e08a69a6..1d0be3bf 100644 --- a/include/DSPatch.h +++ b/include/DSPatch.h @@ -67,10 +67,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. entities and concepts, making code more readable and easy to understand. - Feedback loops - Create true closed-circuit systems by feeding resultant signals back into previous component inputs. - - High performance parallel processing - Circuits use advanced multi-threaded scheduling - to maximize dataflow efficiency across parallel branches. - - High performance stream processing - Utilize multi-buffering in stream processing - circuits to further boost dataflow efficiency. + - High performance parallel processing - Utilize parallel multi-buffering in stream + processing circuits to maximize dataflow efficiency. - Optimised signal transfers - Wherever possible, data between components is transferred via move rather than copy. - Run-time adaptive signal types - Component inputs can accept values of run-time diff --git a/include/dspatch/Circuit.h b/include/dspatch/Circuit.h index b29cf401..f9bff36a 100644 --- a/include/dspatch/Circuit.h +++ b/include/dspatch/Circuit.h @@ -55,12 +55,6 @@ The Circuit Tick() method runs through its internal array of components and call Tick() and Reset() methods once. A circuit's Tick() method can be called in a loop from the main application thread, or alternatively, by calling StartAutoTick(), a separate thread will spawn, automatically calling Tick() continuously until PauseAutoTick() or StopAutoTick() is called. - -TickMode::Parallel will spawn a thread per component in a circuit. The aim of this mode is to -improve the performance of small circuits that contain parallel branches. TickMode::Series -(default) on the other hand, tells the circuit to tick its components one-by-one in a single thread -per buffer. This mode aims to improve the performance of large circuits, as well as small circuits -that do not contain parallel branches. */ class DLLEXPORT Circuit final @@ -86,9 +80,9 @@ class DLLEXPORT Circuit final void SetBufferCount( int bufferCount ); int GetBufferCount() const; - void Tick( Component::TickMode mode = Component::TickMode::Series ); + void Tick(); - void StartAutoTick( Component::TickMode mode = Component::TickMode::Series ); + void StartAutoTick(); void StopAutoTick(); void PauseAutoTick(); void ResumeAutoTick(); diff --git a/include/dspatch/Component.h b/include/dspatch/Component.h index 4bb5ebb4..90edfdfb 100644 --- a/include/dspatch/Component.h +++ b/include/dspatch/Component.h @@ -39,7 +39,6 @@ namespace DSPatch namespace internal { class Component; -class ComponentThread; } // namespace internal /// Abstract base class for DSPatch components @@ -84,12 +83,6 @@ class DLLEXPORT Component OutOfOrder }; - enum class TickMode - { - Series, - Parallel - }; - Component( ProcessOrder processOrder = ProcessOrder::InOrder ); virtual ~Component(); @@ -108,8 +101,8 @@ class DLLEXPORT Component void SetBufferCount( int bufferCount ); int GetBufferCount() const; - void Tick( TickMode mode = TickMode::Series, int bufferNo = 0 ); - void Reset( TickMode mode = TickMode::Series, int bufferNo = 0 ); + void Tick( int bufferNo = 0 ); + void Reset( int bufferNo = 0 ); protected: virtual void Process_( SignalBus&, SignalBus& ) = 0; @@ -118,9 +111,6 @@ class DLLEXPORT Component void SetOutputCount_( int outputCount, const std::vector& outputNames = {} ); private: - friend class internal::ComponentThread; - void _TickParallel( int bufferNo ); - internal::Component* p; }; diff --git a/meson.build b/meson.build index c6c503a0..765b9206 100644 --- a/meson.build +++ b/meson.build @@ -88,7 +88,6 @@ endif dspatch_src = [ 'src/internal/AutoTickThread.cpp', 'src/internal/CircuitThread.cpp', - 'src/internal/ComponentThread.cpp', 'src/Circuit.cpp', 'src/Component.cpp', 'src/Plugin.cpp' diff --git a/src/Circuit.cpp b/src/Circuit.cpp index a97ce131..8a15100c 100644 --- a/src/Circuit.cpp +++ b/src/Circuit.cpp @@ -227,7 +227,7 @@ int Circuit::GetBufferCount() const return (int)p->circuitThreads.size(); } -void Circuit::Tick( Component::TickMode mode ) +void Circuit::Tick() { // process in a single thread if this circuit has no threads // ========================================================= @@ -236,20 +236,20 @@ void Circuit::Tick( Component::TickMode mode ) // tick all internal components for ( auto& component : p->components ) { - component->Tick( mode ); + component->Tick(); } // reset all internal components for ( auto& component : p->components ) { - component->Reset( mode ); + component->Reset(); } } // process in multiple threads if this circuit has threads // ======================================================= else { - p->circuitThreads[p->currentThreadNo].SyncAndResume( mode ); // sync and resume thread x + p->circuitThreads[p->currentThreadNo].SyncAndResume(); // sync and resume thread x if ( ++p->currentThreadNo == p->circuitThreads.size() ) { @@ -258,11 +258,11 @@ void Circuit::Tick( Component::TickMode mode ) } } -void Circuit::StartAutoTick( Component::TickMode mode ) +void Circuit::StartAutoTick() { if ( p->autoTickThread.IsStopped() ) { - p->autoTickThread.Start( this, mode ); + p->autoTickThread.Start( this ); } else { @@ -279,7 +279,7 @@ void Circuit::StopAutoTick() // manually tick until 0 while ( p->currentThreadNo != 0 ) { - Tick( p->autoTickThread.Mode() ); + Tick(); } // sync all threads @@ -304,7 +304,7 @@ void Circuit::PauseAutoTick() // manually tick until 0 while ( p->currentThreadNo != 0 ) { - Tick( p->autoTickThread.Mode() ); + Tick(); } // sync all threads diff --git a/src/Component.cpp b/src/Component.cpp index b0b7a7b0..1b289d02 100644 --- a/src/Component.cpp +++ b/src/Component.cpp @@ -28,12 +28,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include #include #include -#include -#include +#include +#include using namespace DSPatch; @@ -48,22 +47,9 @@ class Component enum class TickStatus { NotTicked, - TickStarted, Ticking }; - struct MovableMutex - { - MovableMutex() = default; - - // cppcheck-suppress missingMemberCopy - MovableMutex( MovableMutex&& ) - { - } - - std::mutex mutex; - }; - struct MovableAtomicFlag { MovableAtomicFlag() = default; @@ -83,7 +69,7 @@ class Component void WaitForRelease( int threadNo ); void ReleaseNextThread( int threadNo ); - void GetOutput( int bufferNo, int fromOutput, int toInput, DSPatch::SignalBus& toBus, DSPatch::Component::TickMode mode ); + void GetOutput( int bufferNo, int fromOutput, int toInput, DSPatch::SignalBus& toBus ); void IncRefs( int output ); void DecRefs( int output ); @@ -96,13 +82,9 @@ class Component std::vector outputBuses; std::vector>> refs; // ref_total:ref_counter per output, per buffer - std::vector> refMutexes; std::vector inputWires; - std::vector componentThreads; - std::vector> feedbackWires; - std::vector tickStatuses; std::vector releaseFlags; @@ -226,9 +208,6 @@ void Component::SetBufferCount( int bufferCount ) } // resize vectors - p->componentThreads.resize( bufferCount ); - p->feedbackWires.resize( bufferCount ); - p->tickStatuses.resize( bufferCount ); p->inputBuses.resize( bufferCount ); @@ -237,13 +216,10 @@ void Component::SetBufferCount( int bufferCount ) p->releaseFlags.resize( bufferCount ); p->refs.resize( bufferCount ); - p->refMutexes.resize( bufferCount ); // init vector values for ( int i = 0; i < bufferCount; ++i ) { - p->componentThreads[i].Setup( this, i ); - p->tickStatuses[i] = internal::Component::TickStatus::NotTicked; p->inputBuses[i].SetSignalCount( p->inputBuses[0].GetSignalCount() ); @@ -257,8 +233,6 @@ void Component::SetBufferCount( int bufferCount ) // sync output reference counts p->refs[i][j] = p->refs[0][j]; } - - p->refMutexes[i].resize( p->refMutexes[0].size() ); } p->releaseFlags[0].flag.clear(); @@ -271,7 +245,7 @@ int Component::GetBufferCount() const return (int)p->inputBuses.size(); } -void Component::Tick( Component::TickMode mode, int bufferNo ) +void Component::Tick( int bufferNo ) { // continue only if this component has not already been ticked if ( p->tickStatuses[bufferNo] == internal::Component::TickStatus::Ticking ) @@ -279,90 +253,51 @@ void Component::Tick( Component::TickMode mode, int bufferNo ) return; } - if ( mode == TickMode::Series ) - { - // set tickStatus -> Ticking - p->tickStatuses[bufferNo] = internal::Component::TickStatus::Ticking; - - auto& inputBus = p->inputBuses[bufferNo]; - auto& outputBus = p->outputBuses[bufferNo]; - - for ( const auto& wire : p->inputWires ) - { - // tick incoming components - wire.fromComponent->Tick( TickMode::Series, bufferNo ); + // set tickStatus -> Ticking + p->tickStatuses[bufferNo] = internal::Component::TickStatus::Ticking; - // get new inputs from incoming components - wire.fromComponent->p->GetOutput( bufferNo, wire.fromOutput, wire.toInput, inputBus, TickMode::Series ); - } + auto& inputBus = p->inputBuses[bufferNo]; + auto& outputBus = p->outputBuses[bufferNo]; - // You might be thinking: Why not clear the outputs in Reset()? + for ( const auto& wire : p->inputWires ) + { + // tick incoming components + wire.fromComponent->Tick( bufferNo ); - // This is because we need components to hold onto their outputs long enough for any - // loopback wires to grab them during the next tick. The same applies to how we handle - // output reference counting in internal::Component::GetOutput(), reseting the counter upon - // the final request rather than in Reset(). + // get new inputs from incoming components + wire.fromComponent->p->GetOutput( bufferNo, wire.fromOutput, wire.toInput, inputBus ); + } - // clear outputs - outputBus.ClearAllValues(); + // You might be thinking: Why not clear the outputs in Reset()? - if ( p->bufferCount != 1 && p->processOrder == ProcessOrder::InOrder ) - { - // wait for our turn to process - p->WaitForRelease( bufferNo ); + // This is because we need components to hold onto their outputs long enough for any + // loopback wires to grab them during the next tick. The same applies to how we handle + // output reference counting in internal::Component::GetOutput(), reseting the counter upon + // the final request rather than in Reset(). - // call Process_() with newly aquired inputs - Process_( inputBus, outputBus ); + // clear outputs + outputBus.ClearAllValues(); - // signal that we're done processing - p->ReleaseNextThread( bufferNo ); - } - else - { - // call Process_() with newly aquired inputs - Process_( inputBus, outputBus ); - } - } - else if ( p->tickStatuses[bufferNo] == internal::Component::TickStatus::NotTicked ) + if ( p->bufferCount != 1 && p->processOrder == ProcessOrder::InOrder ) { - // set tickStatus -> TickStarted - p->tickStatuses[bufferNo] = internal::Component::TickStatus::TickStarted; - - auto& feedbackWires = p->feedbackWires[bufferNo]; - - // tick incoming components - for ( const auto& wire : p->inputWires ) - { - try - { - wire.fromComponent->Tick( TickMode::Parallel, bufferNo ); - } - catch ( const std::exception& ) - { - feedbackWires.emplace( &wire ); - } - } + // wait for our turn to process + p->WaitForRelease( bufferNo ); - // set tickStatus -> Ticking - p->tickStatuses[bufferNo] = internal::Component::TickStatus::Ticking; + // call Process_() with newly aquired inputs + Process_( inputBus, outputBus ); - p->componentThreads[bufferNo].Resume(); + // signal that we're done processing + p->ReleaseNextThread( bufferNo ); } else { - // throw an exception to indicate that we have already started a tick, and hence, are a feedback component. - throw std::exception(); + // call Process_() with newly aquired inputs + Process_( inputBus, outputBus ); } } -void Component::Reset( Component::TickMode mode, int bufferNo ) +void Component::Reset( int bufferNo ) { - if ( mode == TickMode::Parallel ) - { - // wait for ticking to complete - p->componentThreads[bufferNo].Sync(); - } - // clear inputs p->inputBuses[bufferNo].ClearAllValues(); @@ -394,54 +329,6 @@ void Component::SetOutputCount_( int outputCount, const std::vector { ref.resize( outputCount ); } - for ( auto& refMutexes : p->refMutexes ) - { - refMutexes.resize( outputCount ); - } -} - -void Component::_TickParallel( int bufferNo ) -{ - auto& inputBus = p->inputBuses[bufferNo]; - auto& outputBus = p->outputBuses[bufferNo]; - - auto& feedbackWires = p->feedbackWires[bufferNo]; - - for ( const auto& wire : p->inputWires ) - { - // wait for non-feedback incoming components to finish ticking - if ( feedbackWires.find( &wire ) == feedbackWires.end() ) - { - wire.fromComponent->p->componentThreads[bufferNo].Sync(); - } - else - { - feedbackWires.erase( &wire ); - } - - // get new inputs from incoming components - wire.fromComponent->p->GetOutput( bufferNo, wire.fromOutput, wire.toInput, inputBus, Component::TickMode::Parallel ); - } - - // clear outputs - outputBus.ClearAllValues(); - - if ( p->bufferCount != 1 && p->processOrder == ProcessOrder::InOrder ) - { - // wait for our turn to process - p->WaitForRelease( bufferNo ); - - // call Process_() with newly aquired inputs - Process_( inputBus, outputBus ); - - // signal that we're done processing - p->ReleaseNextThread( bufferNo ); - } - else - { - // call Process_() with newly aquired inputs - Process_( inputBus, outputBus ); - } } void internal::Component::WaitForRelease( int threadNo ) @@ -466,8 +353,7 @@ void internal::Component::ReleaseNextThread( int threadNo ) } } -void internal::Component::GetOutput( - int bufferNo, int fromOutput, int toInput, DSPatch::SignalBus& toBus, DSPatch::Component::TickMode mode ) +void internal::Component::GetOutput( int bufferNo, int fromOutput, int toInput, DSPatch::SignalBus& toBus ) { if ( !outputBuses[bufferNo].HasValue( fromOutput ) ) { @@ -483,31 +369,15 @@ void internal::Component::GetOutput( toBus.MoveSignal( toInput, signal ); return; } - else if ( mode == DSPatch::Component::TickMode::Parallel ) - { - std::lock_guard lock( refMutexes[bufferNo][fromOutput].mutex ); - if ( ++ref.second != ref.first ) - { - toBus.SetSignal( toInput, signal ); - return; - } - else - { - // this is the final reference, reset the counter, move the signal - ref.second = 0; - } - } else if ( ++ref.second != ref.first ) { + // this is not the final reference, copy the signal toBus.SetSignal( toInput, signal ); return; } - else - { - // this is the final reference, reset the counter, move the signal - ref.second = 0; - } + // this is the final reference, reset the counter, move the signal + ref.second = 0; toBus.MoveSignal( toInput, signal ); } diff --git a/src/internal/AutoTickThread.cpp b/src/internal/AutoTickThread.cpp index 400805aa..a88507fb 100644 --- a/src/internal/AutoTickThread.cpp +++ b/src/internal/AutoTickThread.cpp @@ -41,11 +41,6 @@ AutoTickThread::~AutoTickThread() Stop(); } -DSPatch::Component::TickMode AutoTickThread::Mode() const -{ - return _mode; -} - bool AutoTickThread::IsStopped() const { return _stopped; @@ -56,7 +51,7 @@ bool AutoTickThread::IsPaused() const return _pause; } -void AutoTickThread::Start( DSPatch::Circuit* circuit, DSPatch::Component::TickMode mode ) +void AutoTickThread::Start( DSPatch::Circuit* circuit ) { if ( !_stopped ) { @@ -65,7 +60,6 @@ void AutoTickThread::Start( DSPatch::Circuit* circuit, DSPatch::Component::TickM _circuit = circuit; - _mode = mode; _stop = false; _stopped = false; _pause = false; @@ -134,7 +128,7 @@ void AutoTickThread::_Run() { while ( !_stop ) { - _circuit->Tick( _mode ); + _circuit->Tick(); if ( _pause ) { diff --git a/src/internal/AutoTickThread.h b/src/internal/AutoTickThread.h index 25558cce..864f45a0 100644 --- a/src/internal/AutoTickThread.h +++ b/src/internal/AutoTickThread.h @@ -56,12 +56,10 @@ class AutoTickThread final AutoTickThread(); ~AutoTickThread(); - DSPatch::Component::TickMode Mode() const; - bool IsStopped() const; bool IsPaused() const; - void Start( DSPatch::Circuit* circuit, DSPatch::Component::TickMode mode ); + void Start( DSPatch::Circuit* circuit ); void Stop(); void Pause(); void Resume(); @@ -70,7 +68,6 @@ class AutoTickThread final void _Run(); private: - DSPatch::Component::TickMode _mode = DSPatch::Component::TickMode::Series; std::thread _thread; DSPatch::Circuit* _circuit = nullptr; bool _stop = false; diff --git a/src/internal/CircuitThread.cpp b/src/internal/CircuitThread.cpp index 08a0a4c9..d6a199cc 100644 --- a/src/internal/CircuitThread.cpp +++ b/src/internal/CircuitThread.cpp @@ -70,7 +70,7 @@ void CircuitThread::Stop() _stop = true; - SyncAndResume( _mode ); + SyncAndResume(); if ( _thread.joinable() ) { @@ -94,7 +94,7 @@ void CircuitThread::Sync() } } -void CircuitThread::SyncAndResume( DSPatch::Component::TickMode mode ) +void CircuitThread::SyncAndResume() { if ( _stopped ) { @@ -104,7 +104,6 @@ void CircuitThread::SyncAndResume( DSPatch::Component::TickMode mode ) if ( _gotSync ) { _gotSync = false; // reset the sync flag - _mode = mode; std::lock_guard lock( _syncMutex ); @@ -121,7 +120,6 @@ void CircuitThread::SyncAndResume( DSPatch::Component::TickMode mode ) } _gotSync = false; // reset the sync flag - _mode = mode; _resumeCondt.notify_all(); } @@ -157,11 +155,11 @@ void CircuitThread::_Run() for ( auto& component : *_components ) { - component->Tick( _mode, _threadNo ); + component->Tick( _threadNo ); } for ( auto& component : *_components ) { - component->Reset( _mode, _threadNo ); + component->Reset( _threadNo ); } } } diff --git a/src/internal/CircuitThread.h b/src/internal/CircuitThread.h index 56646835..88e7d554 100644 --- a/src/internal/CircuitThread.h +++ b/src/internal/CircuitThread.h @@ -70,13 +70,12 @@ class CircuitThread final void Start( std::vector* components, int threadNo ); void Stop(); void Sync(); - void SyncAndResume( DSPatch::Component::TickMode mode ); + void SyncAndResume(); private: void _Run(); private: - DSPatch::Component::TickMode _mode = DSPatch::Component::TickMode::Series; std::thread _thread; std::vector* _components = nullptr; int _threadNo = 0; diff --git a/src/internal/ComponentThread.cpp b/src/internal/ComponentThread.cpp deleted file mode 100644 index 6e16526d..00000000 --- a/src/internal/ComponentThread.cpp +++ /dev/null @@ -1,138 +0,0 @@ -/****************************************************************************** -DSPatch - The Refreshingly Simple C++ Dataflow Framework -Copyright (c) 2023, Marcus Tomlinson - -BSD 2-Clause License - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -******************************************************************************/ - -#include - -using namespace DSPatch::internal; - -ComponentThread::ComponentThread() = default; - -// cppcheck-suppress missingMemberCopy -ComponentThread::ComponentThread( ComponentThread&& ) -{ -} - -ComponentThread::~ComponentThread() -{ - Stop(); -} - -void ComponentThread::Setup( DSPatch::Component* component, int bufferNo ) -{ - _component = component; - _bufferNo = bufferNo; -} - -void ComponentThread::Start() -{ - if ( !_stopped ) - { - return; - } - - _stop = false; - _stopped = false; - _gotSync = false; - - _thread = std::thread( &ComponentThread::_Run, this ); - - Sync(); -} - -void ComponentThread::Stop() -{ - if ( _stopped ) - { - return; - } - - Sync(); - - _stop = true; - - Resume(); - - if ( _thread.joinable() ) - { - _thread.join(); - } -} - -void ComponentThread::Sync() -{ - if ( _stopped || _gotSync ) - { - return; - } - - std::unique_lock lock( _resumeMutex ); - - // cppcheck-suppress knownConditionTrueFalse - if ( !_gotSync ) // if haven't already got sync - { - _syncCondt.wait( lock ); // wait for sync - } -} - -void ComponentThread::Resume() -{ - if ( _stopped ) - { - Start(); - } - - std::lock_guard lock( _resumeMutex ); - - _gotSync = false; // reset the sync flag - - _resumeCondt.notify_all(); -} - -void ComponentThread::_Run() -{ - SetThreadHighPriority(); - - while ( !_stop ) - { - { - std::unique_lock lock( _resumeMutex ); - - _gotSync = true; // set the sync flag - _syncCondt.notify_all(); - _resumeCondt.wait( lock ); // wait for resume - } - - // cppcheck-suppress knownConditionTrueFalse - if ( !_stop ) - { - _component->_TickParallel( _bufferNo ); - } - } - - _stopped = true; -} diff --git a/src/internal/ComponentThread.h b/src/internal/ComponentThread.h deleted file mode 100644 index a951c313..00000000 --- a/src/internal/ComponentThread.h +++ /dev/null @@ -1,85 +0,0 @@ -/****************************************************************************** -DSPatch - The Refreshingly Simple C++ Dataflow Framework -Copyright (c) 2023, Marcus Tomlinson - -BSD 2-Clause License - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -******************************************************************************/ - -#pragma once - -#include -#include - -#include -#include - -namespace DSPatch -{ -namespace internal -{ - -/// Thread class for asynchronously ticking a single circuit component - -/** -A ComponentThread's primary purpose is to tick parallel circuit components in parallel. - -Upon Start(), an internal thread will spawn and wait for the first call to Resume() before -executing the tick method provided. A call to Sync() will then block until the thread has completed -execution of the tick method. At this point, the thread will wait until instructed to resume again. -*/ - -class ComponentThread final -{ -public: - NONCOPYABLE( ComponentThread ); - - ComponentThread(); - ComponentThread( ComponentThread&& ); - ~ComponentThread(); - - void Setup( DSPatch::Component* component, int bufferNo ); - - void Start(); - void Stop(); - void Sync(); - void Resume(); - -private: - void _Run(); - -private: - std::thread _thread; - - DSPatch::Component* _component = nullptr; - int _bufferNo = 0; - - bool _stop = false; - bool _stopped = true; - bool _gotSync = true; - std::mutex _resumeMutex; - std::condition_variable _resumeCondt, _syncCondt; -}; - -} // namespace internal -} // namespace DSPatch diff --git a/tests/main.cpp b/tests/main.cpp index aecba556..381a6789 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -93,7 +93,7 @@ using namespace DSPatch; // // Tick the circuit 100 times // for ( int i = 0; i < 100; ++i ) // { -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); // } // } @@ -146,7 +146,7 @@ using namespace DSPatch; // REQUIRE( inc_p1->GetBufferCount() == 3 ); // REQUIRE( probe->GetBufferCount() == 3 ); -// circuit->StartAutoTick( Component::TickMode::Series ); +// circuit->StartAutoTick(); // std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); // circuit->StopAutoTick(); // } @@ -199,7 +199,7 @@ using namespace DSPatch; // // Tick the circuit 100 times // for ( int i = 0; i < 100; ++i ) // { -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); // } // } @@ -228,7 +228,7 @@ using namespace DSPatch; // // Tick the circuit 100 times // for ( int i = 0; i < 100; ++i ) // { -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); // } // } @@ -249,15 +249,15 @@ using namespace DSPatch; // // Tick the circuit 100 times // for ( int i = 0; i < 100; ++i ) // { -// counter->Tick( Component::TickMode::Series ); -// adder->Tick( Component::TickMode::Series ); -// passthrough->Tick( Component::TickMode::Series ); -// probe->Tick( Component::TickMode::Series ); - -// counter->Reset( Component::TickMode::Series ); -// adder->Reset( Component::TickMode::Series ); -// passthrough->Reset( Component::TickMode::Series ); -// probe->Reset( Component::TickMode::Series ); +// counter->Tick(); +// adder->Tick(); +// passthrough->Tick(); +// probe->Tick(); + +// counter->Reset(); +// adder->Reset(); +// passthrough->Reset(); +// probe->Reset(); // } // } @@ -272,7 +272,7 @@ using namespace DSPatch; // feedback->ConnectInput( feedback, 0, 0 ); // feedback->SetValidInputs( 1 ); -// circuit->StartAutoTick( Component::TickMode::Series ); +// circuit->StartAutoTick(); // std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); // circuit->PauseAutoTick(); @@ -281,7 +281,7 @@ using namespace DSPatch; // feedback->ConnectInput( feedback, 0, 3 ); // feedback->SetValidInputs( 4 ); -// circuit->StartAutoTick( Component::TickMode::Series ); +// circuit->StartAutoTick(); // std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); // circuit->PauseAutoTick(); @@ -293,7 +293,7 @@ using namespace DSPatch; // feedback->ConnectInput( feedback, 0, 9 ); // feedback->SetValidInputs( 10 ); -// circuit->StartAutoTick( Component::TickMode::Series ); +// circuit->StartAutoTick(); // std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); // circuit->StopAutoTick(); // } @@ -314,7 +314,7 @@ using namespace DSPatch; // // Tick the circuit 100 times // for ( int i = 0; i < 100; ++i ) // { -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); // } // } @@ -334,7 +334,7 @@ using namespace DSPatch; // // Tick the circuit 100 times // for ( int i = 0; i < 100; ++i ) // { -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); // } // } @@ -394,13 +394,13 @@ using namespace DSPatch; // begin = std::chrono::high_resolution_clock::now(); // for ( int i = 0; i < 1000; ++i ) // { -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); // } // end = std::chrono::high_resolution_clock::now(); // auto eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); // auto overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "0x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// std::cout << "0x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; // REQUIRE( eff >= refEff * 0.25 * 0.90 ); // // Tick the circuit with 1 thread, and check that no more ticks occurred @@ -413,13 +413,13 @@ using namespace DSPatch; // begin = std::chrono::high_resolution_clock::now(); // for ( int i = 0; i < 1000; ++i ) // { -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); // } // end = std::chrono::high_resolution_clock::now(); // eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); // overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "1x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// std::cout << "1x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; // REQUIRE( eff >= refEff * 0.25 * 0.90 ); // // Tick the circuit with 2 threads, and check that more ticks occurred @@ -432,13 +432,13 @@ using namespace DSPatch; // begin = std::chrono::high_resolution_clock::now(); // for ( int i = 0; i < 1000; ++i ) // { -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); // } // end = std::chrono::high_resolution_clock::now(); // eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); // overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "2x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// std::cout << "2x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; // REQUIRE( eff >= refEff * 0.5 * 0.90 ); // // Tick the circuit with 3 threads, and check that more ticks occurred @@ -451,13 +451,13 @@ using namespace DSPatch; // begin = std::chrono::high_resolution_clock::now(); // for ( int i = 0; i < 1000; ++i ) // { -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); // } // end = std::chrono::high_resolution_clock::now(); // eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); // overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "3x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// std::cout << "3x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; // REQUIRE( eff >= refEff * 0.75 * 0.90 ); // // Tick the circuit with 4 threads, and check that more ticks occurred @@ -470,13 +470,13 @@ using namespace DSPatch; // begin = std::chrono::high_resolution_clock::now(); // for ( int i = 0; i < 1000; ++i ) // { -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); // } // end = std::chrono::high_resolution_clock::now(); // eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); // overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "4x Buffer Efficiency (Series Mode): " << eff << "% (-" << overhead << "%)" << std::endl; +// std::cout << "4x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; // REQUIRE( eff >= refEff * 0.90 ); // } @@ -503,7 +503,7 @@ using namespace DSPatch; // circuit->SetBufferCount( std::thread::hardware_concurrency() ); -// circuit->StartAutoTick( Component::TickMode::Series ); +// circuit->StartAutoTick(); // std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); // circuit->StopAutoTick(); // circuit->RemoveComponent( counter1 ); @@ -532,7 +532,7 @@ using namespace DSPatch; // circuit->ConnectOutToIn( counter, 0, probe, 3 ); // // Tick the circuit for 100ms with 1 thread -// circuit->StartAutoTick( Component::TickMode::Series ); +// circuit->StartAutoTick(); // std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); // // Adjust the thread count while the circuit is running @@ -568,511 +568,7 @@ using namespace DSPatch; // circuit->ConnectOutToIn( probe, 0, counter, 0 ); // // Tick the circuit for 100ms with 1 thread -// circuit->StartAutoTick( Component::TickMode::Series ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// // Re-wire - -// auto pass_s1 = std::make_shared(); -// circuit->AddComponent( pass_s1 ); - -// circuit->ConnectOutToIn( pass_s1, 0, probe, 0 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->ConnectOutToIn( counter, 0, pass_s1, 0 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// // Disconnect a component - -// circuit->PauseAutoTick(); -// probe->DisconnectInput( 0 ); -// circuit->ResumeAutoTick(); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->DisconnectComponent( probe ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// // Wire in a new component - -// auto pass_s2 = std::make_shared(); -// circuit->AddComponent( pass_s2 ); - -// circuit->ConnectOutToIn( probe, 0, counter, 0 ); -// circuit->ConnectOutToIn( pass_s2, 0, probe, 0 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->ConnectOutToIn( pass_s1, 0, pass_s2, 0 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->StopAutoTick(); -// } - -// //================================================================================================= - -// TEST_CASE( "SerialTest2" ) -// { -// // Configure a circuit made up of a counter and 5 incrementers in series -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto inc_s1 = std::make_shared( 1 ); -// auto inc_s2 = std::make_shared( 2 ); -// auto inc_s3 = std::make_shared( 3 ); -// auto inc_s4 = std::make_shared( 4 ); -// auto inc_s5 = std::make_shared( 5 ); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); -// circuit->AddComponent( inc_s1 ); -// circuit->AddComponent( inc_s2 ); -// circuit->AddComponent( inc_s3 ); -// circuit->AddComponent( inc_s4 ); -// circuit->AddComponent( inc_s5 ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter, 0, inc_s1, 0 ); -// circuit->ConnectOutToIn( inc_s1, 0, inc_s2, 0 ); -// circuit->ConnectOutToIn( inc_s2, 0, inc_s3, 0 ); -// circuit->ConnectOutToIn( inc_s3, 0, inc_s4, 0 ); -// circuit->ConnectOutToIn( inc_s4, 0, inc_s5, 0 ); -// circuit->ConnectOutToIn( inc_s5, 0, probe, 0 ); - -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// circuit->Tick( Component::TickMode::Parallel ); -// } -// } - -// TEST_CASE( "ParallelTest2" ) -// { -// // Configure a circuit made up of a counter and 5 incrementers in parallel -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto inc_p1 = std::make_shared( 1 ); -// auto inc_p2 = std::make_shared( 2 ); -// auto inc_p3 = std::make_shared( 3 ); -// auto inc_p4 = std::make_shared( 4 ); -// auto inc_p5 = std::make_shared( 5 ); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); -// circuit->AddComponent( inc_p1 ); -// circuit->AddComponent( inc_p2 ); -// circuit->AddComponent( inc_p3 ); -// circuit->AddComponent( inc_p4 ); -// circuit->AddComponent( inc_p5 ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter, 0, inc_p1, 0 ); -// circuit->ConnectOutToIn( counter, 0, inc_p2, 0 ); -// circuit->ConnectOutToIn( counter, 0, inc_p3, 0 ); -// circuit->ConnectOutToIn( counter, 0, inc_p4, 0 ); -// circuit->ConnectOutToIn( counter, 0, inc_p5, 0 ); -// circuit->ConnectOutToIn( inc_p1, 0, probe, 0 ); -// circuit->ConnectOutToIn( inc_p2, 0, probe, 1 ); -// circuit->ConnectOutToIn( inc_p3, 0, probe, 2 ); -// circuit->ConnectOutToIn( inc_p4, 0, probe, 3 ); -// circuit->ConnectOutToIn( inc_p5, 0, probe, 4 ); - -// // Tick the circuit for 100ms with 3 threads -// circuit->SetBufferCount( 3 ); -// circuit->StartAutoTick( Component::TickMode::Parallel ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->StopAutoTick(); -// } - -// TEST_CASE( "BranchSyncTest2" ) -// { -// // Configure a circuit made up of 3 parallel branches of 4, 2, and 1 component(s) respectively -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto inc_p1_s1 = std::make_shared(); -// auto inc_p1_s2 = std::make_shared(); -// auto inc_p1_s3 = std::make_shared(); -// auto inc_p1_s4 = std::make_shared(); -// auto inc_p2_s1 = std::make_shared(); -// auto inc_p2_s2 = std::make_shared(); -// auto inc_p3_s1 = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); - -// circuit->AddComponent( inc_p1_s1 ); -// circuit->AddComponent( inc_p1_s2 ); -// circuit->AddComponent( inc_p1_s3 ); -// circuit->AddComponent( inc_p1_s4 ); - -// circuit->AddComponent( inc_p2_s1 ); -// circuit->AddComponent( inc_p2_s2 ); - -// circuit->AddComponent( inc_p3_s1 ); - -// circuit->AddComponent( probe ); - -// // Wire branch 1 -// circuit->ConnectOutToIn( counter, 0, inc_p1_s1, 0 ); -// circuit->ConnectOutToIn( inc_p1_s1, 0, inc_p1_s2, 0 ); -// circuit->ConnectOutToIn( inc_p1_s2, 0, inc_p1_s3, 0 ); -// circuit->ConnectOutToIn( inc_p1_s3, 0, inc_p1_s4, 0 ); -// circuit->ConnectOutToIn( inc_p1_s4, 0, probe, 0 ); - -// // Wire branch 2 -// circuit->ConnectOutToIn( counter, 0, inc_p2_s1, 0 ); -// circuit->ConnectOutToIn( inc_p2_s1, 0, inc_p2_s2, 0 ); -// circuit->ConnectOutToIn( inc_p2_s2, 0, probe, 1 ); - -// // Wire branch 3 -// circuit->ConnectOutToIn( counter, 0, inc_p3_s1, 0 ); -// circuit->ConnectOutToIn( inc_p3_s1, 0, probe, 2 ); - -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// circuit->Tick( Component::TickMode::Parallel ); -// } -// } - -// TEST_CASE( "FeedbackTest2" ) -// { -// // Configure a circuit made up of an adder that adds a counter to its own previous output -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto adder = std::make_shared(); -// auto passthrough = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); -// circuit->AddComponent( adder ); -// circuit->AddComponent( passthrough ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter, 0, adder, 0 ); -// circuit->ConnectOutToIn( adder, 0, passthrough, 0 ); - -// circuit->ConnectOutToIn( passthrough, 0, adder, 1 ); - -// circuit->ConnectOutToIn( adder, 0, probe, 0 ); - -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// circuit->Tick( Component::TickMode::Parallel ); -// } -// } - -// TEST_CASE( "FeedbackTestNoCircuit2" ) -// { -// auto counter = std::make_shared(); -// auto adder = std::make_shared(); -// auto passthrough = std::make_shared(); -// auto probe = std::make_shared(); - -// adder->ConnectInput( counter, 0, 0 ); -// passthrough->ConnectInput( adder, 0, 0 ); - -// adder->ConnectInput( passthrough, 0, 1 ); - -// probe->ConnectInput( adder, 0, 0 ); - -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// counter->Tick( Component::TickMode::Parallel ); -// adder->Tick( Component::TickMode::Parallel ); -// passthrough->Tick( Component::TickMode::Parallel ); -// probe->Tick( Component::TickMode::Parallel ); - -// counter->Reset( Component::TickMode::Parallel ); -// adder->Reset( Component::TickMode::Parallel ); -// passthrough->Reset( Component::TickMode::Parallel ); -// probe->Reset( Component::TickMode::Parallel ); -// } -// } - -// TEST_CASE( "RefCountResetRegressionTest2" ) -// { -// auto circuit = std::make_shared(); -// auto feedback = std::make_shared( 2 ); - -// circuit->AddComponent( feedback ); -// circuit->SetBufferCount( 2 ); - -// feedback->ConnectInput( feedback, 0, 0 ); -// feedback->SetValidInputs( 1 ); - -// circuit->StartAutoTick( Component::TickMode::Parallel ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->PauseAutoTick(); - -// feedback->ConnectInput( feedback, 0, 1 ); -// feedback->ConnectInput( feedback, 0, 2 ); -// feedback->ConnectInput( feedback, 0, 3 ); -// feedback->SetValidInputs( 4 ); - -// circuit->StartAutoTick( Component::TickMode::Parallel ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->PauseAutoTick(); - -// feedback->ConnectInput( feedback, 0, 4 ); -// feedback->ConnectInput( feedback, 0, 5 ); -// feedback->ConnectInput( feedback, 0, 6 ); -// feedback->ConnectInput( feedback, 0, 7 ); -// feedback->ConnectInput( feedback, 0, 8 ); -// feedback->ConnectInput( feedback, 0, 9 ); -// feedback->SetValidInputs( 10 ); - -// circuit->StartAutoTick( Component::TickMode::Parallel ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->StopAutoTick(); -// } - -// TEST_CASE( "NoOutputTest2" ) -// { -// // Configure a circuit where the counter responds sporadically -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter, 0, probe, 0 ); - -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// circuit->Tick( Component::TickMode::Parallel ); -// } -// } - -// TEST_CASE( "ChangingOutputTest2" ) -// { -// // Configure a circuit whereby a component outputs varying types (int, float, string, vector) -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter, 0, probe, 0 ); - -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// circuit->Tick( Component::TickMode::Parallel ); -// } -// } - -// TEST_CASE( "ThreadPerformanceTest2" ) -// { -// double cores = std::thread::hardware_concurrency(); -// cores = cores == 3.0 ? 2.0 : cores; -// cores = cores > 4.0 ? 4.0 : cores; -// auto effFrac = cores / 4.0; - -// // Configure a circuit made up of 4 parallel counters, then adjust the thread count -// auto circuit = std::make_shared(); - -// auto counter1 = std::make_shared(); -// auto counter2 = std::make_shared(); -// auto counter3 = std::make_shared(); -// auto counter4 = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter1 ); -// circuit->AddComponent( counter2 ); -// circuit->AddComponent( counter3 ); -// circuit->AddComponent( counter4 ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter1, 0, probe, 0 ); -// circuit->ConnectOutToIn( counter2, 0, probe, 1 ); -// circuit->ConnectOutToIn( counter3, 0, probe, 2 ); -// circuit->ConnectOutToIn( counter4, 0, probe, 3 ); - -// // Tick the circuit with no threads -// auto begin = std::chrono::high_resolution_clock::now(); -// for ( int i = 0; i < 1000; ++i ) -// { -// circuit->Tick( Component::TickMode::Parallel ); -// } -// auto end = std::chrono::high_resolution_clock::now(); -// auto eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - -// auto overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "0x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; -// REQUIRE( eff >= refEff * effFrac * 0.85 ); - -// // Tick the circuit with 1 thread, and check that no more ticks occurred -// if ( std::thread::hardware_concurrency() < 1 ) -// { -// return; -// } -// circuit->SetBufferCount( 1 ); - -// begin = std::chrono::high_resolution_clock::now(); -// for ( int i = 0; i < 1000; ++i ) -// { -// circuit->Tick( Component::TickMode::Parallel ); -// } -// end = std::chrono::high_resolution_clock::now(); -// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - -// overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "1x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; -// REQUIRE( eff >= refEff * effFrac * 0.85 ); - -// // Tick the circuit with 2 threads, and check that more ticks occurred -// if ( std::thread::hardware_concurrency() < 2 ) -// { -// return; -// } -// circuit->SetBufferCount( 2 ); - -// begin = std::chrono::high_resolution_clock::now(); -// for ( int i = 0; i < 1000; ++i ) -// { -// circuit->Tick( Component::TickMode::Parallel ); -// } -// end = std::chrono::high_resolution_clock::now(); -// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - -// overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "2x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; -// REQUIRE( eff >= refEff * effFrac * 0.90 ); - -// // Tick the circuit with 3 threads, and check that more ticks occurred -// if ( std::thread::hardware_concurrency() < 4 ) -// { -// return; -// } -// circuit->SetBufferCount( 3 ); - -// begin = std::chrono::high_resolution_clock::now(); -// for ( int i = 0; i < 1000; ++i ) -// { -// circuit->Tick( Component::TickMode::Parallel ); -// } -// end = std::chrono::high_resolution_clock::now(); -// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - -// overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "3x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; -// REQUIRE( eff >= refEff * effFrac * 0.90 ); - -// // Tick the circuit with 4 threads, and check that more ticks occurred -// if ( std::thread::hardware_concurrency() < 4 ) -// { -// return; -// } -// circuit->SetBufferCount( 4 ); - -// begin = std::chrono::high_resolution_clock::now(); -// for ( int i = 0; i < 1000; ++i ) -// { -// circuit->Tick( Component::TickMode::Parallel ); -// } -// end = std::chrono::high_resolution_clock::now(); -// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - -// overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "4x Buffer Efficiency (Parallel Mode): " << eff << "% (-" << overhead << "%)" << std::endl; -// REQUIRE( eff >= refEff * effFrac * 0.90 ); -// } - -// TEST_CASE( "StopAutoTickRegressionTest2" ) -// { -// auto circuit = std::make_shared(); - -// auto counter1 = std::make_shared(); -// auto counter2 = std::make_shared(); -// auto counter3 = std::make_shared(); -// auto counter4 = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter1 ); -// circuit->AddComponent( counter2 ); -// circuit->AddComponent( counter3 ); -// circuit->AddComponent( counter4 ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter1, 0, probe, 0 ); -// circuit->ConnectOutToIn( counter2, 0, probe, 1 ); -// circuit->ConnectOutToIn( counter3, 0, probe, 2 ); -// circuit->ConnectOutToIn( counter4, 0, probe, 3 ); - -// circuit->SetBufferCount( std::thread::hardware_concurrency() ); - -// circuit->StartAutoTick( Component::TickMode::Parallel ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->StopAutoTick(); -// circuit->RemoveComponent( counter1 ); -// circuit->RemoveComponent( counter2 ); -// circuit->RemoveComponent( counter3 ); -// circuit->RemoveComponent( counter4 ); -// circuit->RemoveComponent( probe ); -// } - -// TEST_CASE( "ThreadAdjustmentTest2" ) -// { -// // Configure a counter circuit, then adjust the thread count while it's running -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter, 0, probe, 0 ); -// circuit->ConnectOutToIn( counter, 0, probe, 1 ); -// circuit->ConnectOutToIn( counter, 0, probe, 2 ); -// circuit->ConnectOutToIn( counter, 0, probe, 3 ); - -// // Tick the circuit for 100ms with 1 thread -// circuit->StartAutoTick( Component::TickMode::Parallel ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// // Adjust the thread count while the circuit is running -// circuit->SetBufferCount( 2 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->SetBufferCount( 0 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->SetBufferCount( 4 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->SetBufferCount( 2 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->SetBufferCount( 3 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->StopAutoTick(); - -// REQUIRE( circuit->GetBufferCount() == 3 ); -// } - -// TEST_CASE( "WiringTest2" ) -// { -// // Configure a counter circuit, then re-wire it while it's running -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->ConnectOutToIn( counter, 0, probe, 0 ); -// circuit->ConnectOutToIn( probe, 0, counter, 0 ); - -// // Tick the circuit for 100ms with 1 thread -// circuit->StartAutoTick( Component::TickMode::Parallel ); +// circuit->StartAutoTick(); // std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); // // Re-wire @@ -1160,16 +656,14 @@ using namespace DSPatch; // // Tick the circuit 100 times // for ( int i = 0; i < 100; ++i ) // { -// circuit->Tick( Component::TickMode::Series ); -// circuit->Tick( Component::TickMode::Parallel ); +// circuit->Tick(); // } // circuit->SetBufferCount( std::thread::hardware_concurrency() ); // for ( int i = 0; i < 100; ++i ) // { -// circuit->Tick( Component::TickMode::Series ); -// circuit->Tick( Component::TickMode::Parallel ); +// circuit->Tick(); // } // } @@ -1188,7 +682,7 @@ using namespace DSPatch; // circuit->DisconnectComponent( counter ); -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); // } // TEST_CASE( "AutoTickOnCircuitDestructRegressionTest" ) @@ -1199,10 +693,10 @@ using namespace DSPatch; // circuit->SetBufferCount( 3 ); // REQUIRE( counter->Count() == 0 ); -// circuit->Tick( Component::TickMode::Series ); -// circuit->Tick( Component::TickMode::Series ); -// circuit->Tick( Component::TickMode::Series ); -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); +// circuit->Tick(); +// circuit->Tick(); +// circuit->Tick(); // circuit = nullptr; @@ -1217,10 +711,10 @@ using namespace DSPatch; // circuit->SetBufferCount( 3 ); // REQUIRE( counter->Count() == 0 ); -// circuit->Tick( Component::TickMode::Series ); -// circuit->Tick( Component::TickMode::Series ); -// circuit->Tick( Component::TickMode::Series ); -// circuit->Tick( Component::TickMode::Series ); +// circuit->Tick(); +// circuit->Tick(); +// circuit->Tick(); +// circuit->Tick(); // circuit->SetBufferCount( 2 ); @@ -1264,14 +758,14 @@ TEST_CASE( "TenThousandComponents" ) for ( int i = 0; i < iterationCount; i++ ) { - circuit->Tick( Component::TickMode::Series ); + circuit->Tick(); } end = std::chrono::high_resolution_clock::now(); diff_ms = std::chrono::duration_cast( end - begin ).count() / 1000.0; - std::cout << "0x Buffer, 10000 Components (Series Mode): " << diff_ms / iterationCount << "ms\n"; + std::cout << "0x Buffer, 10000 Components: " << diff_ms / iterationCount << "ms\n"; } { circuit->SetBufferCount( 1 ); @@ -1282,14 +776,14 @@ TEST_CASE( "TenThousandComponents" ) for ( int i = 0; i < iterationCount; i++ ) { - circuit->Tick( Component::TickMode::Series ); + circuit->Tick(); } end = std::chrono::high_resolution_clock::now(); diff_ms = std::chrono::duration_cast( end - begin ).count() / 1000.0; - std::cout << "1x Buffer, 10000 Components (Series Mode): " << diff_ms / iterationCount << "ms\n"; + std::cout << "1x Buffer, 10000 Components: " << diff_ms / iterationCount << "ms\n"; } { circuit->SetBufferCount( 2 ); @@ -1300,14 +794,14 @@ TEST_CASE( "TenThousandComponents" ) for ( int i = 0; i < iterationCount; i++ ) { - circuit->Tick( Component::TickMode::Series ); + circuit->Tick(); } end = std::chrono::high_resolution_clock::now(); diff_ms = std::chrono::duration_cast( end - begin ).count() / 1000.0; - std::cout << "2x Buffer, 10000 Components (Series Mode): " << diff_ms / iterationCount << "ms\n"; + std::cout << "2x Buffer, 10000 Components: " << diff_ms / iterationCount << "ms\n"; } { circuit->SetBufferCount( 3 ); @@ -1318,14 +812,14 @@ TEST_CASE( "TenThousandComponents" ) for ( int i = 0; i < iterationCount; i++ ) { - circuit->Tick( Component::TickMode::Series ); + circuit->Tick(); } end = std::chrono::high_resolution_clock::now(); diff_ms = std::chrono::duration_cast( end - begin ).count() / 1000.0; - std::cout << "3x Buffer, 10000 Components (Series Mode): " << diff_ms / iterationCount << "ms\n"; + std::cout << "3x Buffer, 10000 Components: " << diff_ms / iterationCount << "ms\n"; } { circuit->SetBufferCount( 4 ); @@ -1336,14 +830,14 @@ TEST_CASE( "TenThousandComponents" ) for ( int i = 0; i < iterationCount; i++ ) { - circuit->Tick( Component::TickMode::Series ); + circuit->Tick(); } end = std::chrono::high_resolution_clock::now(); diff_ms = std::chrono::duration_cast( end - begin ).count() / 1000.0; - std::cout << "4x Buffer, 10000 Components (Series Mode): " << diff_ms / iterationCount << "ms\n"; + std::cout << "4x Buffer, 10000 Components: " << diff_ms / iterationCount << "ms\n"; } begin = std::chrono::high_resolution_clock::now(); From c47f0b4eac5670ebe7f1ea68269bc68104efe589 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Mon, 11 Sep 2023 15:25:49 +0100 Subject: [PATCH 12/17] Fix build --- tests/main.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/main.cpp b/tests/main.cpp index 09088e07..f7e5dcb5 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -721,27 +721,27 @@ using namespace DSPatch; // REQUIRE( counter->Count() == 4 ); // } -TEST_CASE( "AddComponentAfterMultiBufferTickRegressionTest" ) -{ - auto circuit = std::make_shared(); - auto counter = std::make_shared(); - circuit->AddComponent( counter ); - circuit->SetBufferCount( 2 ); +// TEST_CASE( "AddComponentAfterMultiBufferTickRegressionTest" ) +// { +// auto circuit = std::make_shared(); +// auto counter = std::make_shared(); +// circuit->AddComponent( counter ); +// circuit->SetBufferCount( 2 ); - REQUIRE( counter->Count() == 0 ); - circuit->Tick(); - circuit->Sync(); +// REQUIRE( counter->Count() == 0 ); +// circuit->Tick(); +// circuit->Sync(); - REQUIRE( counter->Count() == 1 ); +// REQUIRE( counter->Count() == 1 ); - circuit->RemoveComponent( counter ); - circuit->AddComponent( counter ); +// circuit->RemoveComponent( counter ); +// circuit->AddComponent( counter ); - circuit->Tick(); - circuit->Sync(); +// circuit->Tick(); +// circuit->Sync(); - REQUIRE( counter->Count() == 2 ); -} +// REQUIRE( counter->Count() == 2 ); +// } TEST_CASE( "TenThousandComponents" ) { From e66003bd28108d8d5d7a4bdb58fc47087c1f55ea Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Tue, 12 Sep 2023 14:22:22 +0100 Subject: [PATCH 13/17] Uncomment tests --- src/Circuit.cpp | 3 - src/Component.cpp | 1 - tests/main.cpp | 1332 ++++++++++++++++++++++----------------------- 3 files changed, 666 insertions(+), 670 deletions(-) diff --git a/src/Circuit.cpp b/src/Circuit.cpp index 9a1417d5..7d5db0ba 100644 --- a/src/Circuit.cpp +++ b/src/Circuit.cpp @@ -91,7 +91,6 @@ bool Circuit::AddComponent( const Component::SPtr& component ) return true; } -// cppcheck-suppress unusedFunction bool Circuit::RemoveComponent( const Component::SPtr& component ) { if ( p->componentsSet.find( component ) == p->componentsSet.end() ) @@ -132,7 +131,6 @@ void Circuit::RemoveAllComponents() p->componentsSet.clear(); } -// cppcheck-suppress unusedFunction int Circuit::GetComponentCount() const { return (int)p->components.size(); @@ -224,7 +222,6 @@ void Circuit::SetBufferCount( int bufferCount ) } } -// cppcheck-suppress unusedFunction int Circuit::GetBufferCount() const { return (int)p->circuitThreads.size(); diff --git a/src/Component.cpp b/src/Component.cpp index 22c0ef33..13f868d4 100644 --- a/src/Component.cpp +++ b/src/Component.cpp @@ -172,7 +172,6 @@ void Component::DisconnectAllInputs() p->inputWires.clear(); } -// cppcheck-suppress unusedFunction int Component::GetInputCount() const { return p->inputBuses[0].GetSignalCount(); diff --git a/tests/main.cpp b/tests/main.cpp index f7e5dcb5..8f91f669 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -27,721 +27,721 @@ using namespace DSPatch; -// static double refEff; - -// TEST_CASE( "SignalBusTest" ) -// { -// SignalBus signalBus; - -// signalBus.SetSignalCount( 4 ); - -// signalBus.SetValue( 0, 1.0 ); -// REQUIRE( signalBus.HasValue( 0 ) ); -// REQUIRE( *signalBus.GetValue( 0 ) == 1.0 ); - -// signalBus.SetValue( 1, 1.0f ); -// REQUIRE( signalBus.HasValue( 1 ) ); -// REQUIRE( *signalBus.GetValue( 1 ) == 1.0f ); - -// signalBus.SetValue( 2, 1u ); -// REQUIRE( signalBus.HasValue( 2 ) ); -// REQUIRE( *signalBus.GetValue( 2 ) == 1u ); - -// signalBus.SetValue( 3, 1 ); -// REQUIRE( signalBus.HasValue( 3 ) ); -// REQUIRE( *signalBus.GetValue( 3 ) == 1 ); - -// // no 5th input so should return false and nullptr -// REQUIRE( !signalBus.HasValue( 4 ) ); -// REQUIRE( signalBus.GetValue( 4 ) == nullptr ); - -// REQUIRE( signalBus.GetType( 0 ) != signalBus.GetType( 1 ) ); -// REQUIRE( signalBus.GetType( 1 ) != signalBus.GetType( 2 ) ); -// REQUIRE( signalBus.GetType( 2 ) != signalBus.GetType( 3 ) ); -// // no 5th input so should return void type_info -// REQUIRE( signalBus.GetType( 3 ) != signalBus.GetType( 4 ) ); -// } - -// TEST_CASE( "SerialTest" ) -// { -// // Configure a circuit made up of a counter and 5 incrementers in series -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto inc_s1 = std::make_shared( 1 ); -// auto inc_s2 = std::make_shared( 2 ); -// auto inc_s3 = std::make_shared( 3 ); -// auto inc_s4 = std::make_shared( 4 ); -// auto inc_s5 = std::make_shared( 5 ); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); -// circuit->AddComponent( inc_s1 ); -// circuit->AddComponent( inc_s2 ); -// circuit->AddComponent( inc_s3 ); -// circuit->AddComponent( inc_s4 ); -// circuit->AddComponent( inc_s5 ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter, 0, inc_s1, 0 ); -// circuit->ConnectOutToIn( inc_s1, 0, inc_s2, 0 ); -// circuit->ConnectOutToIn( inc_s2, 0, inc_s3, 0 ); -// circuit->ConnectOutToIn( inc_s3, 0, inc_s4, 0 ); -// circuit->ConnectOutToIn( inc_s4, 0, inc_s5, 0 ); -// circuit->ConnectOutToIn( inc_s5, 0, probe, 0 ); - -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// circuit->Tick(); -// } -// } - -// TEST_CASE( "ParallelTest" ) -// { -// // Configure a circuit made up of a counter and 5 incrementers in parallel -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto inc_p1 = std::make_shared( 1 ); -// auto inc_p2 = std::make_shared( 2 ); -// auto inc_p3 = std::make_shared( 3 ); -// auto inc_p4 = std::make_shared( 4 ); -// auto inc_p5 = std::make_shared( 5 ); -// auto probe = std::make_shared(); - -// REQUIRE( counter->GetInputCount() == 0 ); -// REQUIRE( inc_p1->GetInputCount() == 1 ); -// REQUIRE( probe->GetInputCount() == 5 ); - -// circuit->AddComponent( counter ); -// circuit->AddComponent( inc_p1 ); -// circuit->AddComponent( inc_p2 ); -// circuit->AddComponent( inc_p3 ); -// circuit->AddComponent( inc_p4 ); -// circuit->AddComponent( inc_p5 ); -// circuit->AddComponent( probe ); - -// REQUIRE( circuit->GetComponentCount() == 7 ); - -// REQUIRE( !circuit->AddComponent( counter ) ); -// REQUIRE( !circuit->AddComponent( inc_p1 ) ); -// REQUIRE( !circuit->AddComponent( probe ) ); - -// circuit->ConnectOutToIn( counter, 0, inc_p1, 0 ); -// circuit->ConnectOutToIn( counter, 0, inc_p2, 0 ); -// circuit->ConnectOutToIn( counter, 0, inc_p3, 0 ); -// circuit->ConnectOutToIn( counter, 0, inc_p4, 0 ); -// circuit->ConnectOutToIn( counter, 0, inc_p5, 0 ); -// circuit->ConnectOutToIn( inc_p1, 0, probe, 0 ); -// circuit->ConnectOutToIn( inc_p2, 0, probe, 1 ); -// circuit->ConnectOutToIn( inc_p3, 0, probe, 2 ); -// circuit->ConnectOutToIn( inc_p4, 0, probe, 3 ); -// circuit->ConnectOutToIn( inc_p5, 0, probe, 4 ); - -// // Tick the circuit for 100ms with 3 threads -// circuit->SetBufferCount( 3 ); - -// REQUIRE( counter->GetBufferCount() == 3 ); -// REQUIRE( inc_p1->GetBufferCount() == 3 ); -// REQUIRE( probe->GetBufferCount() == 3 ); - -// circuit->StartAutoTick(); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->StopAutoTick(); -// } - -// TEST_CASE( "BranchSyncTest" ) -// { -// // Configure a circuit made up of 3 parallel branches of 4, 2, and 1 component(s) respectively -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto inc_p1_s1 = std::make_shared(); -// auto inc_p1_s2 = std::make_shared(); -// auto inc_p1_s3 = std::make_shared(); -// auto inc_p1_s4 = std::make_shared(); -// auto inc_p2_s1 = std::make_shared(); -// auto inc_p2_s2 = std::make_shared(); -// auto inc_p3_s1 = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); - -// circuit->AddComponent( inc_p1_s1 ); -// circuit->AddComponent( inc_p1_s2 ); -// circuit->AddComponent( inc_p1_s3 ); -// circuit->AddComponent( inc_p1_s4 ); - -// circuit->AddComponent( inc_p2_s1 ); -// circuit->AddComponent( inc_p2_s2 ); - -// circuit->AddComponent( inc_p3_s1 ); - -// circuit->AddComponent( probe ); - -// // Wire branch 1 -// circuit->ConnectOutToIn( counter, 0, inc_p1_s1, 0 ); -// circuit->ConnectOutToIn( inc_p1_s1, 0, inc_p1_s2, 0 ); -// circuit->ConnectOutToIn( inc_p1_s2, 0, inc_p1_s3, 0 ); -// circuit->ConnectOutToIn( inc_p1_s3, 0, inc_p1_s4, 0 ); -// circuit->ConnectOutToIn( inc_p1_s4, 0, probe, 0 ); - -// // Wire branch 2 -// circuit->ConnectOutToIn( counter, 0, inc_p2_s1, 0 ); -// circuit->ConnectOutToIn( inc_p2_s1, 0, inc_p2_s2, 0 ); -// circuit->ConnectOutToIn( inc_p2_s2, 0, probe, 1 ); - -// // Wire branch 3 -// circuit->ConnectOutToIn( counter, 0, inc_p3_s1, 0 ); -// circuit->ConnectOutToIn( inc_p3_s1, 0, probe, 2 ); - -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// circuit->Tick(); -// } -// } - -// TEST_CASE( "FeedbackTest" ) -// { -// // Configure a circuit made up of an adder that adds a counter to its own previous output -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto adder = std::make_shared(); -// auto passthrough = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); -// circuit->AddComponent( adder ); -// circuit->AddComponent( passthrough ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter, 0, adder, 0 ); -// circuit->ConnectOutToIn( adder, 0, passthrough, 0 ); - -// circuit->ConnectOutToIn( passthrough, 0, adder, 1 ); - -// circuit->ConnectOutToIn( adder, 0, probe, 0 ); - -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// circuit->Tick(); -// } -// } - -// TEST_CASE( "FeedbackTestNoCircuit" ) -// { -// auto counter = std::make_shared(); -// auto adder = std::make_shared(); -// auto passthrough = std::make_shared(); -// auto probe = std::make_shared(); - -// adder->ConnectInput( counter, 0, 0 ); -// passthrough->ConnectInput( adder, 0, 0 ); - -// adder->ConnectInput( passthrough, 0, 1 ); - -// probe->ConnectInput( adder, 0, 0 ); - -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// counter->Tick(); -// adder->Tick(); -// passthrough->Tick(); -// probe->Tick(); - -// counter->Reset(); -// adder->Reset(); -// passthrough->Reset(); -// probe->Reset(); -// } -// } - -// TEST_CASE( "RefCountResetRegressionTest" ) -// { -// auto circuit = std::make_shared(); -// auto feedback = std::make_shared( 2 ); - -// circuit->AddComponent( feedback ); -// circuit->SetBufferCount( 2 ); - -// feedback->ConnectInput( feedback, 0, 0 ); -// feedback->SetValidInputs( 1 ); - -// circuit->StartAutoTick(); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->PauseAutoTick(); - -// feedback->ConnectInput( feedback, 0, 1 ); -// feedback->ConnectInput( feedback, 0, 2 ); -// feedback->ConnectInput( feedback, 0, 3 ); -// feedback->SetValidInputs( 4 ); - -// circuit->StartAutoTick(); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->PauseAutoTick(); - -// feedback->ConnectInput( feedback, 0, 4 ); -// feedback->ConnectInput( feedback, 0, 5 ); -// feedback->ConnectInput( feedback, 0, 6 ); -// feedback->ConnectInput( feedback, 0, 7 ); -// feedback->ConnectInput( feedback, 0, 8 ); -// feedback->ConnectInput( feedback, 0, 9 ); -// feedback->SetValidInputs( 10 ); - -// circuit->StartAutoTick(); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->StopAutoTick(); -// } - -// TEST_CASE( "NoOutputTest" ) -// { -// // Configure a circuit where the counter responds sporadically -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter, 0, probe, 0 ); - -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// circuit->Tick(); -// } -// } - -// TEST_CASE( "ChangingOutputTest" ) -// { -// // Configure a circuit whereby a component outputs varying types (int, float, string, vector) -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter, 0, probe, 0 ); - -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// circuit->Tick(); -// } -// } - -// TEST_CASE( "ThreadPerformanceTest" ) -// { -// // Configure a circuit made up of 4 parallel counters, then adjust the thread count -// auto circuit = std::make_shared(); - -// auto counter1 = std::make_shared(); -// auto counter2 = std::make_shared(); -// auto counter3 = std::make_shared(); -// auto counter4 = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter1 ); -// circuit->AddComponent( counter2 ); -// circuit->AddComponent( counter3 ); -// circuit->AddComponent( counter4 ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter1, 0, probe, 0 ); -// circuit->ConnectOutToIn( counter2, 0, probe, 1 ); -// circuit->ConnectOutToIn( counter3, 0, probe, 2 ); -// circuit->ConnectOutToIn( counter4, 0, probe, 3 ); - -// // Calculate reference efficiency - -// SignalBus testBus; -// auto measureRef = [&testBus]( std::shared_ptr& counter ) -// { -// for ( int i = 0; i < 1000; ++i ) -// { -// counter->Process_( testBus, testBus ); -// } -// }; - -// auto begin = std::chrono::high_resolution_clock::now(); -// auto t1 = std::thread( [&measureRef, &counter1]() { measureRef( counter1 ); } ); -// auto t2 = std::thread( [&measureRef, &counter2]() { measureRef( counter2 ); } ); -// auto t3 = std::thread( [&measureRef, &counter3]() { measureRef( counter3 ); } ); -// auto t4 = std::thread( [&measureRef, &counter4]() { measureRef( counter4 ); } ); -// t1.join(); -// t2.join(); -// t3.join(); -// t4.join(); -// auto end = std::chrono::high_resolution_clock::now(); -// refEff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - -// counter1->ResetCount(); -// counter2->ResetCount(); -// counter3->ResetCount(); -// counter4->ResetCount(); - -// std::cout << "Reference Efficiency: " << refEff << "%" << std::endl; - -// // Tick the circuit with no threads -// begin = std::chrono::high_resolution_clock::now(); -// for ( int i = 0; i < 1000; ++i ) -// { -// circuit->Tick(); -// } -// end = std::chrono::high_resolution_clock::now(); -// auto eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - -// auto overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "0x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; -// REQUIRE( eff >= refEff * 0.25 * 0.90 ); - -// // Tick the circuit with 1 thread, and check that no more ticks occurred -// if ( std::thread::hardware_concurrency() < 1 ) -// { -// return; -// } -// circuit->SetBufferCount( 1 ); - -// begin = std::chrono::high_resolution_clock::now(); -// for ( int i = 0; i < 1000; ++i ) -// { -// circuit->Tick(); -// } -// end = std::chrono::high_resolution_clock::now(); -// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - -// overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "1x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; -// REQUIRE( eff >= refEff * 0.25 * 0.90 ); - -// // Tick the circuit with 2 threads, and check that more ticks occurred -// if ( std::thread::hardware_concurrency() < 2 ) -// { -// return; -// } -// circuit->SetBufferCount( 2 ); - -// begin = std::chrono::high_resolution_clock::now(); -// for ( int i = 0; i < 1000; ++i ) -// { -// circuit->Tick(); -// } -// end = std::chrono::high_resolution_clock::now(); -// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - -// overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "2x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; -// REQUIRE( eff >= refEff * 0.5 * 0.90 ); - -// // Tick the circuit with 3 threads, and check that more ticks occurred -// if ( std::thread::hardware_concurrency() < 4 ) -// { -// return; -// } -// circuit->SetBufferCount( 3 ); - -// begin = std::chrono::high_resolution_clock::now(); -// for ( int i = 0; i < 1000; ++i ) -// { -// circuit->Tick(); -// } -// end = std::chrono::high_resolution_clock::now(); -// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - -// overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "3x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; -// REQUIRE( eff >= refEff * 0.75 * 0.90 ); - -// // Tick the circuit with 4 threads, and check that more ticks occurred -// if ( std::thread::hardware_concurrency() < 4 ) -// { -// return; -// } -// circuit->SetBufferCount( 4 ); - -// begin = std::chrono::high_resolution_clock::now(); -// for ( int i = 0; i < 1000; ++i ) -// { -// circuit->Tick(); -// } -// end = std::chrono::high_resolution_clock::now(); -// eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); - -// overhead = 100 - ( 100 * ( eff / refEff ) ); -// std::cout << "4x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; -// REQUIRE( eff >= refEff * 0.90 ); -// } - -// TEST_CASE( "StopAutoTickRegressionTest" ) -// { -// auto circuit = std::make_shared(); - -// auto counter1 = std::make_shared(); -// auto counter2 = std::make_shared(); -// auto counter3 = std::make_shared(); -// auto counter4 = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter1 ); -// circuit->AddComponent( counter2 ); -// circuit->AddComponent( counter3 ); -// circuit->AddComponent( counter4 ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter1, 0, probe, 0 ); -// circuit->ConnectOutToIn( counter2, 0, probe, 1 ); -// circuit->ConnectOutToIn( counter3, 0, probe, 2 ); -// circuit->ConnectOutToIn( counter4, 0, probe, 3 ); - -// circuit->SetBufferCount( std::thread::hardware_concurrency() ); - -// circuit->StartAutoTick(); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->StopAutoTick(); -// circuit->RemoveComponent( counter1 ); -// circuit->RemoveComponent( counter2 ); -// circuit->RemoveComponent( counter3 ); -// circuit->RemoveComponent( counter4 ); -// circuit->RemoveComponent( probe ); - -// REQUIRE( !circuit->RemoveComponent( counter1 ) ); -// } - -// TEST_CASE( "ThreadAdjustmentTest" ) -// { -// // Configure a counter circuit, then adjust the thread count while it's running -// auto circuit = std::make_shared(); - -// auto counter = std::make_shared(); -// auto probe = std::make_shared(); - -// circuit->AddComponent( counter ); -// circuit->AddComponent( probe ); - -// circuit->ConnectOutToIn( counter, 0, probe, 0 ); -// circuit->ConnectOutToIn( counter, 0, probe, 1 ); -// circuit->ConnectOutToIn( counter, 0, probe, 2 ); -// circuit->ConnectOutToIn( counter, 0, probe, 3 ); - -// // Tick the circuit for 100ms with 1 thread -// circuit->StartAutoTick(); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// // Adjust the thread count while the circuit is running -// circuit->SetBufferCount( 2 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->SetBufferCount( 0 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->SetBufferCount( 4 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->SetBufferCount( 2 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->SetBufferCount( 3 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - -// circuit->StopAutoTick(); +static double refEff; -// REQUIRE( circuit->GetBufferCount() == 3 ); -// } +TEST_CASE( "SignalBusTest" ) +{ + SignalBus signalBus; + + signalBus.SetSignalCount( 4 ); + + signalBus.SetValue( 0, 1.0 ); + REQUIRE( signalBus.HasValue( 0 ) ); + REQUIRE( *signalBus.GetValue( 0 ) == 1.0 ); + + signalBus.SetValue( 1, 1.0f ); + REQUIRE( signalBus.HasValue( 1 ) ); + REQUIRE( *signalBus.GetValue( 1 ) == 1.0f ); + + signalBus.SetValue( 2, 1u ); + REQUIRE( signalBus.HasValue( 2 ) ); + REQUIRE( *signalBus.GetValue( 2 ) == 1u ); + + signalBus.SetValue( 3, 1 ); + REQUIRE( signalBus.HasValue( 3 ) ); + REQUIRE( *signalBus.GetValue( 3 ) == 1 ); + + // no 5th input so should return false and nullptr + REQUIRE( !signalBus.HasValue( 4 ) ); + REQUIRE( signalBus.GetValue( 4 ) == nullptr ); + + REQUIRE( signalBus.GetType( 0 ) != signalBus.GetType( 1 ) ); + REQUIRE( signalBus.GetType( 1 ) != signalBus.GetType( 2 ) ); + REQUIRE( signalBus.GetType( 2 ) != signalBus.GetType( 3 ) ); + // no 5th input so should return void type_info + REQUIRE( signalBus.GetType( 3 ) != signalBus.GetType( 4 ) ); +} + +TEST_CASE( "SerialTest" ) +{ + // Configure a circuit made up of a counter and 5 incrementers in series + auto circuit = std::make_shared(); + + auto counter = std::make_shared(); + auto inc_s1 = std::make_shared( 1 ); + auto inc_s2 = std::make_shared( 2 ); + auto inc_s3 = std::make_shared( 3 ); + auto inc_s4 = std::make_shared( 4 ); + auto inc_s5 = std::make_shared( 5 ); + auto probe = std::make_shared(); + + circuit->AddComponent( counter ); + circuit->AddComponent( inc_s1 ); + circuit->AddComponent( inc_s2 ); + circuit->AddComponent( inc_s3 ); + circuit->AddComponent( inc_s4 ); + circuit->AddComponent( inc_s5 ); + circuit->AddComponent( probe ); + + circuit->ConnectOutToIn( counter, 0, inc_s1, 0 ); + circuit->ConnectOutToIn( inc_s1, 0, inc_s2, 0 ); + circuit->ConnectOutToIn( inc_s2, 0, inc_s3, 0 ); + circuit->ConnectOutToIn( inc_s3, 0, inc_s4, 0 ); + circuit->ConnectOutToIn( inc_s4, 0, inc_s5, 0 ); + circuit->ConnectOutToIn( inc_s5, 0, probe, 0 ); + + // Tick the circuit 100 times + for ( int i = 0; i < 100; ++i ) + { + circuit->Tick(); + } +} + +TEST_CASE( "ParallelTest" ) +{ + // Configure a circuit made up of a counter and 5 incrementers in parallel + auto circuit = std::make_shared(); + + auto counter = std::make_shared(); + auto inc_p1 = std::make_shared( 1 ); + auto inc_p2 = std::make_shared( 2 ); + auto inc_p3 = std::make_shared( 3 ); + auto inc_p4 = std::make_shared( 4 ); + auto inc_p5 = std::make_shared( 5 ); + auto probe = std::make_shared(); + + REQUIRE( counter->GetInputCount() == 0 ); + REQUIRE( inc_p1->GetInputCount() == 1 ); + REQUIRE( probe->GetInputCount() == 5 ); + + circuit->AddComponent( counter ); + circuit->AddComponent( inc_p1 ); + circuit->AddComponent( inc_p2 ); + circuit->AddComponent( inc_p3 ); + circuit->AddComponent( inc_p4 ); + circuit->AddComponent( inc_p5 ); + circuit->AddComponent( probe ); + + REQUIRE( circuit->GetComponentCount() == 7 ); + + REQUIRE( !circuit->AddComponent( counter ) ); + REQUIRE( !circuit->AddComponent( inc_p1 ) ); + REQUIRE( !circuit->AddComponent( probe ) ); + + circuit->ConnectOutToIn( counter, 0, inc_p1, 0 ); + circuit->ConnectOutToIn( counter, 0, inc_p2, 0 ); + circuit->ConnectOutToIn( counter, 0, inc_p3, 0 ); + circuit->ConnectOutToIn( counter, 0, inc_p4, 0 ); + circuit->ConnectOutToIn( counter, 0, inc_p5, 0 ); + circuit->ConnectOutToIn( inc_p1, 0, probe, 0 ); + circuit->ConnectOutToIn( inc_p2, 0, probe, 1 ); + circuit->ConnectOutToIn( inc_p3, 0, probe, 2 ); + circuit->ConnectOutToIn( inc_p4, 0, probe, 3 ); + circuit->ConnectOutToIn( inc_p5, 0, probe, 4 ); + + // Tick the circuit for 100ms with 3 threads + circuit->SetBufferCount( 3 ); + + REQUIRE( counter->GetBufferCount() == 3 ); + REQUIRE( inc_p1->GetBufferCount() == 3 ); + REQUIRE( probe->GetBufferCount() == 3 ); + + circuit->StartAutoTick(); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + circuit->StopAutoTick(); +} + +TEST_CASE( "BranchSyncTest" ) +{ + // Configure a circuit made up of 3 parallel branches of 4, 2, and 1 component(s) respectively + auto circuit = std::make_shared(); + + auto counter = std::make_shared(); + auto inc_p1_s1 = std::make_shared(); + auto inc_p1_s2 = std::make_shared(); + auto inc_p1_s3 = std::make_shared(); + auto inc_p1_s4 = std::make_shared(); + auto inc_p2_s1 = std::make_shared(); + auto inc_p2_s2 = std::make_shared(); + auto inc_p3_s1 = std::make_shared(); + auto probe = std::make_shared(); + + circuit->AddComponent( counter ); + + circuit->AddComponent( inc_p1_s1 ); + circuit->AddComponent( inc_p1_s2 ); + circuit->AddComponent( inc_p1_s3 ); + circuit->AddComponent( inc_p1_s4 ); + + circuit->AddComponent( inc_p2_s1 ); + circuit->AddComponent( inc_p2_s2 ); + + circuit->AddComponent( inc_p3_s1 ); + + circuit->AddComponent( probe ); + + // Wire branch 1 + circuit->ConnectOutToIn( counter, 0, inc_p1_s1, 0 ); + circuit->ConnectOutToIn( inc_p1_s1, 0, inc_p1_s2, 0 ); + circuit->ConnectOutToIn( inc_p1_s2, 0, inc_p1_s3, 0 ); + circuit->ConnectOutToIn( inc_p1_s3, 0, inc_p1_s4, 0 ); + circuit->ConnectOutToIn( inc_p1_s4, 0, probe, 0 ); + + // Wire branch 2 + circuit->ConnectOutToIn( counter, 0, inc_p2_s1, 0 ); + circuit->ConnectOutToIn( inc_p2_s1, 0, inc_p2_s2, 0 ); + circuit->ConnectOutToIn( inc_p2_s2, 0, probe, 1 ); + + // Wire branch 3 + circuit->ConnectOutToIn( counter, 0, inc_p3_s1, 0 ); + circuit->ConnectOutToIn( inc_p3_s1, 0, probe, 2 ); + + // Tick the circuit 100 times + for ( int i = 0; i < 100; ++i ) + { + circuit->Tick(); + } +} + +TEST_CASE( "FeedbackTest" ) +{ + // Configure a circuit made up of an adder that adds a counter to its own previous output + auto circuit = std::make_shared(); + + auto counter = std::make_shared(); + auto adder = std::make_shared(); + auto passthrough = std::make_shared(); + auto probe = std::make_shared(); + + circuit->AddComponent( counter ); + circuit->AddComponent( adder ); + circuit->AddComponent( passthrough ); + circuit->AddComponent( probe ); + + circuit->ConnectOutToIn( counter, 0, adder, 0 ); + circuit->ConnectOutToIn( adder, 0, passthrough, 0 ); + + circuit->ConnectOutToIn( passthrough, 0, adder, 1 ); + + circuit->ConnectOutToIn( adder, 0, probe, 0 ); + + // Tick the circuit 100 times + for ( int i = 0; i < 100; ++i ) + { + circuit->Tick(); + } +} + +TEST_CASE( "FeedbackTestNoCircuit" ) +{ + auto counter = std::make_shared(); + auto adder = std::make_shared(); + auto passthrough = std::make_shared(); + auto probe = std::make_shared(); + + adder->ConnectInput( counter, 0, 0 ); + passthrough->ConnectInput( adder, 0, 0 ); + + adder->ConnectInput( passthrough, 0, 1 ); + + probe->ConnectInput( adder, 0, 0 ); + + // Tick the circuit 100 times + for ( int i = 0; i < 100; ++i ) + { + counter->Tick(); + adder->Tick(); + passthrough->Tick(); + probe->Tick(); + + counter->Reset(); + adder->Reset(); + passthrough->Reset(); + probe->Reset(); + } +} + +TEST_CASE( "RefCountResetRegressionTest" ) +{ + auto circuit = std::make_shared(); + auto feedback = std::make_shared( 2 ); + + circuit->AddComponent( feedback ); + circuit->SetBufferCount( 2 ); + + feedback->ConnectInput( feedback, 0, 0 ); + feedback->SetValidInputs( 1 ); + + circuit->StartAutoTick(); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + circuit->PauseAutoTick(); + + feedback->ConnectInput( feedback, 0, 1 ); + feedback->ConnectInput( feedback, 0, 2 ); + feedback->ConnectInput( feedback, 0, 3 ); + feedback->SetValidInputs( 4 ); + + circuit->StartAutoTick(); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + circuit->PauseAutoTick(); + + feedback->ConnectInput( feedback, 0, 4 ); + feedback->ConnectInput( feedback, 0, 5 ); + feedback->ConnectInput( feedback, 0, 6 ); + feedback->ConnectInput( feedback, 0, 7 ); + feedback->ConnectInput( feedback, 0, 8 ); + feedback->ConnectInput( feedback, 0, 9 ); + feedback->SetValidInputs( 10 ); + + circuit->StartAutoTick(); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + circuit->StopAutoTick(); +} + +TEST_CASE( "NoOutputTest" ) +{ + // Configure a circuit where the counter responds sporadically + auto circuit = std::make_shared(); + + auto counter = std::make_shared(); + auto probe = std::make_shared(); + + circuit->AddComponent( counter ); + circuit->AddComponent( probe ); + + circuit->ConnectOutToIn( counter, 0, probe, 0 ); + + // Tick the circuit 100 times + for ( int i = 0; i < 100; ++i ) + { + circuit->Tick(); + } +} + +TEST_CASE( "ChangingOutputTest" ) +{ + // Configure a circuit whereby a component outputs varying types (int, float, string, vector) + auto circuit = std::make_shared(); + + auto counter = std::make_shared(); + auto probe = std::make_shared(); + + circuit->AddComponent( counter ); + circuit->AddComponent( probe ); + + circuit->ConnectOutToIn( counter, 0, probe, 0 ); + + // Tick the circuit 100 times + for ( int i = 0; i < 100; ++i ) + { + circuit->Tick(); + } +} + +TEST_CASE( "ThreadPerformanceTest" ) +{ + // Configure a circuit made up of 4 parallel counters, then adjust the thread count + auto circuit = std::make_shared(); + + auto counter1 = std::make_shared(); + auto counter2 = std::make_shared(); + auto counter3 = std::make_shared(); + auto counter4 = std::make_shared(); + auto probe = std::make_shared(); + + circuit->AddComponent( counter1 ); + circuit->AddComponent( counter2 ); + circuit->AddComponent( counter3 ); + circuit->AddComponent( counter4 ); + circuit->AddComponent( probe ); + + circuit->ConnectOutToIn( counter1, 0, probe, 0 ); + circuit->ConnectOutToIn( counter2, 0, probe, 1 ); + circuit->ConnectOutToIn( counter3, 0, probe, 2 ); + circuit->ConnectOutToIn( counter4, 0, probe, 3 ); + + // Calculate reference efficiency + + SignalBus testBus; + auto measureRef = [&testBus]( std::shared_ptr& counter ) + { + for ( int i = 0; i < 1000; ++i ) + { + counter->Process_( testBus, testBus ); + } + }; + + auto begin = std::chrono::high_resolution_clock::now(); + auto t1 = std::thread( [&measureRef, &counter1]() { measureRef( counter1 ); } ); + auto t2 = std::thread( [&measureRef, &counter2]() { measureRef( counter2 ); } ); + auto t3 = std::thread( [&measureRef, &counter3]() { measureRef( counter3 ); } ); + auto t4 = std::thread( [&measureRef, &counter4]() { measureRef( counter4 ); } ); + t1.join(); + t2.join(); + t3.join(); + t4.join(); + auto end = std::chrono::high_resolution_clock::now(); + refEff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + + counter1->ResetCount(); + counter2->ResetCount(); + counter3->ResetCount(); + counter4->ResetCount(); + + std::cout << "Reference Efficiency: " << refEff << "%" << std::endl; + + // Tick the circuit with no threads + begin = std::chrono::high_resolution_clock::now(); + for ( int i = 0; i < 1000; ++i ) + { + circuit->Tick(); + } + end = std::chrono::high_resolution_clock::now(); + auto eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + + auto overhead = 100 - ( 100 * ( eff / refEff ) ); + std::cout << "0x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; + REQUIRE( eff >= refEff * 0.25 * 0.90 ); + + // Tick the circuit with 1 thread, and check that no more ticks occurred + if ( std::thread::hardware_concurrency() < 1 ) + { + return; + } + circuit->SetBufferCount( 1 ); + + begin = std::chrono::high_resolution_clock::now(); + for ( int i = 0; i < 1000; ++i ) + { + circuit->Tick(); + } + end = std::chrono::high_resolution_clock::now(); + eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + + overhead = 100 - ( 100 * ( eff / refEff ) ); + std::cout << "1x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; + REQUIRE( eff >= refEff * 0.25 * 0.90 ); + + // Tick the circuit with 2 threads, and check that more ticks occurred + if ( std::thread::hardware_concurrency() < 2 ) + { + return; + } + circuit->SetBufferCount( 2 ); + + begin = std::chrono::high_resolution_clock::now(); + for ( int i = 0; i < 1000; ++i ) + { + circuit->Tick(); + } + end = std::chrono::high_resolution_clock::now(); + eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + + overhead = 100 - ( 100 * ( eff / refEff ) ); + std::cout << "2x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; + REQUIRE( eff >= refEff * 0.5 * 0.90 ); + + // Tick the circuit with 3 threads, and check that more ticks occurred + if ( std::thread::hardware_concurrency() < 4 ) + { + return; + } + circuit->SetBufferCount( 3 ); + + begin = std::chrono::high_resolution_clock::now(); + for ( int i = 0; i < 1000; ++i ) + { + circuit->Tick(); + } + end = std::chrono::high_resolution_clock::now(); + eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + + overhead = 100 - ( 100 * ( eff / refEff ) ); + std::cout << "3x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; + REQUIRE( eff >= refEff * 0.75 * 0.90 ); + + // Tick the circuit with 4 threads, and check that more ticks occurred + if ( std::thread::hardware_concurrency() < 4 ) + { + return; + } + circuit->SetBufferCount( 4 ); + + begin = std::chrono::high_resolution_clock::now(); + for ( int i = 0; i < 1000; ++i ) + { + circuit->Tick(); + } + end = std::chrono::high_resolution_clock::now(); + eff = 100000.0 / std::chrono::duration_cast( end - begin ).count(); + + overhead = 100 - ( 100 * ( eff / refEff ) ); + std::cout << "4x Buffer Efficiency: " << eff << "% (-" << overhead << "%)" << std::endl; + REQUIRE( eff >= refEff * 0.90 ); +} + +TEST_CASE( "StopAutoTickRegressionTest" ) +{ + auto circuit = std::make_shared(); + + auto counter1 = std::make_shared(); + auto counter2 = std::make_shared(); + auto counter3 = std::make_shared(); + auto counter4 = std::make_shared(); + auto probe = std::make_shared(); + + circuit->AddComponent( counter1 ); + circuit->AddComponent( counter2 ); + circuit->AddComponent( counter3 ); + circuit->AddComponent( counter4 ); + circuit->AddComponent( probe ); + + circuit->ConnectOutToIn( counter1, 0, probe, 0 ); + circuit->ConnectOutToIn( counter2, 0, probe, 1 ); + circuit->ConnectOutToIn( counter3, 0, probe, 2 ); + circuit->ConnectOutToIn( counter4, 0, probe, 3 ); + + circuit->SetBufferCount( std::thread::hardware_concurrency() ); + + circuit->StartAutoTick(); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + circuit->StopAutoTick(); + circuit->RemoveComponent( counter1 ); + circuit->RemoveComponent( counter2 ); + circuit->RemoveComponent( counter3 ); + circuit->RemoveComponent( counter4 ); + circuit->RemoveComponent( probe ); + + REQUIRE( !circuit->RemoveComponent( counter1 ) ); +} + +TEST_CASE( "ThreadAdjustmentTest" ) +{ + // Configure a counter circuit, then adjust the thread count while it's running + auto circuit = std::make_shared(); + + auto counter = std::make_shared(); + auto probe = std::make_shared(); + + circuit->AddComponent( counter ); + circuit->AddComponent( probe ); + + circuit->ConnectOutToIn( counter, 0, probe, 0 ); + circuit->ConnectOutToIn( counter, 0, probe, 1 ); + circuit->ConnectOutToIn( counter, 0, probe, 2 ); + circuit->ConnectOutToIn( counter, 0, probe, 3 ); + + // Tick the circuit for 100ms with 1 thread + circuit->StartAutoTick(); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + + // Adjust the thread count while the circuit is running + circuit->SetBufferCount( 2 ); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + + circuit->SetBufferCount( 0 ); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + + circuit->SetBufferCount( 4 ); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + + circuit->SetBufferCount( 2 ); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + + circuit->SetBufferCount( 3 ); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + + circuit->StopAutoTick(); + + REQUIRE( circuit->GetBufferCount() == 3 ); +} -// TEST_CASE( "WiringTest" ) -// { -// // Configure a counter circuit, then re-wire it while it's running -// auto circuit = std::make_shared(); +TEST_CASE( "WiringTest" ) +{ + // Configure a counter circuit, then re-wire it while it's running + auto circuit = std::make_shared(); -// auto counter = std::make_shared(); -// auto probe = std::make_shared(); + auto counter = std::make_shared(); + auto probe = std::make_shared(); -// circuit->ConnectOutToIn( counter, 0, probe, 0 ); -// circuit->ConnectOutToIn( probe, 0, counter, 0 ); + circuit->ConnectOutToIn( counter, 0, probe, 0 ); + circuit->ConnectOutToIn( probe, 0, counter, 0 ); -// // Tick the circuit for 100ms with 1 thread -// circuit->StartAutoTick(); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + // Tick the circuit for 100ms with 1 thread + circuit->StartAutoTick(); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// // Re-wire + // Re-wire -// auto pass_s1 = std::make_shared(); -// circuit->AddComponent( pass_s1 ); + auto pass_s1 = std::make_shared(); + circuit->AddComponent( pass_s1 ); -// circuit->ConnectOutToIn( pass_s1, 0, probe, 0 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + circuit->ConnectOutToIn( pass_s1, 0, probe, 0 ); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->ConnectOutToIn( counter, 0, pass_s1, 0 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + circuit->ConnectOutToIn( counter, 0, pass_s1, 0 ); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// // Disconnect a component + // Disconnect a component -// circuit->PauseAutoTick(); -// probe->DisconnectInput( 0 ); -// circuit->ResumeAutoTick(); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->DisconnectComponent( probe ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + circuit->PauseAutoTick(); + probe->DisconnectInput( 0 ); + circuit->ResumeAutoTick(); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + circuit->DisconnectComponent( probe ); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// // Wire in a new component + // Wire in a new component -// auto pass_s2 = std::make_shared(); -// circuit->AddComponent( pass_s2 ); + auto pass_s2 = std::make_shared(); + circuit->AddComponent( pass_s2 ); -// circuit->ConnectOutToIn( probe, 0, counter, 0 ); -// circuit->ConnectOutToIn( pass_s2, 0, probe, 0 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + circuit->ConnectOutToIn( probe, 0, counter, 0 ); + circuit->ConnectOutToIn( pass_s2, 0, probe, 0 ); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->ConnectOutToIn( pass_s1, 0, pass_s2, 0 ); -// std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); + circuit->ConnectOutToIn( pass_s1, 0, pass_s2, 0 ); + std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); -// circuit->StopAutoTick(); -// } + circuit->StopAutoTick(); +} -// //================================================================================================= +//================================================================================================= -// TEST_CASE( "ThreadStopRegressionTest" ) -// { -// // Configure a circuit made up of 3 parallel branches of 4, 2, and 1 component(s) respectively -// auto circuit = std::make_shared(); +TEST_CASE( "ThreadStopRegressionTest" ) +{ + // Configure a circuit made up of 3 parallel branches of 4, 2, and 1 component(s) respectively + auto circuit = std::make_shared(); -// auto counter = std::make_shared(); -// auto inc_p1_s1 = std::make_shared(); -// auto inc_p1_s2 = std::make_shared(); -// auto inc_p1_s3 = std::make_shared(); -// auto inc_p1_s4 = std::make_shared(); -// auto inc_p2_s1 = std::make_shared(); -// auto inc_p2_s2 = std::make_shared(); -// auto inc_p3_s1 = std::make_shared(); -// auto probe = std::make_shared(); + auto counter = std::make_shared(); + auto inc_p1_s1 = std::make_shared(); + auto inc_p1_s2 = std::make_shared(); + auto inc_p1_s3 = std::make_shared(); + auto inc_p1_s4 = std::make_shared(); + auto inc_p2_s1 = std::make_shared(); + auto inc_p2_s2 = std::make_shared(); + auto inc_p3_s1 = std::make_shared(); + auto probe = std::make_shared(); -// circuit->AddComponent( counter ); + circuit->AddComponent( counter ); -// circuit->AddComponent( inc_p1_s1 ); -// circuit->AddComponent( inc_p1_s2 ); -// circuit->AddComponent( inc_p1_s3 ); -// circuit->AddComponent( inc_p1_s4 ); + circuit->AddComponent( inc_p1_s1 ); + circuit->AddComponent( inc_p1_s2 ); + circuit->AddComponent( inc_p1_s3 ); + circuit->AddComponent( inc_p1_s4 ); -// circuit->AddComponent( inc_p2_s1 ); -// circuit->AddComponent( inc_p2_s2 ); + circuit->AddComponent( inc_p2_s1 ); + circuit->AddComponent( inc_p2_s2 ); -// circuit->AddComponent( inc_p3_s1 ); + circuit->AddComponent( inc_p3_s1 ); -// circuit->AddComponent( probe ); + circuit->AddComponent( probe ); -// // Wire branch 1 -// circuit->ConnectOutToIn( counter, 0, inc_p1_s1, 0 ); -// circuit->ConnectOutToIn( inc_p1_s1, 0, inc_p1_s2, 0 ); -// circuit->ConnectOutToIn( inc_p1_s2, 0, inc_p1_s3, 0 ); -// circuit->ConnectOutToIn( inc_p1_s3, 0, inc_p1_s4, 0 ); -// circuit->ConnectOutToIn( inc_p1_s4, 0, probe, 0 ); + // Wire branch 1 + circuit->ConnectOutToIn( counter, 0, inc_p1_s1, 0 ); + circuit->ConnectOutToIn( inc_p1_s1, 0, inc_p1_s2, 0 ); + circuit->ConnectOutToIn( inc_p1_s2, 0, inc_p1_s3, 0 ); + circuit->ConnectOutToIn( inc_p1_s3, 0, inc_p1_s4, 0 ); + circuit->ConnectOutToIn( inc_p1_s4, 0, probe, 0 ); -// // Wire branch 2 -// circuit->ConnectOutToIn( counter, 0, inc_p2_s1, 0 ); -// circuit->ConnectOutToIn( inc_p2_s1, 0, inc_p2_s2, 0 ); -// circuit->ConnectOutToIn( inc_p2_s2, 0, probe, 1 ); + // Wire branch 2 + circuit->ConnectOutToIn( counter, 0, inc_p2_s1, 0 ); + circuit->ConnectOutToIn( inc_p2_s1, 0, inc_p2_s2, 0 ); + circuit->ConnectOutToIn( inc_p2_s2, 0, probe, 1 ); -// // Wire branch 3 -// circuit->ConnectOutToIn( counter, 0, inc_p3_s1, 0 ); -// circuit->ConnectOutToIn( inc_p3_s1, 0, probe, 2 ); + // Wire branch 3 + circuit->ConnectOutToIn( counter, 0, inc_p3_s1, 0 ); + circuit->ConnectOutToIn( inc_p3_s1, 0, probe, 2 ); -// // Tick the circuit 100 times -// for ( int i = 0; i < 100; ++i ) -// { -// circuit->Tick(); -// } + // Tick the circuit 100 times + for ( int i = 0; i < 100; ++i ) + { + circuit->Tick(); + } -// circuit->SetBufferCount( std::thread::hardware_concurrency() ); + circuit->SetBufferCount( std::thread::hardware_concurrency() ); -// for ( int i = 0; i < 100; ++i ) -// { -// circuit->Tick(); -// } -// } + for ( int i = 0; i < 100; ++i ) + { + circuit->Tick(); + } +} -// TEST_CASE( "DisconnectComponentRegressionTest" ) -// { -// auto circuit = std::make_shared(); +TEST_CASE( "DisconnectComponentRegressionTest" ) +{ + auto circuit = std::make_shared(); -// auto counter = std::make_shared(); -// auto probe = std::make_shared(); + auto counter = std::make_shared(); + auto probe = std::make_shared(); -// circuit->AddComponent( counter ); -// circuit->AddComponent( probe ); + circuit->AddComponent( counter ); + circuit->AddComponent( probe ); -// circuit->ConnectOutToIn( counter, 0, probe, 0 ); -// circuit->ConnectOutToIn( counter, 0, probe, 1 ); + circuit->ConnectOutToIn( counter, 0, probe, 0 ); + circuit->ConnectOutToIn( counter, 0, probe, 1 ); -// circuit->DisconnectComponent( counter ); + circuit->DisconnectComponent( counter ); -// circuit->Tick(); -// } + circuit->Tick(); +} -// TEST_CASE( "AutoTickOnCircuitDestructRegressionTest" ) -// { -// auto circuit = std::make_shared(); -// auto counter = std::make_shared(); -// circuit->AddComponent( counter ); -// circuit->SetBufferCount( 3 ); +TEST_CASE( "AutoTickOnCircuitDestructRegressionTest" ) +{ + auto circuit = std::make_shared(); + auto counter = std::make_shared(); + circuit->AddComponent( counter ); + circuit->SetBufferCount( 3 ); -// REQUIRE( counter->Count() == 0 ); -// circuit->Tick(); -// circuit->Tick(); -// circuit->Tick(); -// circuit->Tick(); + REQUIRE( counter->Count() == 0 ); + circuit->Tick(); + circuit->Tick(); + circuit->Tick(); + circuit->Tick(); -// circuit = nullptr; + circuit = nullptr; -// REQUIRE( counter->Count() == 4 ); -// } + REQUIRE( counter->Count() == 4 ); +} -// TEST_CASE( "AutoTickOnBuffersUpdateRegressionTest" ) -// { -// auto circuit = std::make_shared(); -// auto counter = std::make_shared(); -// circuit->AddComponent( counter ); -// circuit->SetBufferCount( 3 ); - -// REQUIRE( counter->Count() == 0 ); -// circuit->Tick(); -// circuit->Tick(); -// circuit->Tick(); -// circuit->Tick(); +TEST_CASE( "AutoTickOnBuffersUpdateRegressionTest" ) +{ + auto circuit = std::make_shared(); + auto counter = std::make_shared(); + circuit->AddComponent( counter ); + circuit->SetBufferCount( 3 ); -// circuit->SetBufferCount( 2 ); + REQUIRE( counter->Count() == 0 ); + circuit->Tick(); + circuit->Tick(); + circuit->Tick(); + circuit->Tick(); -// REQUIRE( counter->Count() == 4 ); -// } + circuit->SetBufferCount( 2 ); -// TEST_CASE( "AddComponentAfterMultiBufferTickRegressionTest" ) -// { -// auto circuit = std::make_shared(); -// auto counter = std::make_shared(); -// circuit->AddComponent( counter ); -// circuit->SetBufferCount( 2 ); + REQUIRE( counter->Count() == 4 ); +} -// REQUIRE( counter->Count() == 0 ); -// circuit->Tick(); -// circuit->Sync(); +TEST_CASE( "AddComponentAfterMultiBufferTickRegressionTest" ) +{ + auto circuit = std::make_shared(); + auto counter = std::make_shared(); + circuit->AddComponent( counter ); + circuit->SetBufferCount( 2 ); -// REQUIRE( counter->Count() == 1 ); + REQUIRE( counter->Count() == 0 ); + circuit->Tick(); + circuit->Sync(); -// circuit->RemoveComponent( counter ); -// circuit->AddComponent( counter ); + REQUIRE( counter->Count() == 1 ); -// circuit->Tick(); -// circuit->Sync(); + circuit->RemoveComponent( counter ); + circuit->AddComponent( counter ); -// REQUIRE( counter->Count() == 2 ); -// } + circuit->Tick(); + circuit->Sync(); + + REQUIRE( counter->Count() == 2 ); +} TEST_CASE( "TenThousandComponents" ) { From 6e6e1fba3d275aea28e89e1408de451e6bfae166 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Thu, 14 Mar 2024 09:16:55 +0000 Subject: [PATCH 14/17] Merge branch 'master' into std_any-test --- include/dspatch/SignalBus.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/dspatch/SignalBus.h b/include/dspatch/SignalBus.h index dbc10bbf..672d591b 100644 --- a/include/dspatch/SignalBus.h +++ b/include/dspatch/SignalBus.h @@ -28,8 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #pragma once -#include "../fast_any/any.h" - +#include #include namespace DSPatch From 4950de27a63679999eb8fe635b518b908ddef405 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Thu, 28 Mar 2024 15:54:44 +0000 Subject: [PATCH 15/17] Fix build --- include/dspatch/SignalBus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dspatch/SignalBus.h b/include/dspatch/SignalBus.h index 1c5a392a..60aa33f0 100644 --- a/include/dspatch/SignalBus.h +++ b/include/dspatch/SignalBus.h @@ -153,7 +153,7 @@ inline void SignalBus::MoveValue( int signalIndex, ValueType&& newValue ) inline void SignalBus::SetSignal( int toSignalIndex, const std::any& fromSignal ) { - _signals[toSignalIndex].emplace( fromSignal ); + _signals[toSignalIndex] = fromSignal; } inline void SignalBus::MoveSignal( int toSignalIndex, std::any& fromSignal ) From 09527fc45f17a3198513aac2cccf42a01cb81f53 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Sat, 30 Mar 2024 13:54:37 +0000 Subject: [PATCH 16/17] 11.1.3 --- .vscode/tasks.json | 2 +- CHANGES | 5 + docs/Doxyfile | 2 +- docs/html/_circuit_8h_source.html | 51 +- docs/html/_component_8h_source.html | 747 +++++++++--------- docs/html/_d_s_patch_8h_source.html | 2 +- docs/html/_plugin_8h_source.html | 2 +- docs/html/_signal_bus_8h_source.html | 2 +- docs/html/annotated.html | 2 +- .../class_d_s_patch_1_1_circuit-members.html | 2 +- docs/html/class_d_s_patch_1_1_circuit.html | 2 +- ...class_d_s_patch_1_1_component-members.html | 2 +- docs/html/class_d_s_patch_1_1_component.html | 34 +- .../class_d_s_patch_1_1_plugin-members.html | 2 +- docs/html/class_d_s_patch_1_1_plugin.html | 2 +- ...lass_d_s_patch_1_1_signal_bus-members.html | 2 +- docs/html/class_d_s_patch_1_1_signal_bus.html | 2 +- docs/html/classes.html | 2 +- .../dir_96ae4afe4ae1b3c2e5b248f6fc6b60cd.html | 2 +- .../dir_d44c64559bbebec7f509842c48db8b23.html | 2 +- docs/html/files.html | 2 +- docs/html/index.html | 2 +- 22 files changed, 444 insertions(+), 429 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 971ba322..812e49ee 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -34,7 +34,7 @@ "osx": { "command": [ "cp .vscode/_settings.json .vscode/settings.json &&", - "meson setup builddir --buildtype=debug &&", + "meson setup builddir --buildtype=release &&", "meson compile -C builddir" ], "problemMatcher": { diff --git a/CHANGES b/CHANGES index c60ad6e1..8f8274fa 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +v.11.1.3 (30 March 2024) + - Added componentsMap reserve() in Circuit::_Optimize(). + - Slightly optimized Component::ConnectInput(). + - Cleaned up a couple for loops. + v.11.1.2 (28 March 2024) - Updated fast_any submodule (incl. const T& constructor). - Added DisconnectAllComponents() call to Circuit destructor. diff --git a/docs/Doxyfile b/docs/Doxyfile index 9380779f..09c59fe4 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = DSPatch # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v.11.1.2 +PROJECT_NUMBER = v.11.1.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/docs/html/_circuit_8h_source.html b/docs/html/_circuit_8h_source.html index f5219b1f..301d0f79 100644 --- a/docs/html/_circuit_8h_source.html +++ b/docs/html/_circuit_8h_source.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    @@ -849,30 +849,31 @@
    794 if ( _threadCount != 0 )
    795 {
    796 std::vector<std::vector<DSPatch::Component*>> componentsMap;
    -
    797
    -
    798 for ( int i = (int)_components.size() - 1; i >= 0; --i )
    -
    799 {
    -
    800 int scanPosition;
    -
    801 _components[i]->ScanParallel( componentsMap, scanPosition );
    -
    802 }
    -
    803 for ( auto component : _components )
    -
    804 {
    -
    805 component->EndScan();
    -
    806 }
    -
    807
    -
    808 _componentsParallel.clear();
    -
    809 _componentsParallel.reserve( _components.size() );
    -
    810 for ( auto& componentsMapEntry : componentsMap )
    -
    811 {
    -
    812 _componentsParallel.insert( _componentsParallel.end(), componentsMapEntry.begin(), componentsMapEntry.end() );
    -
    813 }
    -
    814 }
    -
    815
    -
    816 // clear _circuitDirty flag
    -
    817 _circuitDirty = false;
    -
    818}
    -
    819
    -
    820} // namespace DSPatch
    +
    797 componentsMap.reserve( _components.size() );
    +
    798
    +
    799 int scanPosition;
    +
    800 for ( int i = (int)_components.size() - 1; i >= 0; --i )
    +
    801 {
    +
    802 _components[i]->ScanParallel( componentsMap, scanPosition );
    +
    803 }
    +
    804 for ( auto component : _components )
    +
    805 {
    +
    806 component->EndScan();
    +
    807 }
    +
    808
    +
    809 _componentsParallel.clear();
    +
    810 _componentsParallel.reserve( _components.size() );
    +
    811 for ( auto& componentsMapEntry : componentsMap )
    +
    812 {
    +
    813 _componentsParallel.insert( _componentsParallel.end(), componentsMapEntry.begin(), componentsMapEntry.end() );
    +
    814 }
    +
    815 }
    +
    816
    +
    817 // clear _circuitDirty flag
    +
    818 _circuitDirty = false;
    +
    819}
    +
    820
    +
    821} // namespace DSPatch
    DSPatch::Circuit
    Workspace for adding and routing components.
    Definition Circuit.h:73
    diff --git a/docs/html/_component_8h_source.html b/docs/html/_component_8h_source.html index c8afde72..f3b394a4 100644 --- a/docs/html/_component_8h_source.html +++ b/docs/html/_component_8h_source.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    @@ -251,7 +251,7 @@
    193
    194inline bool Component::ConnectInput( const Component::SPtr& fromComponent, int fromOutput, int toInput )
    195{
    -
    196 if ( fromOutput >= fromComponent->GetOutputCount() || toInput >= _inputBuses[0].GetSignalCount() )
    +
    196 if ( fromOutput >= fromComponent->GetOutputCount() || toInput >= GetInputCount() )
    197 {
    198 return false;
    199 }
    @@ -264,407 +264,416 @@
    206 if ( it->fromComponent == fromComponent.get() && it->fromOutput == fromOutput )
    207 {
    208 // this wire already exists
    -
    209 return false;
    +
    209 return true;
    210 }
    211
    212 // update source output's reference count
    213 it->fromComponent->_DecRefs( it->fromOutput );
    214
    -
    215 _inputWires.erase( it );
    -
    216 }
    -
    217
    -
    218 _inputWires.emplace_back( Wire{ fromComponent.get(), fromOutput, toInput } );
    -
    219
    -
    220 // update source output's reference count
    -
    221 fromComponent->_IncRefs( fromOutput );
    -
    222
    -
    223 return true;
    -
    224}
    -
    225
    -
    226inline void Component::DisconnectInput( int inputNo )
    -
    227{
    -
    228 // remove wires connected to inputNo from _inputWires
    -
    229 auto findFn = [&inputNo]( const auto& wire ) { return wire.toInput == inputNo; };
    +
    215 // replace wire
    +
    216 it->fromComponent = fromComponent.get();
    +
    217 it->fromOutput = fromOutput;
    +
    218 }
    +
    219 else
    +
    220 {
    +
    221 // add new wire
    +
    222 _inputWires.emplace_back( Wire{ fromComponent.get(), fromOutput, toInput } );
    +
    223 }
    +
    224
    +
    225 // update source output's reference count
    +
    226 fromComponent->_IncRefs( fromOutput );
    +
    227
    +
    228 return true;
    +
    229}
    230
    -
    231 if ( auto it = std::find_if( _inputWires.begin(), _inputWires.end(), findFn ); it != _inputWires.end() )
    -
    232 {
    -
    233 // update source output's reference count
    -
    234 it->fromComponent->_DecRefs( it->fromOutput );
    +
    231inline void Component::DisconnectInput( int inputNo )
    +
    232{
    +
    233 // remove wires connected to inputNo from _inputWires
    +
    234 auto findFn = [&inputNo]( const auto& wire ) { return wire.toInput == inputNo; };
    235
    -
    236 _inputWires.erase( it );
    -
    237 }
    -
    238}
    -
    239
    -
    240inline void Component::DisconnectInput( const Component::SPtr& fromComponent )
    -
    241{
    -
    242 // remove fromComponent from _inputWires
    -
    243 auto findFn = [&fromComponent]( const auto& wire ) { return wire.fromComponent == fromComponent.get(); };
    +
    236 if ( auto it = std::find_if( _inputWires.begin(), _inputWires.end(), findFn ); it != _inputWires.end() )
    +
    237 {
    +
    238 // update source output's reference count
    +
    239 it->fromComponent->_DecRefs( it->fromOutput );
    +
    240
    +
    241 _inputWires.erase( it );
    +
    242 }
    +
    243}
    244
    -
    245 for ( auto it = std::find_if( _inputWires.begin(), _inputWires.end(), findFn ); it != _inputWires.end();
    -
    246 it = std::find_if( it, _inputWires.end(), findFn ) )
    -
    247 {
    -
    248 // update source output's reference count
    -
    249 fromComponent->_DecRefs( it->fromOutput );
    -
    250
    -
    251 it = _inputWires.erase( it );
    -
    252 }
    -
    253}
    -
    254
    -
    255inline void Component::DisconnectAllInputs()
    -
    256{
    -
    257 // remove all wires from _inputWires
    -
    258 for ( const auto& wire : _inputWires )
    -
    259 {
    -
    260 // update source output's reference count
    -
    261 wire.fromComponent->_DecRefs( wire.fromOutput );
    -
    262 }
    -
    263
    -
    264 _inputWires.clear();
    -
    265}
    -
    266
    -
    267inline int Component::GetInputCount() const
    -
    268{
    -
    269 return _inputBuses[0].GetSignalCount();
    +
    245inline void Component::DisconnectInput( const Component::SPtr& fromComponent )
    +
    246{
    +
    247 // remove fromComponent from _inputWires
    +
    248 auto findFn = [&fromComponent]( const auto& wire ) { return wire.fromComponent == fromComponent.get(); };
    +
    249
    +
    250 for ( auto it = std::find_if( _inputWires.begin(), _inputWires.end(), findFn ); it != _inputWires.end();
    +
    251 it = std::find_if( it, _inputWires.end(), findFn ) )
    +
    252 {
    +
    253 // update source output's reference count
    +
    254 fromComponent->_DecRefs( it->fromOutput );
    +
    255
    +
    256 it = _inputWires.erase( it );
    +
    257 }
    +
    258}
    +
    259
    +
    260inline void Component::DisconnectAllInputs()
    +
    261{
    +
    262 // remove all wires from _inputWires
    +
    263 for ( const auto& wire : _inputWires )
    +
    264 {
    +
    265 // update source output's reference count
    +
    266 wire.fromComponent->_DecRefs( wire.fromOutput );
    +
    267 }
    +
    268
    +
    269 _inputWires.clear();
    270}
    271
    -
    272inline int Component::GetOutputCount() const
    +
    272inline int Component::GetInputCount() const
    273{
    -
    274 return _outputBuses[0].GetSignalCount();
    +
    274 return _inputBuses[0].GetSignalCount();
    275}
    276
    -
    277// cppcheck-suppress unusedFunction
    -
    278inline std::string Component::GetInputName( int inputNo ) const
    -
    279{
    -
    280 if ( inputNo < (int)_inputNames.size() )
    -
    281 {
    -
    282 return _inputNames[inputNo];
    -
    283 }
    -
    284 return "";
    -
    285}
    -
    286
    -
    287// cppcheck-suppress unusedFunction
    -
    288inline std::string Component::GetOutputName( int outputNo ) const
    -
    289{
    -
    290 if ( outputNo < (int)_outputNames.size() )
    -
    291 {
    -
    292 return _outputNames[outputNo];
    -
    293 }
    -
    294 return "";
    -
    295}
    -
    296
    -
    297inline void Component::SetBufferCount( int bufferCount, int startBuffer )
    -
    298{
    -
    299 // _bufferCount is the current thread count / bufferCount is new thread count
    -
    300
    -
    301 if ( bufferCount <= 0 )
    -
    302 {
    -
    303 bufferCount = 1; // there needs to be at least 1 buffer
    -
    304 }
    +
    277inline int Component::GetOutputCount() const
    +
    278{
    +
    279 return _outputBuses[0].GetSignalCount();
    +
    280}
    +
    281
    +
    282// cppcheck-suppress unusedFunction
    +
    283inline std::string Component::GetInputName( int inputNo ) const
    +
    284{
    +
    285 if ( inputNo < (int)_inputNames.size() )
    +
    286 {
    +
    287 return _inputNames[inputNo];
    +
    288 }
    +
    289 return "";
    +
    290}
    +
    291
    +
    292// cppcheck-suppress unusedFunction
    +
    293inline std::string Component::GetOutputName( int outputNo ) const
    +
    294{
    +
    295 if ( outputNo < (int)_outputNames.size() )
    +
    296 {
    +
    297 return _outputNames[outputNo];
    +
    298 }
    +
    299 return "";
    +
    300}
    +
    301
    +
    302inline void Component::SetBufferCount( int bufferCount, int startBuffer )
    +
    303{
    +
    304 // _bufferCount is the current thread count / bufferCount is new thread count
    305
    -
    306 if ( startBuffer >= bufferCount )
    +
    306 if ( bufferCount <= 0 )
    307 {
    -
    308 startBuffer = 0;
    +
    308 bufferCount = 1; // there needs to be at least 1 buffer
    309 }
    310
    -
    311 // resize vectors
    -
    312 _inputBuses.resize( bufferCount );
    -
    313 _outputBuses.resize( bufferCount );
    -
    314
    -
    315 _releaseFlags.resize( bufferCount );
    -
    316
    -
    317 _refs.resize( bufferCount );
    -
    318 auto refCount = _refs[0].size();
    +
    311 if ( startBuffer >= bufferCount )
    +
    312 {
    +
    313 startBuffer = 0;
    +
    314 }
    +
    315
    +
    316 // resize vectors
    +
    317 _inputBuses.resize( bufferCount );
    +
    318 _outputBuses.resize( bufferCount );
    319
    -
    320 // init vector values
    -
    321 for ( int i = 0; i < bufferCount; ++i )
    -
    322 {
    -
    323 _inputBuses[i].SetSignalCount( _inputBuses[0].GetSignalCount() );
    -
    324 _outputBuses[i].SetSignalCount( _outputBuses[0].GetSignalCount() );
    -
    325
    -
    326 if ( i == startBuffer )
    -
    327 {
    -
    328 _releaseFlags[i].Set();
    -
    329 }
    -
    330 else
    -
    331 {
    -
    332 _releaseFlags[i].Clear();
    -
    333 }
    -
    334
    -
    335 _refs[i].resize( refCount );
    -
    336 for ( size_t j = 0; j < refCount; ++j )
    -
    337 {
    -
    338 // sync output reference counts
    -
    339 _refs[i][j].total = _refs[0][j].total;
    -
    340 }
    -
    341 }
    +
    320 _releaseFlags.resize( bufferCount );
    +
    321
    +
    322 _refs.resize( bufferCount );
    +
    323
    +
    324 const auto inputCount = GetInputCount();
    +
    325 const auto outputCount = GetOutputCount();
    +
    326 const auto refCount = _refs[0].size();
    +
    327
    +
    328 // init vector values
    +
    329 for ( int i = 0; i < bufferCount; ++i )
    +
    330 {
    +
    331 _inputBuses[i].SetSignalCount( inputCount );
    +
    332 _outputBuses[i].SetSignalCount( outputCount );
    +
    333
    +
    334 if ( i == startBuffer )
    +
    335 {
    +
    336 _releaseFlags[i].Set();
    +
    337 }
    +
    338 else
    +
    339 {
    +
    340 _releaseFlags[i].Clear();
    +
    341 }
    342
    -
    343 _bufferCount = bufferCount;
    -
    344}
    -
    345
    -
    346inline int Component::GetBufferCount() const
    -
    347{
    -
    348 return (int)_inputBuses.size();
    -
    349}
    +
    343 _refs[i].resize( refCount );
    +
    344 for ( size_t j = 0; j < refCount; ++j )
    +
    345 {
    +
    346 // sync output reference counts
    +
    347 _refs[i][j].total = _refs[0][j].total;
    +
    348 }
    +
    349 }
    350
    -
    351inline void Component::TickSeries( int bufferNo )
    -
    352{
    -
    353 auto& inputBus = _inputBuses[bufferNo];
    -
    354 auto& outputBus = _outputBuses[bufferNo];
    -
    355
    -
    356 // clear inputs
    -
    357 inputBus.ClearAllValues();
    +
    351 _bufferCount = bufferCount;
    +
    352}
    +
    353
    +
    354inline int Component::GetBufferCount() const
    +
    355{
    +
    356 return (int)_inputBuses.size();
    +
    357}
    358
    -
    359 for ( const auto& wire : _inputWires )
    -
    360 {
    -
    361 // get new inputs from incoming components
    -
    362 wire.fromComponent->_GetOutput( bufferNo, wire.fromOutput, wire.toInput, inputBus );
    -
    363 }
    -
    364
    -
    365 // clear outputs
    -
    366 outputBus.ClearAllValues();
    -
    367
    -
    368 if ( _bufferCount != 1 && _processOrder == ProcessOrder::InOrder )
    -
    369 {
    -
    370 // wait for our turn to process
    -
    371 _WaitForRelease( bufferNo );
    +
    359inline void Component::TickSeries( int bufferNo )
    +
    360{
    +
    361 auto& inputBus = _inputBuses[bufferNo];
    +
    362 auto& outputBus = _outputBuses[bufferNo];
    +
    363
    +
    364 // clear inputs
    +
    365 inputBus.ClearAllValues();
    +
    366
    +
    367 for ( const auto& wire : _inputWires )
    +
    368 {
    +
    369 // get new inputs from incoming components
    +
    370 wire.fromComponent->_GetOutput( bufferNo, wire.fromOutput, wire.toInput, inputBus );
    +
    371 }
    372
    -
    373 // call Process_() with newly aquired inputs
    -
    374 Process_( inputBus, outputBus );
    +
    373 // clear outputs
    +
    374 outputBus.ClearAllValues();
    375
    -
    376 // signal that we're done processing
    -
    377 _ReleaseNextThread( bufferNo );
    -
    378 }
    -
    379 else
    -
    380 {
    +
    376 if ( _bufferCount != 1 && _processOrder == ProcessOrder::InOrder )
    +
    377 {
    +
    378 // wait for our turn to process
    +
    379 _WaitForRelease( bufferNo );
    +
    380
    381 // call Process_() with newly aquired inputs
    382 Process_( inputBus, outputBus );
    -
    383 }
    -
    384}
    -
    385
    -
    386inline void Component::TickParallel( int bufferNo )
    -
    387{
    -
    388 auto& inputBus = _inputBuses[bufferNo];
    -
    389 auto& outputBus = _outputBuses[bufferNo];
    -
    390
    -
    391 // clear inputs and outputs
    -
    392 inputBus.ClearAllValues();
    -
    393 outputBus.ClearAllValues();
    -
    394
    -
    395 for ( const auto& wire : _inputWires )
    -
    396 {
    -
    397 // get new inputs from incoming components
    -
    398 wire.fromComponent->_GetOutputParallel( bufferNo, wire.fromOutput, wire.toInput, inputBus );
    -
    399 }
    -
    400
    -
    401 if ( _bufferCount != 1 && _processOrder == ProcessOrder::InOrder )
    -
    402 {
    -
    403 // wait for our turn to process
    -
    404 _WaitForRelease( bufferNo );
    -
    405
    -
    406 // call Process_() with newly aquired inputs
    -
    407 Process_( inputBus, outputBus );
    +
    383
    +
    384 // signal that we're done processing
    +
    385 _ReleaseNextThread( bufferNo );
    +
    386 }
    +
    387 else
    +
    388 {
    +
    389 // call Process_() with newly aquired inputs
    +
    390 Process_( inputBus, outputBus );
    +
    391 }
    +
    392}
    +
    393
    +
    394inline void Component::TickParallel( int bufferNo )
    +
    395{
    +
    396 auto& inputBus = _inputBuses[bufferNo];
    +
    397 auto& outputBus = _outputBuses[bufferNo];
    +
    398
    +
    399 // clear inputs and outputs
    +
    400 inputBus.ClearAllValues();
    +
    401 outputBus.ClearAllValues();
    +
    402
    +
    403 for ( const auto& wire : _inputWires )
    +
    404 {
    +
    405 // get new inputs from incoming components
    +
    406 wire.fromComponent->_GetOutputParallel( bufferNo, wire.fromOutput, wire.toInput, inputBus );
    +
    407 }
    408
    -
    409 // signal that we're done processing
    -
    410 _ReleaseNextThread( bufferNo );
    -
    411 }
    -
    412 else
    -
    413 {
    +
    409 if ( _bufferCount != 1 && _processOrder == ProcessOrder::InOrder )
    +
    410 {
    +
    411 // wait for our turn to process
    +
    412 _WaitForRelease( bufferNo );
    +
    413
    414 // call Process_() with newly aquired inputs
    415 Process_( inputBus, outputBus );
    -
    416 }
    -
    417
    -
    418 // signal that our outputs are ready
    -
    419 for ( auto& ref : _refs[bufferNo] )
    -
    420 {
    -
    421 // readyFlags are cleared in _GetOutputParallel() which ofc is only called on outputs with refs
    -
    422 if ( ref.total != 0 )
    -
    423 {
    -
    424 ref.readyFlag.Set();
    -
    425 }
    -
    426 }
    -
    427}
    -
    428
    -
    429inline void Component::ScanSeries( std::vector<Component*>& components )
    -
    430{
    -
    431 // continue only if this component has not already been scanned
    -
    432 if ( _scanPosition != -1 )
    -
    433 {
    -
    434 return;
    -
    435 }
    +
    416
    +
    417 // signal that we're done processing
    +
    418 _ReleaseNextThread( bufferNo );
    +
    419 }
    +
    420 else
    +
    421 {
    +
    422 // call Process_() with newly aquired inputs
    +
    423 Process_( inputBus, outputBus );
    +
    424 }
    +
    425
    +
    426 // signal that our outputs are ready
    +
    427 for ( auto& ref : _refs[bufferNo] )
    +
    428 {
    +
    429 // readyFlags are cleared in _GetOutputParallel() which ofc is only called on outputs with refs
    +
    430 if ( ref.total != 0 )
    +
    431 {
    +
    432 ref.readyFlag.Set();
    +
    433 }
    +
    434 }
    +
    435}
    436
    -
    437 // initialize _scanPosition
    -
    438 _scanPosition = 0;
    -
    439
    -
    440 for ( const auto& wire : _inputWires )
    +
    437inline void Component::ScanSeries( std::vector<Component*>& components )
    +
    438{
    +
    439 // continue only if this component has not already been scanned
    +
    440 if ( _scanPosition != -1 )
    441 {
    -
    442 // scan incoming components
    -
    443 wire.fromComponent->ScanSeries( components );
    -
    444 }
    -
    445
    -
    446 components.emplace_back( this );
    -
    447}
    -
    448
    -
    449inline void Component::ScanParallel( std::vector<std::vector<DSPatch::Component*>>& componentsMap, int& scanPosition )
    -
    450{
    -
    451 // continue only if this component has not already been scanned
    -
    452 if ( _scanPosition != -1 )
    -
    453 {
    -
    454 scanPosition = _scanPosition;
    -
    455 return;
    -
    456 }
    -
    457
    -
    458 // initialize scanPositions
    -
    459 _scanPosition = 0;
    -
    460 scanPosition = 0;
    -
    461
    -
    462 for ( const auto& wire : _inputWires )
    -
    463 {
    -
    464 // scan incoming components
    -
    465 wire.fromComponent->ScanParallel( componentsMap, scanPosition );
    -
    466
    -
    467 // ensure we're using the furthest scanPosition detected
    -
    468 _scanPosition = std::max( _scanPosition, ++scanPosition );
    -
    469 }
    -
    470
    -
    471 // insert component at _scanPosition
    -
    472 if ( _scanPosition >= (int)componentsMap.size() )
    -
    473 {
    -
    474 componentsMap.resize( _scanPosition + 1 );
    -
    475 }
    -
    476 componentsMap[_scanPosition].emplace_back( this );
    -
    477}
    +
    442 return;
    +
    443 }
    +
    444
    +
    445 // initialize _scanPosition
    +
    446 _scanPosition = 0;
    +
    447
    +
    448 for ( const auto& wire : _inputWires )
    +
    449 {
    +
    450 // scan incoming components
    +
    451 wire.fromComponent->ScanSeries( components );
    +
    452 }
    +
    453
    +
    454 components.emplace_back( this );
    +
    455}
    +
    456
    +
    457inline void Component::ScanParallel( std::vector<std::vector<DSPatch::Component*>>& componentsMap, int& scanPosition )
    +
    458{
    +
    459 // continue only if this component has not already been scanned
    +
    460 if ( _scanPosition != -1 )
    +
    461 {
    +
    462 scanPosition = _scanPosition;
    +
    463 return;
    +
    464 }
    +
    465
    +
    466 // initialize scanPositions
    +
    467 _scanPosition = 0;
    +
    468 scanPosition = 0;
    +
    469
    +
    470 for ( const auto& wire : _inputWires )
    +
    471 {
    +
    472 // scan incoming components
    +
    473 wire.fromComponent->ScanParallel( componentsMap, scanPosition );
    +
    474
    +
    475 // ensure we're using the furthest scanPosition detected
    +
    476 _scanPosition = std::max( _scanPosition, ++scanPosition );
    +
    477 }
    478
    -
    479inline void Component::EndScan()
    -
    480{
    -
    481 // reset _scanPosition
    -
    482 _scanPosition = -1;
    -
    483}
    -
    484
    -
    485inline void Component::SetInputCount_( int inputCount, const std::vector<std::string>& inputNames )
    -
    486{
    -
    487 _inputNames = inputNames;
    -
    488
    -
    489 for ( auto& inputBus : _inputBuses )
    -
    490 {
    -
    491 inputBus.SetSignalCount( inputCount );
    -
    492 }
    +
    479 // insert component at _scanPosition
    +
    480 if ( _scanPosition == (int)componentsMap.size() )
    +
    481 {
    +
    482 componentsMap.emplace_back( std::vector<DSPatch::Component*>{} );
    +
    483 componentsMap[_scanPosition].reserve( componentsMap.capacity() );
    +
    484 }
    +
    485 componentsMap[_scanPosition].emplace_back( this );
    +
    486}
    +
    487
    +
    488inline void Component::EndScan()
    +
    489{
    +
    490 // reset _scanPosition
    +
    491 _scanPosition = -1;
    +
    492}
    493
    -
    494 _inputWires.reserve( inputCount );
    -
    495}
    -
    496
    -
    497inline void Component::SetOutputCount_( int outputCount, const std::vector<std::string>& outputNames )
    -
    498{
    -
    499 _outputNames = outputNames;
    -
    500
    -
    501 for ( auto& outputBus : _outputBuses )
    -
    502 {
    -
    503 outputBus.SetSignalCount( outputCount );
    -
    504 }
    +
    494inline void Component::SetInputCount_( int inputCount, const std::vector<std::string>& inputNames )
    +
    495{
    +
    496 _inputNames = inputNames;
    +
    497
    +
    498 for ( auto& inputBus : _inputBuses )
    +
    499 {
    +
    500 inputBus.SetSignalCount( inputCount );
    +
    501 }
    +
    502
    +
    503 _inputWires.reserve( inputCount );
    +
    504}
    505
    -
    506 // add reference counters for our new outputs
    -
    507 for ( auto& ref : _refs )
    -
    508 {
    -
    509 ref.resize( outputCount );
    -
    510 }
    -
    511}
    -
    512
    -
    513inline void Component::_WaitForRelease( int threadNo )
    -
    514{
    -
    515 _releaseFlags[threadNo].WaitAndClear();
    -
    516}
    -
    517
    -
    518inline void Component::_ReleaseNextThread( int threadNo )
    -
    519{
    -
    520 if ( ++threadNo == _bufferCount ) // we're actually releasing the next available thread
    -
    521 {
    -
    522 _releaseFlags[0].Set();
    -
    523 }
    -
    524 else
    -
    525 {
    -
    526 _releaseFlags[threadNo].Set();
    -
    527 }
    -
    528}
    -
    529
    -
    530inline void Component::_GetOutput( int bufferNo, int fromOutput, int toInput, DSPatch::SignalBus& toBus )
    -
    531{
    -
    532 auto& signal = *_outputBuses[bufferNo].GetSignal( fromOutput );
    -
    533
    -
    534 if ( !signal.has_value() )
    -
    535 {
    -
    536 return;
    -
    537 }
    +
    506inline void Component::SetOutputCount_( int outputCount, const std::vector<std::string>& outputNames )
    +
    507{
    +
    508 _outputNames = outputNames;
    +
    509
    +
    510 for ( auto& outputBus : _outputBuses )
    +
    511 {
    +
    512 outputBus.SetSignalCount( outputCount );
    +
    513 }
    +
    514
    +
    515 // add reference counters for our new outputs
    +
    516 for ( auto& ref : _refs )
    +
    517 {
    +
    518 ref.resize( outputCount );
    +
    519 }
    +
    520}
    +
    521
    +
    522inline void Component::_WaitForRelease( int threadNo )
    +
    523{
    +
    524 _releaseFlags[threadNo].WaitAndClear();
    +
    525}
    +
    526
    +
    527inline void Component::_ReleaseNextThread( int threadNo )
    +
    528{
    +
    529 if ( ++threadNo == _bufferCount ) // we're actually releasing the next available thread
    +
    530 {
    +
    531 _releaseFlags[0].Set();
    +
    532 }
    +
    533 else
    +
    534 {
    +
    535 _releaseFlags[threadNo].Set();
    +
    536 }
    +
    537}
    538
    -
    539 auto& ref = _refs[bufferNo][fromOutput];
    -
    540
    -
    541 if ( ref.total == 1 )
    -
    542 {
    -
    543 // there's only one reference, move the signal immediately
    -
    544 toBus.MoveSignal( toInput, signal );
    -
    545 }
    -
    546 else if ( ++ref.count != ref.total )
    -
    547 {
    -
    548 // this is not the final reference, copy the signal
    -
    549 toBus.SetSignal( toInput, signal );
    -
    550 }
    -
    551 else
    -
    552 {
    -
    553 // this is the final reference, reset the counter, move the signal
    -
    554 ref.count = 0;
    -
    555 toBus.MoveSignal( toInput, signal );
    -
    556 }
    -
    557}
    -
    558
    -
    559inline void Component::_GetOutputParallel( int bufferNo, int fromOutput, int toInput, DSPatch::SignalBus& toBus )
    -
    560{
    -
    561 auto& signal = *_outputBuses[bufferNo].GetSignal( fromOutput );
    -
    562 auto& ref = _refs[bufferNo][fromOutput];
    -
    563
    -
    564 // wait for this output to be ready
    -
    565 ref.readyFlag.WaitAndClear();
    -
    566
    -
    567 if ( !signal.has_value() )
    -
    568 {
    -
    569 return;
    -
    570 }
    -
    571
    -
    572 if ( ref.total == 1 )
    -
    573 {
    -
    574 // there's only one reference, move the signal immediately and return
    -
    575 toBus.MoveSignal( toInput, signal );
    -
    576 }
    -
    577 else if ( ++ref.count != ref.total )
    -
    578 {
    -
    579 // this is not the final reference, copy the signal
    -
    580 toBus.SetSignal( toInput, signal );
    -
    581
    -
    582 // wake next WaitAndClear()
    -
    583 ref.readyFlag.Set();
    -
    584 }
    -
    585 else
    -
    586 {
    -
    587 // this is the final reference, reset the counter, move the signal
    -
    588 ref.count = 0;
    -
    589 toBus.MoveSignal( toInput, signal );
    -
    590 }
    -
    591}
    -
    592
    -
    593inline void Component::_IncRefs( int output )
    -
    594{
    -
    595 for ( auto& ref : _refs )
    -
    596 {
    -
    597 ++ref[output].total;
    -
    598 }
    -
    599}
    -
    600
    -
    601inline void Component::_DecRefs( int output )
    -
    602{
    -
    603 for ( auto& ref : _refs )
    -
    604 {
    -
    605 --ref[output].total;
    -
    606 }
    -
    607}
    -
    608
    -
    609} // namespace DSPatch
    +
    539inline void Component::_GetOutput( int bufferNo, int fromOutput, int toInput, DSPatch::SignalBus& toBus )
    +
    540{
    +
    541 auto& signal = *_outputBuses[bufferNo].GetSignal( fromOutput );
    +
    542
    +
    543 if ( !signal.has_value() )
    +
    544 {
    +
    545 return;
    +
    546 }
    +
    547
    +
    548 auto& ref = _refs[bufferNo][fromOutput];
    +
    549
    +
    550 if ( ref.total == 1 )
    +
    551 {
    +
    552 // there's only one reference, move the signal immediately
    +
    553 toBus.MoveSignal( toInput, signal );
    +
    554 }
    +
    555 else if ( ++ref.count != ref.total )
    +
    556 {
    +
    557 // this is not the final reference, copy the signal
    +
    558 toBus.SetSignal( toInput, signal );
    +
    559 }
    +
    560 else
    +
    561 {
    +
    562 // this is the final reference, reset the counter, move the signal
    +
    563 ref.count = 0;
    +
    564 toBus.MoveSignal( toInput, signal );
    +
    565 }
    +
    566}
    +
    567
    +
    568inline void Component::_GetOutputParallel( int bufferNo, int fromOutput, int toInput, DSPatch::SignalBus& toBus )
    +
    569{
    +
    570 auto& signal = *_outputBuses[bufferNo].GetSignal( fromOutput );
    +
    571 auto& ref = _refs[bufferNo][fromOutput];
    +
    572
    +
    573 // wait for this output to be ready
    +
    574 ref.readyFlag.WaitAndClear();
    +
    575
    +
    576 if ( !signal.has_value() )
    +
    577 {
    +
    578 return;
    +
    579 }
    +
    580
    +
    581 if ( ref.total == 1 )
    +
    582 {
    +
    583 // there's only one reference, move the signal immediately and return
    +
    584 toBus.MoveSignal( toInput, signal );
    +
    585 }
    +
    586 else if ( ++ref.count != ref.total )
    +
    587 {
    +
    588 // this is not the final reference, copy the signal
    +
    589 toBus.SetSignal( toInput, signal );
    +
    590
    +
    591 // wake next WaitAndClear()
    +
    592 ref.readyFlag.Set();
    +
    593 }
    +
    594 else
    +
    595 {
    +
    596 // this is the final reference, reset the counter, move the signal
    +
    597 ref.count = 0;
    +
    598 toBus.MoveSignal( toInput, signal );
    +
    599 }
    +
    600}
    +
    601
    +
    602inline void Component::_IncRefs( int output )
    +
    603{
    +
    604 for ( auto& ref : _refs )
    +
    605 {
    +
    606 ++ref[output].total;
    +
    607 }
    +
    608}
    +
    609
    +
    610inline void Component::_DecRefs( int output )
    +
    611{
    +
    612 for ( auto& ref : _refs )
    +
    613 {
    +
    614 --ref[output].total;
    +
    615 }
    +
    616}
    +
    617
    +
    618} // namespace DSPatch
    DSPatch::Component
    Abstract base class for DSPatch components.
    Definition Component.h:65
    DSPatch::SignalBus
    Signal container.
    Definition SignalBus.h:53
    diff --git a/docs/html/_d_s_patch_8h_source.html b/docs/html/_d_s_patch_8h_source.html index 9b59c44b..3a3b8091 100644 --- a/docs/html/_d_s_patch_8h_source.html +++ b/docs/html/_d_s_patch_8h_source.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/_plugin_8h_source.html b/docs/html/_plugin_8h_source.html index ebae23e0..acf75e42 100644 --- a/docs/html/_plugin_8h_source.html +++ b/docs/html/_plugin_8h_source.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/_signal_bus_8h_source.html b/docs/html/_signal_bus_8h_source.html index ac053801..344ed75c 100644 --- a/docs/html/_signal_bus_8h_source.html +++ b/docs/html/_signal_bus_8h_source.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/annotated.html b/docs/html/annotated.html index 65c65a07..147d98ee 100644 --- a/docs/html/annotated.html +++ b/docs/html/annotated.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/class_d_s_patch_1_1_circuit-members.html b/docs/html/class_d_s_patch_1_1_circuit-members.html index 6c677c64..7625caa7 100644 --- a/docs/html/class_d_s_patch_1_1_circuit-members.html +++ b/docs/html/class_d_s_patch_1_1_circuit-members.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/class_d_s_patch_1_1_circuit.html b/docs/html/class_d_s_patch_1_1_circuit.html index 6bee66b2..b3c77b7e 100644 --- a/docs/html/class_d_s_patch_1_1_circuit.html +++ b/docs/html/class_d_s_patch_1_1_circuit.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/class_d_s_patch_1_1_component-members.html b/docs/html/class_d_s_patch_1_1_component-members.html index c876f17c..35b87969 100644 --- a/docs/html/class_d_s_patch_1_1_component-members.html +++ b/docs/html/class_d_s_patch_1_1_component-members.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/class_d_s_patch_1_1_component.html b/docs/html/class_d_s_patch_1_1_component.html index 6f400484..6d686b38 100644 --- a/docs/html/class_d_s_patch_1_1_component.html +++ b/docs/html/class_d_s_patch_1_1_component.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    @@ -297,7 +297,7 @@

    -

    Definition at line 255 of file Component.h.

    +

    Definition at line 260 of file Component.h.

    @@ -325,7 +325,7 @@

    -

    Definition at line 240 of file Component.h.

    +

    Definition at line 245 of file Component.h.

    @@ -353,7 +353,7 @@

    -

    Definition at line 226 of file Component.h.

    +

    Definition at line 231 of file Component.h.

    @@ -380,7 +380,7 @@

    -

    Definition at line 479 of file Component.h.

    +

    Definition at line 488 of file Component.h.

    @@ -407,7 +407,7 @@

    -

    Definition at line 346 of file Component.h.

    +

    Definition at line 354 of file Component.h.

    @@ -434,7 +434,7 @@

    -

    Definition at line 267 of file Component.h.

    +

    Definition at line 272 of file Component.h.

    @@ -462,7 +462,7 @@

    -

    Definition at line 278 of file Component.h.

    +

    Definition at line 283 of file Component.h.

    @@ -489,7 +489,7 @@

    -

    Definition at line 272 of file Component.h.

    +

    Definition at line 277 of file Component.h.

    @@ -517,7 +517,7 @@

    -

    Definition at line 288 of file Component.h.

    +

    Definition at line 293 of file Component.h.

    @@ -555,7 +555,7 @@

    -

    Definition at line 449 of file Component.h.

    +

    Definition at line 457 of file Component.h.

    @@ -583,7 +583,7 @@

    -

    Definition at line 429 of file Component.h.

    +

    Definition at line 437 of file Component.h.

    @@ -621,7 +621,7 @@

    -

    Definition at line 297 of file Component.h.

    +

    Definition at line 302 of file Component.h.

    @@ -659,7 +659,7 @@

    -

    Definition at line 485 of file Component.h.

    +

    Definition at line 494 of file Component.h.

    @@ -697,7 +697,7 @@

    -

    Definition at line 497 of file Component.h.

    +

    Definition at line 506 of file Component.h.

    @@ -725,7 +725,7 @@

    -

    Definition at line 386 of file Component.h.

    +

    Definition at line 394 of file Component.h.

    @@ -753,7 +753,7 @@

    -

    Definition at line 351 of file Component.h.

    +

    Definition at line 359 of file Component.h.

    diff --git a/docs/html/class_d_s_patch_1_1_plugin-members.html b/docs/html/class_d_s_patch_1_1_plugin-members.html index 7ed60d08..93de3e66 100644 --- a/docs/html/class_d_s_patch_1_1_plugin-members.html +++ b/docs/html/class_d_s_patch_1_1_plugin-members.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/class_d_s_patch_1_1_plugin.html b/docs/html/class_d_s_patch_1_1_plugin.html index 721a07e9..26554272 100644 --- a/docs/html/class_d_s_patch_1_1_plugin.html +++ b/docs/html/class_d_s_patch_1_1_plugin.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/class_d_s_patch_1_1_signal_bus-members.html b/docs/html/class_d_s_patch_1_1_signal_bus-members.html index 03a50250..2b03e9fd 100644 --- a/docs/html/class_d_s_patch_1_1_signal_bus-members.html +++ b/docs/html/class_d_s_patch_1_1_signal_bus-members.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/class_d_s_patch_1_1_signal_bus.html b/docs/html/class_d_s_patch_1_1_signal_bus.html index e07d91c6..21f5c02e 100644 --- a/docs/html/class_d_s_patch_1_1_signal_bus.html +++ b/docs/html/class_d_s_patch_1_1_signal_bus.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/classes.html b/docs/html/classes.html index 1306eace..a6cf3073 100644 --- a/docs/html/classes.html +++ b/docs/html/classes.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/dir_96ae4afe4ae1b3c2e5b248f6fc6b60cd.html b/docs/html/dir_96ae4afe4ae1b3c2e5b248f6fc6b60cd.html index ef269298..9116d05b 100644 --- a/docs/html/dir_96ae4afe4ae1b3c2e5b248f6fc6b60cd.html +++ b/docs/html/dir_96ae4afe4ae1b3c2e5b248f6fc6b60cd.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html b/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html index 626cd1d7..817ca901 100644 --- a/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html +++ b/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/files.html b/docs/html/files.html index 396907da..c570474d 100644 --- a/docs/html/files.html +++ b/docs/html/files.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    diff --git a/docs/html/index.html b/docs/html/index.html index f4f2e3f2..cdfd1665 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -22,7 +22,7 @@ Logo -
    DSPatch v.11.1.2 +
    DSPatch v.11.1.3
    From f3be19fb858952bfaf69d99b313fd009ceb062c1 Mon Sep 17 00:00:00 2001 From: Marcus Tomlinson Date: Sat, 30 Mar 2024 13:58:17 +0000 Subject: [PATCH 17/17] Revert tasks.json --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 812e49ee..971ba322 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -34,7 +34,7 @@ "osx": { "command": [ "cp .vscode/_settings.json .vscode/settings.json &&", - "meson setup builddir --buildtype=release &&", + "meson setup builddir --buildtype=debug &&", "meson compile -C builddir" ], "problemMatcher": {