OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Remove WinRun hack from hsThread

Browse Source
This commit is contained in:
Adam Johnson
2012-03-02 19:12:52 -05:00
committed by Darryl Pogue
parent 9302df2453
commit a44b48356e
2 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Plasma/CoreLib/hsThread.h
View File

@ -102,10 +102,6 @@ public:
static void* Alloc(size_t size); // does not call operator::new(), may return nil static void* Alloc(size_t size); // does not call operator::new(), may return nil
static void Free(void* p); // does not call operator::delete() static void Free(void* p); // does not call operator::delete()
static void ThreadYield(); static void ThreadYield();
#if HS_BUILD_FOR_WIN32
DWORD WinRun();
#endif
}; };
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////

36
Sources/Plasma/CoreLib/hsThread_Win.cpp
View File

@ -46,16 +46,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsExceptions.h" #include "hsExceptions.h"
#include "hsMemory.h" #include "hsMemory.h"
// typedef unsigned int __stdcall (*EntryPtCB)(void*); struct WinThreadParam
static DWORD __stdcall gEntryPoint(void* param)
{ {
return ((hsThread*)param)->WinRun(); hsThread* fThread;
} HANDLE fQuitSemaH; // private member of hsThread
WinThreadParam(hsThread* t, HANDLE quit)
: fThread(t), fQuitSemaH(quit)
{ }
};
static unsigned int __stdcall gEntryPointBT(void* param) static unsigned int __stdcall gEntryPointBT(void* param)
{ {
return ((hsThread*)param)->WinRun(); WinThreadParam* wtp = (WinThreadParam*)param;
unsigned int result = wtp->fThread->Run();
::ReleaseSemaphore(wtp->fQuitSemaH, 1, nil); // signal that we've quit
delete param;
return result;
} }
hsThread::hsThread(uint32_t stackSize) : fStackSize(stackSize), fQuit(false), fThreadH(nil), fQuitSemaH(nil) hsThread::hsThread(uint32_t stackSize) : fStackSize(stackSize), fQuit(false), fThreadH(nil), fQuitSemaH(nil)
@ -74,12 +81,8 @@ void hsThread::Start()
fQuitSemaH = ::CreateSemaphore(nil, 0, kPosInfinity32, nil); fQuitSemaH = ::CreateSemaphore(nil, 0, kPosInfinity32, nil);
if (fQuitSemaH == nil) if (fQuitSemaH == nil)
throw hsOSException(-1); throw hsOSException(-1);
WinThreadParam* wtp = new WinThreadParam(this, fQuitSemaH);
#if 0 fThreadH = (HANDLE)_beginthreadex(nil, fStackSize, gEntryPointBT, wtp, 0, (unsigned int*)&fThreadId);
fThreadH = ::CreateThread(nil, fStackSize, gEntryPoint, this, 0, &fThreadId);
#else
fThreadH = (HANDLE)_beginthreadex(nil, fStackSize, gEntryPointBT, this, 0, (unsigned int*)&fThreadId);
#endif
if (fThreadH == nil) if (fThreadH == nil)
throw hsOSException(-1); throw hsOSException(-1);
} }
@ -100,15 +103,6 @@ void hsThread::Stop()
} }
} }
DWORD hsThread::WinRun()
{
DWORD result = this->Run();
::ReleaseSemaphore(fQuitSemaH, 1, nil); // signal that we've quit
return result;
}
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
void* hsThread::Alloc(size_t size) void* hsThread::Alloc(size_t size)