summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authormagumagu <magumagu9@gmail.com>2015-02-12 11:50:26 -0800
committermagumagu <magumagu9@gmail.com>2015-02-12 11:54:17 -0800
commit98b809a05ec4c925d9e2171e95adc95969264bd6 (patch)
tree7206159af910bb9def0c81d831802768612c9da3 /Source
parent20aa9378244a89b912539f3b2b37842a0824dc9d (diff)
Disable thread safety assertions added in PR1987.
We do a whole bunch of non-threadsafe stuff, especially in the UI, and I'm probably not going to get around to implementing a threadsafe framework for interaction between the UI and the CPU thread anytime soon. See issue 8220.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/CoreTiming.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp
index e8cfbae287..c8ff6ce675 100644
--- a/Source/Core/Core/CoreTiming.cpp
+++ b/Source/Core/Core/CoreTiming.cpp
@@ -224,7 +224,8 @@ u64 GetIdleTicks()
// schedule things to be executed on the main thread.
void ScheduleEvent_Threadsafe(int cyclesIntoFuture, int event_type, u64 userdata)
{
- _assert_msg_(POWERPC, !Core::IsCPUThread(), "ScheduleEvent_Threadsafe from wrong thread");
+ // TODO: Fix UI thread safety problems, and enable this assertion
+ // _assert_msg_(POWERPC, !Core::IsCPUThread(), "ScheduleEvent_Threadsafe from wrong thread");
std::lock_guard<std::mutex> lk(tsWriteLock);
Event ne;
ne.time = globalTimer + cyclesIntoFuture;
@@ -280,7 +281,8 @@ static void AddEventToQueue(Event* ne)
// than Advance
void ScheduleEvent(int cyclesIntoFuture, int event_type, u64 userdata)
{
- _assert_msg_(POWERPC, Core::IsCPUThread(), "ScheduleEvent from wrong thread");
+ // TODO: Fix UI thread safety problems, and enable this assertion
+ //_assert_msg_(POWERPC, Core::IsCPUThread(), "ScheduleEvent from wrong thread");
Event *ne = GetNewEvent();
ne->userdata = userdata;
ne->type = event_type;