mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-25 09:24:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Beta match MxThread and MxSemaphore (#1644)

Browse Source
This commit is contained in:
MS
2025-07-20 21:58:16 -04:00
committed by GitHub
parent 2980f88bb0
commit 4edd8d1214
5 changed files with 82 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
View File

@@ -161,10 +161,11 @@ void MxDiskStreamProvider::VTable0x20(MxDSAction* p_action)
}
// FUNCTION: LEGO1 0x100d1750
// FUNCTION: BETA10 0x101632b8
MxResult MxDiskStreamProvider::WaitForWorkToComplete()
{
while (m_remainingWork) {
m_busySemaphore.Wait(INFINITE);
m_busySemaphore.Acquire(INFINITE);
if (m_unk0x35) {
PerformWork();
}

20
LEGO1/omni/src/system/mxsemaphore.cpp
View File

@@ -6,30 +6,44 @@
DECOMP_SIZE_ASSERT(MxSemaphore, 0x08)
// FUNCTION: LEGO1 0x100c87d0
// FUNCTION: BETA10 0x10159260
MxSemaphore::MxSemaphore()
{
m_hSemaphore = NULL;
}
// FUNCTION: LEGO1 0x100c8800
// FUNCTION: BETA10 0x101592d5
MxResult MxSemaphore::Init(MxU32 p_initialCount, MxU32 p_maxCount)
{
MxResult result = FAILURE;
if ((m_hSemaphore = CreateSemaphore(NULL, p_initialCount, p_maxCount, NULL))) {
result = SUCCESS;
m_hSemaphore = CreateSemaphore(NULL, p_initialCount, p_maxCount, NULL);
if (!m_hSemaphore) {
goto done;
}
result = SUCCESS;
done:
return result;
}
// FUNCTION: LEGO1 0x100c8830
void MxSemaphore::Wait(MxU32 p_timeoutMS)
// FUNCTION: BETA10 0x10159332
void MxSemaphore::Acquire(MxU32 p_timeoutMS)
{
WaitForSingleObject(m_hSemaphore, p_timeoutMS);
}
// FUNCTION: BETA10 0x10159385
void MxSemaphore::TryAcquire()
{
WaitForSingleObject(m_hSemaphore, 0);
}
// FUNCTION: LEGO1 0x100c8850
// FUNCTION: BETA10 0x101593aa
void MxSemaphore::Release(MxU32 p_releaseCount)
{
ReleaseSemaphore(m_hSemaphore, p_releaseCount, NULL);

59
LEGO1/omni/src/system/mxthread.cpp
View File

@@ -7,14 +7,16 @@
DECOMP_SIZE_ASSERT(MxThread, 0x1c)
// FUNCTION: LEGO1 0x100bf510
// FUNCTION: BETA10 0x10147540
MxThread::MxThread()
{
m_hThread = NULL;
m_running = TRUE;
m_threadId = 0;
m_running = TRUE;
}
// FUNCTION: LEGO1 0x100bf5a0
// FUNCTION: BETA10 0x101475d0
MxThread::~MxThread()
{
if (m_hThread) {
@@ -25,41 +27,82 @@ MxThread::~MxThread()
typedef unsigned(__stdcall* ThreadFunc)(void*);
// FUNCTION: LEGO1 0x100bf610
// FUNCTION: BETA10 0x10147655
MxResult MxThread::Start(MxS32 p_stackSize, MxS32 p_flag)
{
MxResult result = FAILURE;
if (m_semaphore.Init(0, 1) == SUCCESS) {
if ((m_hThread =
_beginthreadex(NULL, p_stackSize * 4, (ThreadFunc) &MxThread::ThreadProc, this, p_flag, &m_threadId)
)) {
result = SUCCESS;
}
if (m_semaphore.Init(0, 1) != SUCCESS) {
goto done;
}
m_hThread = _beginthreadex(NULL, p_stackSize * 4, (ThreadFunc) &MxThread::ThreadProc, this, p_flag, &m_threadId);
if (!m_hThread) {
goto done;
}
result = SUCCESS;
done:
return result;
}
// FUNCTION: LEGO1 0x100bf660
// FUNCTION: BETA10 0x101476ee
void MxThread::Sleep(MxS32 p_milliseconds)
{
::Sleep(p_milliseconds);
}
// FUNCTION: BETA10 0x10147710
void MxThread::ResumeThread()
{
::ResumeThread((HANDLE) m_hThread);
}
// FUNCTION: BETA10 0x10147733
void MxThread::SuspendThread()
{
::SuspendThread((HANDLE) m_hThread);
}
// FUNCTION: BETA10 0x10147756
BOOL MxThread::TerminateThread(MxU32 p_exitCode)
{
// TerminateThread returns nonzero for success, zero for failure
return ::TerminateThread((HANDLE) m_hThread, p_exitCode) == 0;
}
// FUNCTION: BETA10 0x10147793
MxS32 MxThread::GetThreadPriority(MxU16& p_priority)
{
return (p_priority = ::GetThreadPriority((HANDLE) m_hThread));
}
// FUNCTION: BETA10 0x101477c8
BOOL MxThread::SetThreadPriority(MxU16 p_priority)
{
// SetThreadPriority returns nonzero for success, zero for failure
return ::SetThreadPriority((HANDLE) m_hThread, p_priority) == 0;
}
// FUNCTION: LEGO1 0x100bf670
// FUNCTION: BETA10 0x1014780a
void MxThread::Terminate()
{
m_running = FALSE;
m_semaphore.Wait(INFINITE);
m_semaphore.Acquire(INFINITE);
}
// FUNCTION: LEGO1 0x100bf680
// FUNCTION: BETA10 0x1014783b
unsigned MxThread::ThreadProc(void* p_thread)
{
return static_cast<MxThread*>(p_thread)->Run();
}
// FUNCTION: LEGO1 0x100bf690
// FUNCTION: BETA10 0x10147855
MxResult MxThread::Run()
{
m_semaphore.Release(1);