archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 00:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup semaphore<> (sema.h) and mutex.h (shared_mutex)

Browse source 
Remove semaphore_lock and writer_lock classes, replace with std::lock_guard
Change semaphore<> interface to Lockable (+ exotic try_unlock method)
This commit is contained in:
Nekotekina 2018-09-03 22:28:33 +03:00
parent 5e556a87ff
commit ca5158a03e
50 changed files with 283 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rpcs3/main.cpp
View file

@ -37,11 +37,11 @@ static semaphore<> s_qt_mutex{};
[[noreturn]] extern void report_fatal_error(const std::string& text)
{
s_qt_mutex.wait();
s_qt_mutex.lock();
if (!s_qt_init.try_wait())
if (!s_qt_init.try_lock())
{
s_init.wait();
s_init.lock();
static int argc = 1;
static char arg1[] = {"ERROR"};
static char* argv[] = {arg1};
@ -95,8 +95,8 @@ int main(int argc, char** argv)
QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);
QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);
s_init.post();
s_qt_mutex.wait();
s_init.unlock();
s_qt_mutex.lock();
rpcs3_app app(argc, argv);
// Command line args
@ -135,7 +135,7 @@ int main(int argc, char** argv)
});
}
s_qt_init.post();
s_qt_mutex.post();
s_qt_init.unlock();
s_qt_mutex.unlock();
return app.exec();
}