diff options
author | truebrain <truebrain@openttd.org> | 2008-06-08 12:06:27 +0000 |
---|---|---|
committer | truebrain <truebrain@openttd.org> | 2008-06-08 12:06:27 +0000 |
commit | e767b4f7784ba8e0f52cb920a4b171ef9b61e67f (patch) | |
tree | 824116881f6d5514cdaa069f10eddac84da3b04a /src/thread.h | |
parent | 4657ae97fcd9487adb882f8634ad5cfe589d034c (diff) | |
download | openttd-e767b4f7784ba8e0f52cb920a4b171ef9b61e67f.tar.xz |
(svn r13412) -Add: OTTDThreadTerminateFunc, for all thread systems, which is called when a thread is terminated. Now GenWorld- and SaveLoad-thread cleanup theirselves correctly, while Fibers don't (as that causes access-violations)
Diffstat (limited to 'src/thread.h')
-rw-r--r-- | src/thread.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/thread.h b/src/thread.h index f6f29a711..deaea0cd9 100644 --- a/src/thread.h +++ b/src/thread.h @@ -6,6 +6,7 @@ #define THREAD_H typedef void (*OTTDThreadFunc)(void *); +typedef void (*OTTDThreadTerminateFunc)(class ThreadObject *self); /** * A Thread Object which works on all our supported OSes. @@ -56,9 +57,10 @@ public: * with optinal params. * @param proc The procedure to call inside the thread. * @param param The params to give with 'proc'. + * @param terminate_func The function (or NULL) to call when the thread terminates. * @return True if the thread was started correctly. */ - static ThreadObject *New(OTTDThreadFunc proc, void *param); + static ThreadObject *New(OTTDThreadFunc proc, void *param, OTTDThreadTerminateFunc terminate_func); /** * Convert the current thread to a new ThreadObject. @@ -71,6 +73,12 @@ public: * @return The thread ID of the current active thread. */ static uint CurrentId(); + + /** + * A OTTDThreadTerminateFunc, which cleans up the thread itself + * at termination of the thread (so it becomes self-managed). + */ + static void TerminateCleanup(ThreadObject *self) { delete self; } }; /** |