rpcsx-gpu: scheduler: fix race

RPCSX · Sep 1, 2024 · e0729f1 · e0729f1
1 parent 700e75c
commit e0729f1
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/hw/amdgpu/device/include/amdgpu/device/gpu-scheduler.hpp b/hw/amdgpu/device/include/amdgpu/device/gpu-scheduler.hpp
@@ -5,6 +5,7 @@
 #include <atomic>
 #include <concepts>
 #include <cstdint>
+#include <deque>
 #include <list>
 #include <source_location>
 #include <thread>
@@ -203,8 +204,8 @@ struct TaskChain {
 
 class GpuScheduler {
   std::list<std::thread> workThreads;
-  std::vector<GpuTaskLayout> tasks;
-  std::vector<GpuTaskLayout> delayedTasks;
+  std::deque<GpuTaskLayout> tasks;
+  std::deque<GpuTaskLayout> delayedTasks;
   std::mutex taskMtx;
   std::condition_variable taskCv;
   std::atomic<bool> exit{false};
@@ -339,14 +340,14 @@ class GpuScheduler {
           }
         }
 
-        task = std::move(tasks.back());
-        tasks.pop_back();
+        task = std::move(tasks.front());
+        tasks.pop_front();
       }
 
       if (task.waitId != GpuTaskLayout::kInvalidId &&
           !task.chain->isComplete(task.waitId)) {
         std::unique_lock lock(taskMtx);
-        delayedTasks.push_back(std::move(task));
+        delayedTasks.push_front(std::move(task));
         taskCv.notify_one();
         continue;
       }