mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-01-31 01:15:24 +01:00
Common: reformat (#4720)
* common: format AlignedMalloc.cpp * common: format AppTrait.h * common: format Assertions.h * common: format CheckedStaticBox * common: format Console * common: format Dependencies.h * common: format EmbeddedImage * common: format EventSource * common: format Exceptions * common: format FastFormatString.cpp * common: format General.h * common: format InitInterface * common: format MathUtils.h * common: format MemsetFast/MemcpyFast * common: format Mutex.cpp * common: format PageFaultSource.h * common: format Path.h * common: format PathUtils.cpp * common: format Pcsx2Types.h * common: format Perf * common: format PersistentThread.h * common: format RwMutex * common: format SafeArray * common: format ScopedAlloc.h * common: format ScopedPtrMT.h * common: format Semaphore.cpp * common: format StringHelpers * common: format ThreadTools.cpp * common: format Threading.h * common: format ThreadingDialogs * common: format ThreadingInternal.h * common: format TraceLog.h * common: format VirtualMemory.cpp * common: format pxCheckBox * common: format pxEvents.h * common: format pxForwardDefs.h * common: format pxRadioPanel * common: format pxStaticText * common: format pxStreams * common: format pxTranslate.cpp * common: format pxWindowTextWriter.cpp * common: format wxAppWithHelpers * common: format wxBaseTools.h * common: format wxGuiTools * common: format wxHelpers.cpp * common: format Darwin directory * common: format Linux directory * common: format Windows directory * common: format LnxCpuDetect.cpp * common: format WinCpuDetect.cpp * common: format bmi.cpp * common: format cpudetect.cpp * common: format cpu_detect_internal.h * common: format fpu.cpp * common: format groups.cpp * common: format instructions.h * common: format internal.h * common: format jmp.cpp * common: format legacy.cpp * common: format legacy_instructions.h * common: format legacy_internal.h * common: format movs.cpp * common: format simd.cpp * common: format tools.h * common: format x86emitter.cpp * common: format x86types.h * common: format bmi.h * common: format dwshift.h * common: format group1.h group2.h group3.h * common: format incdec.h * common: format jmpcall.h * common: format movs.h * common: format simd_arithmetic.h * common: format simd_comparisons.h * common: format simd_helpers.h * common: format simd_moremovs.h * common: format simd_shufflepack.h * common: format simd_templated_helpers.h * common: format test.h
This commit is contained in:
@@ -26,49 +26,50 @@
|
||||
|
||||
Threading::Semaphore::Semaphore()
|
||||
{
|
||||
sem_init(&m_sema, false, 0);
|
||||
sem_init(&m_sema, false, 0);
|
||||
}
|
||||
|
||||
Threading::Semaphore::~Semaphore()
|
||||
{
|
||||
sem_destroy(&m_sema);
|
||||
sem_destroy(&m_sema);
|
||||
}
|
||||
|
||||
void Threading::Semaphore::Reset()
|
||||
{
|
||||
sem_destroy(&m_sema);
|
||||
sem_init(&m_sema, false, 0);
|
||||
sem_destroy(&m_sema);
|
||||
sem_init(&m_sema, false, 0);
|
||||
}
|
||||
|
||||
void Threading::Semaphore::Post()
|
||||
{
|
||||
sem_post(&m_sema);
|
||||
sem_post(&m_sema);
|
||||
}
|
||||
|
||||
void Threading::Semaphore::Post(int multiple)
|
||||
{
|
||||
#if defined(_MSC_VER)
|
||||
sem_post_multiple(&m_sema, multiple);
|
||||
sem_post_multiple(&m_sema, multiple);
|
||||
#else
|
||||
// Only w32pthreads has the post_multiple, but it's easy enough to fake:
|
||||
while (multiple > 0) {
|
||||
multiple--;
|
||||
sem_post(&m_sema);
|
||||
}
|
||||
// Only w32pthreads has the post_multiple, but it's easy enough to fake:
|
||||
while (multiple > 0)
|
||||
{
|
||||
multiple--;
|
||||
sem_post(&m_sema);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void Threading::Semaphore::WaitWithoutYield()
|
||||
{
|
||||
pxAssertMsg(!wxThread::IsMain(), "Unyielding semaphore wait issued from the main/gui thread. Please use Wait() instead.");
|
||||
sem_wait(&m_sema);
|
||||
pxAssertMsg(!wxThread::IsMain(), "Unyielding semaphore wait issued from the main/gui thread. Please use Wait() instead.");
|
||||
sem_wait(&m_sema);
|
||||
}
|
||||
|
||||
bool Threading::Semaphore::WaitWithoutYield(const wxTimeSpan &timeout)
|
||||
bool Threading::Semaphore::WaitWithoutYield(const wxTimeSpan& timeout)
|
||||
{
|
||||
wxDateTime megafail(wxDateTime::UNow() + timeout);
|
||||
const timespec fail = {megafail.GetTicks(), megafail.GetMillisecond() * 1000000};
|
||||
return sem_timedwait(&m_sema, &fail) == 0;
|
||||
wxDateTime megafail(wxDateTime::UNow() + timeout);
|
||||
const timespec fail = {megafail.GetTicks(), megafail.GetMillisecond() * 1000000};
|
||||
return sem_timedwait(&m_sema, &fail) == 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -80,18 +81,23 @@ bool Threading::Semaphore::WaitWithoutYield(const wxTimeSpan &timeout)
|
||||
void Threading::Semaphore::Wait()
|
||||
{
|
||||
#if wxUSE_GUI
|
||||
if (!wxThread::IsMain() || (wxTheApp == NULL)) {
|
||||
sem_wait(&m_sema);
|
||||
} else if (_WaitGui_RecursionGuard(L"Semaphore::Wait")) {
|
||||
ScopedBusyCursor hourglass(Cursor_ReallyBusy);
|
||||
sem_wait(&m_sema);
|
||||
} else {
|
||||
//ScopedBusyCursor hourglass( Cursor_KindaBusy );
|
||||
while (!WaitWithoutYield(def_yieldgui_interval))
|
||||
YieldToMain();
|
||||
}
|
||||
if (!wxThread::IsMain() || (wxTheApp == NULL))
|
||||
{
|
||||
sem_wait(&m_sema);
|
||||
}
|
||||
else if (_WaitGui_RecursionGuard(L"Semaphore::Wait"))
|
||||
{
|
||||
ScopedBusyCursor hourglass(Cursor_ReallyBusy);
|
||||
sem_wait(&m_sema);
|
||||
}
|
||||
else
|
||||
{
|
||||
//ScopedBusyCursor hourglass( Cursor_KindaBusy );
|
||||
while (!WaitWithoutYield(def_yieldgui_interval))
|
||||
YieldToMain();
|
||||
}
|
||||
#else
|
||||
sem_wait(&m_sema);
|
||||
sem_wait(&m_sema);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -104,29 +110,35 @@ void Threading::Semaphore::Wait()
|
||||
// false if the wait timed out before the semaphore was signaled, or true if the signal was
|
||||
// reached prior to timeout.
|
||||
//
|
||||
bool Threading::Semaphore::Wait(const wxTimeSpan &timeout)
|
||||
bool Threading::Semaphore::Wait(const wxTimeSpan& timeout)
|
||||
{
|
||||
#if wxUSE_GUI
|
||||
if (!wxThread::IsMain() || (wxTheApp == NULL)) {
|
||||
return WaitWithoutYield(timeout);
|
||||
} else if (_WaitGui_RecursionGuard(L"Semaphore::TimedWait")) {
|
||||
ScopedBusyCursor hourglass(Cursor_ReallyBusy);
|
||||
return WaitWithoutYield(timeout);
|
||||
} else {
|
||||
//ScopedBusyCursor hourglass( Cursor_KindaBusy );
|
||||
wxTimeSpan countdown((timeout));
|
||||
if (!wxThread::IsMain() || (wxTheApp == NULL))
|
||||
{
|
||||
return WaitWithoutYield(timeout);
|
||||
}
|
||||
else if (_WaitGui_RecursionGuard(L"Semaphore::TimedWait"))
|
||||
{
|
||||
ScopedBusyCursor hourglass(Cursor_ReallyBusy);
|
||||
return WaitWithoutYield(timeout);
|
||||
}
|
||||
else
|
||||
{
|
||||
//ScopedBusyCursor hourglass( Cursor_KindaBusy );
|
||||
wxTimeSpan countdown((timeout));
|
||||
|
||||
do {
|
||||
if (WaitWithoutYield(def_yieldgui_interval))
|
||||
break;
|
||||
YieldToMain();
|
||||
countdown -= def_yieldgui_interval;
|
||||
} while (countdown.GetMilliseconds() > 0);
|
||||
do
|
||||
{
|
||||
if (WaitWithoutYield(def_yieldgui_interval))
|
||||
break;
|
||||
YieldToMain();
|
||||
countdown -= def_yieldgui_interval;
|
||||
} while (countdown.GetMilliseconds() > 0);
|
||||
|
||||
return countdown.GetMilliseconds() > 0;
|
||||
}
|
||||
return countdown.GetMilliseconds() > 0;
|
||||
}
|
||||
#else
|
||||
return WaitWithoutYield(timeout);
|
||||
return WaitWithoutYield(timeout);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -140,26 +152,26 @@ bool Threading::Semaphore::Wait(const wxTimeSpan &timeout)
|
||||
// to do a lot of no-cancel waits in a tight loop worker thread, for example.
|
||||
void Threading::Semaphore::WaitNoCancel()
|
||||
{
|
||||
int oldstate;
|
||||
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
|
||||
//WaitWithoutYield();
|
||||
Wait();
|
||||
pthread_setcancelstate(oldstate, NULL);
|
||||
int oldstate;
|
||||
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
|
||||
//WaitWithoutYield();
|
||||
Wait();
|
||||
pthread_setcancelstate(oldstate, NULL);
|
||||
}
|
||||
|
||||
void Threading::Semaphore::WaitNoCancel(const wxTimeSpan &timeout)
|
||||
void Threading::Semaphore::WaitNoCancel(const wxTimeSpan& timeout)
|
||||
{
|
||||
int oldstate;
|
||||
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
|
||||
//WaitWithoutYield( timeout );
|
||||
Wait(timeout);
|
||||
pthread_setcancelstate(oldstate, NULL);
|
||||
int oldstate;
|
||||
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
|
||||
//WaitWithoutYield( timeout );
|
||||
Wait(timeout);
|
||||
pthread_setcancelstate(oldstate, NULL);
|
||||
}
|
||||
|
||||
int Threading::Semaphore::Count()
|
||||
{
|
||||
int retval;
|
||||
sem_getvalue(&m_sema, &retval);
|
||||
return retval;
|
||||
int retval;
|
||||
sem_getvalue(&m_sema, &retval);
|
||||
return retval;
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user