mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r15746) -Fix: Update threading code for OS/2, add mutex support
This commit is contained in:
parent
bcc870e3f8
commit
677b157943
|
@ -1,66 +1,116 @@
|
|||
/* $Id$ */
|
||||
|
||||
/** @file thread_os2.cpp OS2 implementation of Threads. */
|
||||
/** @file thread_os2.cpp OS/2 implementation of Threads. */
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "thread.h"
|
||||
|
||||
#if 0
|
||||
#include "debug.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include <stdlib.h>
|
||||
|
||||
#define INCL_DOS
|
||||
#include <os2.h>
|
||||
#include <process.h>
|
||||
|
||||
struct OTTDThread {
|
||||
TID thread;
|
||||
OTTDThreadFunc func;
|
||||
void *arg;
|
||||
void *ret;
|
||||
/**
|
||||
* OS/2 version for ThreadObject.
|
||||
*/
|
||||
class ThreadObject_OS2 : public ThreadObject {
|
||||
private:
|
||||
TID thread; ///< System thread identifier.
|
||||
OTTDThreadFunc proc; ///< External thread procedure.
|
||||
void *param; ///< Parameter for the external thread procedure.
|
||||
bool self_destruct; ///< Free ourselves when done?
|
||||
|
||||
public:
|
||||
/**
|
||||
* Create a thread and start it, calling proc(param).
|
||||
*/
|
||||
ThreadObject_OS2(OTTDThreadFunc proc, void *param, bool self_destruct) :
|
||||
thread(0),
|
||||
proc(proc),
|
||||
param(param),
|
||||
self_destruct(self_destruct)
|
||||
{
|
||||
thread = _beginthread(stThreadProc, NULL, 32768, this);
|
||||
}
|
||||
|
||||
/* virtual */ bool Exit()
|
||||
{
|
||||
_endthread();
|
||||
return true;
|
||||
}
|
||||
|
||||
/* virtual */ void Join()
|
||||
{
|
||||
DosWaitThread(&this->thread, DCWW_WAIT);
|
||||
this->thread = 0;
|
||||
}
|
||||
private:
|
||||
/**
|
||||
* On thread creation, this function is called, which calls the real startup
|
||||
* function. This to get back into the correct instance again.
|
||||
*/
|
||||
static void stThreadProc(void *thr)
|
||||
{
|
||||
((ThreadObject_OS2 *)thr)->ThreadProc();
|
||||
}
|
||||
|
||||
/**
|
||||
* A new thread is created, and this function is called. Call the custom
|
||||
* function of the creator of the thread.
|
||||
*/
|
||||
void ThreadProc()
|
||||
{
|
||||
/* Call the proc of the creator to continue this thread */
|
||||
try {
|
||||
this->proc(this->param);
|
||||
} catch (OTTDThreadExitSignal e) {
|
||||
} catch (...) {
|
||||
NOT_REACHED();
|
||||
}
|
||||
|
||||
if (self_destruct) {
|
||||
this->Exit();
|
||||
delete this;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static void Proxy(void *arg)
|
||||
/* static */ bool ThreadObject::New(OTTDThreadFunc proc, void *param, ThreadObject **thread)
|
||||
{
|
||||
OTTDThread *t = (OTTDThread *)arg;
|
||||
t->ret = t->func(t->arg);
|
||||
ThreadObject *to = new ThreadObject_OS2(proc, param, thread == NULL);
|
||||
if (thread != NULL) *thread = to;
|
||||
return true;
|
||||
}
|
||||
|
||||
OTTDThread *OTTDCreateThread(OTTDThreadFunc function, void *arg)
|
||||
{
|
||||
OTTDThread *t = MallocT<OTTDThread>(1);
|
||||
/**
|
||||
* OS/2 version of ThreadMutex.
|
||||
*/
|
||||
class ThreadMutex_OS2 : public ThreadMutex {
|
||||
private:
|
||||
HMTX mutex;
|
||||
|
||||
t->func = function;
|
||||
t->arg = arg;
|
||||
t->thread = _beginthread(Proxy, NULL, 32768, t);
|
||||
if (t->thread != (TID)-1) {
|
||||
return t;
|
||||
} else {
|
||||
free(t);
|
||||
return NULL;
|
||||
public:
|
||||
ThreadMutex_OS2()
|
||||
{
|
||||
DosCreateMutexSem(NULL, &mutex, 0, FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
void *OTTDJoinThread(OTTDThread *t)
|
||||
/* virtual */ ~ThreadMutex_OS2()
|
||||
{
|
||||
DosCloseMutexSem(mutex);
|
||||
}
|
||||
|
||||
/* virtual */ void BeginCritical()
|
||||
{
|
||||
DosRequestMutexSem(mutex, (unsigned long) SEM_INDEFINITE_WAIT);
|
||||
}
|
||||
|
||||
/* virtual */ void EndCritical()
|
||||
{
|
||||
DosReleaseMutexSem(mutex);
|
||||
}
|
||||
};
|
||||
|
||||
/* static */ ThreadMutex *ThreadMutex::New()
|
||||
{
|
||||
if (t == NULL) return NULL;
|
||||
|
||||
DosWaitThread(&t->thread, DCWW_WAIT);
|
||||
void *ret = t->ret;
|
||||
free(t);
|
||||
return ret;
|
||||
}
|
||||
|
||||
void OTTDExitThread()
|
||||
{
|
||||
_endthread();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* static */ ThreadObject *ThreadObject::New(OTTDThreadFunc proc, void *param, ThreadObject **thread)
|
||||
{
|
||||
if (thread != NULL) *thread = NULL;
|
||||
return false;
|
||||
return new ThreadMutex_OS2();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue