fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch back to std:: muteces. mutices. mutexen.

Browse Source
This commit is contained in:
Ben Vanik
2015-09-06 13:34:08 -07:00
parent cb3dbcccbc
commit 790ce8aee1
17 changed files with 49 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/ui/loop_win.cc
View File

@@ -54,7 +54,7 @@ Win32Loop::~Win32Loop() {
thread_.join();
DeleteTimerQueueEx(timer_queue_, INVALID_HANDLE_VALUE);
std::lock_guard<xe::mutex> lock(pending_timers_mutex_);
std::lock_guard<std::mutex> lock(pending_timers_mutex_);
while (!pending_timers_.empty()) {
auto timer = pending_timers_.back();
pending_timers_.pop_back();
@@ -102,7 +102,7 @@ void Win32Loop::TimerQueueCallback(void* context, uint8_t) {
auto fn = std::move(timer->fn);
DeleteTimerQueueTimer(timer->timer_queue, timer->timer_handle, NULL);
{
std::lock_guard<xe::mutex> lock(loop->pending_timers_mutex_);
std::lock_guard<std::mutex> lock(loop->pending_timers_mutex_);
loop->pending_timers_.remove(timer);
}
delete timer;
@@ -119,7 +119,7 @@ void Win32Loop::PostDelayed(std::function<void()> fn, uint64_t delay_millis) {
timer->timer_queue = timer_queue_;
timer->fn = std::move(fn);
{
std::lock_guard<xe::mutex> lock(pending_timers_mutex_);
std::lock_guard<std::mutex> lock(pending_timers_mutex_);
pending_timers_.push_back(timer);
}
CreateTimerQueueTimer(&timer->timer_handle, timer_queue_,

3
src/xenia/ui/loop_win.h
View File

@@ -14,7 +14,6 @@
#include <list>
#include <thread>
#include "xenia/base/mutex.h"
#include "xenia/base/platform_win.h"
#include "xenia/base/threading.h"
#include "xenia/ui/loop.h"
@@ -50,7 +49,7 @@ class Win32Loop : public Loop {
xe::threading::Fence quit_fence_;
HANDLE timer_queue_;
xe::mutex pending_timers_mutex_;
std::mutex pending_timers_mutex_;
std::list<PendingTimer*> pending_timers_;
};