From 4d41840728f92544da8302dc93cdbd23f2cc22c2 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Thu, 21 May 2015 22:33:29 -0700
Subject: [PATCH] Misc threading fixes and flags to ignore
 priorities/affinities.

---
 src/xenia/kernel/objects/xthread.cc    | 17 +++++++++++++----
 src/xenia/kernel/xboxkrnl_rtl.cc       |  2 +-
 src/xenia/kernel/xboxkrnl_threading.cc |  2 ++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/xenia/kernel/objects/xthread.cc b/src/xenia/kernel/objects/xthread.cc
index a29ed0155..764b09020 100644
--- a/src/xenia/kernel/objects/xthread.cc
+++ b/src/xenia/kernel/objects/xthread.cc
@@ -18,6 +18,11 @@
 #include "xenia/kernel/objects/xuser_module.h"
 #include "xenia/profiling.h"
 
+DEFINE_bool(ignore_thread_priorities, true,
+            "Ignores game-specified thread priorities.");
+DEFINE_bool(ignore_thread_affinities, true,
+            "Ignores game-specified thread affinities.");
+
 namespace xe {
 namespace kernel {
 
@@ -537,9 +542,9 @@ int32_t XThread::QueryPriority() { return GetThreadPriority(thread_handle_); }
 
 void XThread::SetPriority(int32_t increment) {
   int target_priority = 0;
-  if (increment > 0x11) {
+  if (increment > 0x22) {
     target_priority = THREAD_PRIORITY_HIGHEST;
-  } else if (increment > 0) {
+  } else if (increment > 0x11) {
     target_priority = THREAD_PRIORITY_ABOVE_NORMAL;
   } else if (increment < -0x22) {
     target_priority = THREAD_PRIORITY_IDLE;
@@ -548,7 +553,9 @@ void XThread::SetPriority(int32_t increment) {
   } else {
     target_priority = THREAD_PRIORITY_NORMAL;
   }
-  SetThreadPriority(thread_handle_, target_priority);
+  if (!FLAGS_ignore_thread_priorities) {
+    SetThreadPriority(thread_handle_, target_priority);
+  }
 }
 
 void XThread::SetAffinity(uint32_t affinity) {
@@ -567,7 +574,9 @@ void XThread::SetAffinity(uint32_t affinity) {
   if (system_info.dwNumberOfProcessors < 6) {
     XELOGW("Too few processors - scheduling will be wonky");
   }
-  SetThreadAffinityMask(reinterpret_cast<HANDLE>(thread_handle_), affinity);
+  if (!FLAGS_ignore_thread_affinities) {
+    SetThreadAffinityMask(reinterpret_cast<HANDLE>(thread_handle_), affinity);
+  }
 }
 
 X_STATUS XThread::Resume(uint32_t* out_suspend_count) {
diff --git a/src/xenia/kernel/xboxkrnl_rtl.cc b/src/xenia/kernel/xboxkrnl_rtl.cc
index 30310634c..0053d61f5 100644
--- a/src/xenia/kernel/xboxkrnl_rtl.cc
+++ b/src/xenia/kernel/xboxkrnl_rtl.cc
@@ -547,7 +547,7 @@ spin:
     // TODO(benvanik): contention - do a real wait!
     // XELOGE("RtlEnterCriticalSection tried to really lock!");
     spin_wait_remaining = 0;  // HACK: spin forever
-    Sleep(1);
+    SwitchToThread();
     goto spin;
   }
 
diff --git a/src/xenia/kernel/xboxkrnl_threading.cc b/src/xenia/kernel/xboxkrnl_threading.cc
index 91e575cb5..0e31117e8 100644
--- a/src/xenia/kernel/xboxkrnl_threading.cc
+++ b/src/xenia/kernel/xboxkrnl_threading.cc
@@ -260,11 +260,13 @@ SHIM_CALL KeSetBasePriorityThread_shim(PPCContext* ppc_state,
     XELOGD("KeSetBasePriorityThread - Interpreting thread ptr as handle!");
   } else {
     thread = (XThread*)XObject::GetObject(state, SHIM_MEM_ADDR(thread_ptr));
+    thread->Retain();
   }
 
   if (thread) {
     prev_priority = thread->QueryPriority();
     thread->SetPriority(increment);
+    thread->Release();
   }
 
   SHIM_SET_RETURN_32(prev_priority);