Make Concurrency.h part of optional functionality

pschatzmann · Jul 16, 2024 · 7dc827d · 7dc827d
1 parent edd6594
commit 7dc827d
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 25 deletions.
diff --git a/src/AudioHttp/URLStreamBuffered.h b/src/AudioHttp/URLStreamBuffered.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "AudioConfig.h"
 #if defined(USE_CONCURRENCY) && defined(USE_URL_ARDUINO)
-#include "Concurrency/Concurrency.h"
+#include "AudioLibs/Concurrency.h"
 #include "AudioHttp/URLStream.h"
 #include "AudioTools/AudioStreams.h"
 

diff --git a/src/AudioLibs/Concurrency.h b/src/AudioLibs/Concurrency.h
@@ -0,0 +1,11 @@
+#pragma once
+/**
+ * @defgroup concurrency Concurrency
+ * @ingroup main
+ * @brief Multicore support
+ */
+#include "Concurrency/QueueRTOS.h"
+#include "Concurrency/BufferRTOS.h"
+#include "Concurrency/SynchronizedBuffers.h"
+#include "Concurrency/Task.h"
+#include "Concurrency/LockGuard.h"
diff --git a/src/AudioTools.h b/src/AudioTools.h
@@ -64,7 +64,9 @@
 
 
 #include "AudioConfig.h"
-#include "Concurrency/Concurrency.h"
+#ifdef USE_CONCURRENCY
+#include "AudioLibs/Concurrency.h"
+#endif
 #include "AudioTimer/AudioTimer.h"
 #include "AudioTools/AudioTypes.h"
 #include "AudioTools/Buffers.h"

diff --git a/src/Concurrency/BufferRTOS.h b/src/Concurrency/BufferRTOS.h
@@ -4,7 +4,6 @@
 #include "AudioTools/AudioLogger.h"
 #include "AudioBasic/Collections/Allocator.h"
 
-#if defined(USE_CONCURRENCY)
 #ifdef ESP32
 #  include <freertos/stream_buffer.h>
 #  include "freertos/FreeRTOS.h"
@@ -200,4 +199,3 @@ using SynchronizedBufferRTOS = BufferRTOS<T>;
 
 }  // namespace audio_tools
 
-#endif
diff --git a/src/Concurrency/Concurrency.h b/src/Concurrency/Concurrency.h
diff --git a/src/Concurrency/LockGuard.h b/src/Concurrency/LockGuard.h
@@ -6,7 +6,6 @@
 #  include <mutex>
 #endif
 
-#if defined(USE_CONCURRENCY)
 #ifdef ESP32
 #  include "freertos/FreeRTOS.h"
 #  include "freertos/semphr.h"
@@ -112,4 +111,3 @@ class LockGuard {
 
 }
 
-#endif
diff --git a/src/Concurrency/QueueRTOS.h b/src/Concurrency/QueueRTOS.h
@@ -2,7 +2,6 @@
 #include "AudioBasic/Collections/Allocator.h"
 #include "AudioConfig.h"
 
-#if defined(USE_CONCURRENCY)
 #ifdef ESP32
 #  include <freertos/queue.h>
 #  include "freertos/FreeRTOS.h"
@@ -97,9 +96,13 @@ class QueueRTOS {
 
   bool setup() {
     if (queue_size > 0) {
+#if configSUPPORT_STATIC_ALLOCATION
       p_data = (uint8_t*)p_allocator->allocate((queue_size + 1) * sizeof(T));
       if (p_data == nullptr) return false;
       xQueue = xQueueCreateStatic(queue_size, sizeof(T), p_data, &queue_buffer);
+#else
+      xQueue = xQueueCreate(queue_size, sizeof(T));
+#endif
       if (xQueue == nullptr) return false;
     }
     return true;
@@ -113,4 +116,3 @@ class QueueRTOS {
 
 }  // namespace audio_tools
 
-#endif
diff --git a/src/Concurrency/SynchronizedBuffers.h b/src/Concurrency/SynchronizedBuffers.h
@@ -5,7 +5,6 @@
 #include "AudioTools/Buffers.h"
 #include "AudioTools/AudioLogger.h"
 
-#if defined(USE_CONCURRENCY)
 #ifdef ESP32
 #  include "freertos/FreeRTOS.h"
 #  include "Concurrency/QueueRTOS.h"
@@ -202,5 +201,3 @@ class SynchronizedNBuffer : public NBuffer<T> {
 
 } // namespace audio_tools
 
-
-#endif
diff --git a/src/Concurrency/Task.h b/src/Concurrency/Task.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#if defined(USE_CONCURRENCY)
 #ifdef ESP32
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -103,4 +102,3 @@ class Task {
 
 }  // namespace audio_tools
 
-#endif