diff options
| author | Markus Wick <markus+github@selfnet.de> | 2015-02-15 10:33:19 +0100 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2015-02-15 10:33:19 +0100 |
| commit | f38b3ace389eb01c51566da81f0cdaeaba46f1c8 (patch) | |
| tree | dd3dab1182c1e3f624cc48244f0d8854aa423bde /Source/Core | |
| parent | d601657c9903e0fc0d860ef114a8edbbff0cbc0c (diff) | |
| parent | 98b809a05ec4c925d9e2171e95adc95969264bd6 (diff) | |
Merge pull request #2038 from magumagu/disable-thread-safety-checks
Disable thread safety assertions added in PR1987.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/CoreTiming.cpp | 6 |
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; |