Cleanup

AudioKit · Aug 8, 2023 · f1c76db · f1c76db
1 parent 2cd27a7
commit f1c76db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Sources/CAudio/AudioProgram.h b/Sources/CAudio/AudioProgram.h
@@ -41,8 +41,8 @@ class AudioProgram {
              AUAudioFrameCount frameCount,
              AudioBufferList* outputBufferList,
              int workerIndex,
-             std::vector<WorkStealingQueue<int>>& runQueues) {
-        
+             std::vector<std::shared_ptr<WorkStealingQueue<int>>>& runQueues) {
+
         auto exec = [&](int index) {
             auto& job = jobs[index];
 
@@ -52,7 +52,7 @@ class AudioProgram {
             // Increment outputs.
             for (int outputIndex : job->outputIndices) {
                 if (finished[outputIndex].fetch_add(1, std::memory_order_relaxed) == jobs[outputIndex]->inputCount()) {
-                    runQueues[workerIndex].push(outputIndex);
+                    runQueues[workerIndex]->push(outputIndex);
                 }
             }
 
@@ -61,14 +61,14 @@ class AudioProgram {
 
         while (remaining.load(std::memory_order_relaxed) > 0) {
             // Pop an index off our queue.
-            if (auto index = runQueues[workerIndex].pop()) {
+            if (auto index = runQueues[workerIndex]->pop()) {
                 exec(*index);
             } else {
                 // Try to steal an index. Start with the next worker and wrap around,
                 // but don't steal from ourselves.
                 for (int i = 0; i < runQueues.size() - 1; ++i) {
                     int victim = (workerIndex + i) % runQueues.size();
-                    if (auto index = runQueues[victim].steal()) {
+                    if (auto index = runQueues[victim]->steal()) {
                         exec(*index);
                         break;
                     }

diff --git a/Sources/CAudio/WorkerThread.h b/Sources/CAudio/WorkerThread.h
@@ -36,7 +36,7 @@ class WorkerThread {
     AUAudioFrameCount frameCount = 0;
 
     /// Our main output buffer.
-    vector<AudioBufferList> outputBufferList;
+    AudioBufferList* _Nonnull outputBufferList;
 
     /// Queue for submitting jobs to the worker.
     vector<RenderJobIndex> initialJobs;
@@ -128,9 +128,9 @@ class WorkerThread {
                 program->run(&actionFlags,
                              &timeStamp,
                              frameCount,
-                             &outputBufferList,
+                             outputBufferList,
                              workerIndex,
-                             &runQueues);
+                             runQueues);
             } else {
                 printf("worker has no program!");
             }