[core] Fix some tests and refactor files

ossia · Jun 24, 2024 · e1d0c9e · e1d0c9e
1 parent c8b9fcb
commit e1d0c9e
Show file tree

Hide file tree

Showing 20 changed files with 546 additions and 494 deletions.
diff --git a/src/ossia/dataflow/audio_lock.hpp b/src/ossia/dataflow/audio_lock.hpp
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <ossia/detail/config.hpp>
+
+#include <ossia/detail/audio_spin_mutex.hpp>
+#include <ossia/detail/mutex.hpp>
+
+#include <mutex>
+
+#if defined(OSSIA_PARALLEL)
+using ossia_audio_lock_t = std::unique_lock<ossia::audio_spin_mutex>;
+#define OSSIA_EXEC_STATE_LOCK_READ(state) \
+  ossia_audio_lock_t ossia_read_lock      \
+  {                                       \
+    (state).mutex                         \
+  }
+#define OSSIA_EXEC_STATE_LOCK_WRITE(state) \
+  ossia_audio_lock_t ossia_write_lock      \
+  {                                        \
+    (state).mutex                          \
+  }
+#else
+struct ossia_audio_lock_t
+{
+  void lock() { }
+  void unlock() { }
+};
+#define OSSIA_EXEC_STATE_LOCK_READ(state) \
+  ossia_audio_lock_t ossia_read_lock;     \
+  (void)ossia_read_lock;
+#define OSSIA_EXEC_STATE_LOCK_WRITE(state) \
+  ossia_audio_lock_t ossia_write_lock;     \
+  (void)ossia_write_lock;
+#endif
diff --git a/src/ossia/dataflow/execution/default_policy.cpp b/src/ossia/dataflow/execution/default_policy.cpp
@@ -1,5 +1,6 @@
 #include "default_policy.hpp"
 
+#include <ossia/dataflow/execution/to_state_element.hpp>
 #include <ossia/editor/state/detail/state_flatten_visitor.hpp>
 
 namespace ossia

diff --git a/src/ossia/dataflow/execution/default_policy.hpp b/src/ossia/dataflow/execution/default_policy.hpp
@@ -1,5 +1,6 @@
 #pragma once
-#include <ossia/dataflow/execution/execution_policy.hpp>
+#include <ossia/dataflow/execution/local_state_execution_policy.hpp>
+#include <ossia/editor/state/flat_vec_state.hpp>
 
 namespace ossia
 {

diff --git a/src/ossia/dataflow/execution/direct_policy.cpp b/src/ossia/dataflow/execution/direct_policy.cpp
@@ -1,13 +1,13 @@
-#undef NDEBUG
 #include "direct_policy.hpp"
 
+#include <ossia/audio/audio_parameter.hpp>
+#include <ossia/dataflow/audio_port.hpp>
+#include <ossia/dataflow/midi_port.hpp>
 #include <ossia/dataflow/value_port.hpp>
 #include <ossia/detail/thread.hpp>
 #include <ossia/protocols/midi/midi_parameter.hpp>
 #include <ossia/protocols/midi/midi_protocol.hpp>
 
-#include <charconv>
-
 namespace ossia
 {
 static thread_local std::vector<ossia::bundle_element> g_direct_policy_message_cache

diff --git a/src/ossia/dataflow/execution/direct_policy.hpp b/src/ossia/dataflow/execution/direct_policy.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include <ossia/dataflow/execution/execution_policy.hpp>
+#include <ossia/detail/lockfree_queue.hpp>
 #include <ossia/network/base/bundle.hpp>
 
 #include <blockingconcurrentqueue.h>