Remove CDvdFile threading, now redundant with nod-rs

Author: Antidote

Runtime/CDvdFile.cpp

@@ -99,50 +99,29 @@ class CFileDvdRequest : public IDvdRequest {
   ESeekOrigin m_whence;
   int m_offset;
 
-#ifdef HAS_DVD_THREAD
-  std::atomic_bool m_cancel = {false};
-  std::atomic_bool m_complete = {false};
-#else
+
   bool m_cancel = false;
   bool m_complete = false;
-#endif
+  
   std::function<void(u32)> m_callback;
 
 public:
   ~CFileDvdRequest() override { CFileDvdRequest::PostCancelRequest(); }
 
   void WaitUntilComplete() override {
-#ifdef HAS_DVD_THREAD
-    while (!m_complete.load() && !m_cancel.load()) {
-      std::unique_lock lk{CDvdFile::m_WaitMutex};
-    }
-#else
+
     if (!m_complete && !m_cancel) {
       CDvdFile::DoWork();
     }
-#endif
   }
   bool IsComplete() override {
-#ifdef HAS_DVD_THREAD
-    return m_complete.load();
-#else
+
     if (!m_complete) {
       CDvdFile::DoWork();
     }
     return m_complete;
-#endif
-  }
-  void PostCancelRequest() override {
-#ifdef HAS_DVD_THREAD
-    if (m_complete.load() || m_cancel.load()) {
-      return;
-    }
-    std::unique_lock waitlk{CDvdFile::m_WaitMutex};
-    m_cancel.store(true);
-#else
-    m_cancel = true;
-#endif
   }
+  void PostCancelRequest() override { m_cancel = true; }
 
   [[nodiscard]] EMediaType GetMediaType() const override { return EMediaType::File; }
 
@@ -157,22 +136,13 @@ class CFileDvdRequest : public IDvdRequest {
   , m_callback(std::move(cb)) {}
 
   void DoRequest() {
-#ifdef HAS_DVD_THREAD
-    if (m_cancel.load()) {
-      return;
-    }
-#else
     if (m_cancel) {
       return;
     }
-#endif
 
     if (!m_reader) {
-#ifdef HAS_DVD_THREAD
-      m_complete.store(true);
-#else
+
       m_complete = true;
-#endif
       if (m_callback) {
         m_callback(0);
       }
@@ -209,21 +179,10 @@ class CFileDvdRequest : public IDvdRequest {
     if (m_callback) {
       m_callback(readLen);
     }
-#ifdef HAS_DVD_THREAD
-    m_complete.store(true);
-#else
     m_complete = true;
-#endif
   }
 };
 
-#ifdef HAS_DVD_THREAD
-std::thread CDvdFile::m_WorkerThread;
-std::mutex CDvdFile::m_WorkerMutex;
-std::condition_variable CDvdFile::m_WorkerCV;
-std::mutex CDvdFile::m_WaitMutex;
-std::atomic_bool CDvdFile::m_WorkerRun = {false};
-#endif
 std::vector<std::shared_ptr<IDvdRequest>> CDvdFile::m_RequestQueue;
 std::string CDvdFile::m_rootDirectory;
 std::unique_ptr<u8[]> CDvdFile::m_dolBuf;
@@ -252,44 +211,10 @@ void CDvdFile::DoWork() {
   m_RequestQueue.clear();
 }
 
-void CDvdFile::WorkerProc() {
-#ifdef HAS_DVD_THREAD
-  // OPTICK_THREAD("CDvdFile");
-
-  while (m_WorkerRun.load()) {
-    std::unique_lock lk{m_WorkerMutex};
-    while (!m_RequestQueue.empty()) {
-      std::vector<std::shared_ptr<IDvdRequest>> swapQueue;
-      swapQueue.swap(m_RequestQueue);
-      lk.unlock();
-      std::unique_lock waitlk{m_WaitMutex};
-      for (std::shared_ptr<IDvdRequest>& req : swapQueue) {
-        auto& concreteReq = static_cast<CFileDvdRequest&>(*req);
-        concreteReq.DoRequest();
-      }
-      waitlk.unlock();
-      swapQueue.clear();
-      lk.lock();
-    }
-    if (!m_WorkerRun.load()) {
-      break;
-    }
-    m_WorkerCV.wait(lk);
-  }
-#endif
-}
-
 std::shared_ptr<IDvdRequest> CDvdFile::AsyncSeekRead(void* buf, u32 len, ESeekOrigin whence, int off,
                                                      std::function<void(u32)>&& cb) {
   std::shared_ptr<IDvdRequest> ret = std::make_shared<CFileDvdRequest>(*this, buf, len, whence, off, std::move(cb));
-#ifdef HAS_DVD_THREAD
-  std::unique_lock lk{m_WorkerMutex};
-#endif
   m_RequestQueue.emplace_back(ret);
-#ifdef HAS_DVD_THREAD
-  lk.unlock();
-  m_WorkerCV.notify_one();
-#endif
   return ret;
 }
 
@@ -443,12 +368,6 @@ bool CDvdFile::LoadDolBuf() {
 }
 
 bool CDvdFile::Initialize(const std::string_view& path) {
-#ifdef HAS_DVD_THREAD
-  if (m_WorkerRun.load()) {
-    return true;
-  }
-#endif
-
   Shutdown();
 
   std::string pathStr(path);
@@ -494,23 +413,10 @@ bool CDvdFile::Initialize(const std::string_view& path) {
     return false;
   }
 
-#ifdef HAS_DVD_THREAD
-  m_WorkerRun.store(true);
-  m_WorkerThread = std::thread(WorkerProc);
-#endif
   return true;
 }
 
 void CDvdFile::Shutdown() {
-#ifdef HAS_DVD_THREAD
-  if (m_WorkerRun.load()) {
-    m_WorkerRun.store(false);
-    m_WorkerCV.notify_one();
-    if (m_WorkerThread.joinable()) {
-      m_WorkerThread.join();
-    }
-  }
-#endif
   m_RequestQueue.clear();
   m_FileEntries.clear();
   m_dolBuf.reset();

Runtime/CDvdFile.hpp

@@ -18,10 +18,6 @@
 
 #include <nod.h>
 
-#ifndef EMSCRIPTEN
-#define HAS_DVD_THREAD
-#endif
-
 namespace metaforce {
 
 enum class ESeekOrigin { Begin = 0, Cur = 1, End = 2 };
@@ -47,18 +43,11 @@ class CDvdFile {
   static NodHandleUnique m_DvdRoot;
   static NodHandleUnique m_DataPartition;
   static std::unordered_map<std::string, SFileEntry> m_FileEntries;
-#ifdef HAS_DVD_THREAD
-  static std::thread m_WorkerThread;
-  static std::mutex m_WorkerMutex;
-  static std::condition_variable m_WorkerCV;
-  static std::mutex m_WaitMutex;
-  static std::atomic_bool m_WorkerRun;
-#endif
+
   static std::vector<std::shared_ptr<IDvdRequest>> m_RequestQueue;
   static std::string m_rootDirectory;
   static std::unique_ptr<u8[]> m_dolBuf;
   static size_t m_dolBufLen;
-  static void WorkerProc();
 
   std::string x18_path;
   std::shared_ptr<NodHandle> m_reader;