author | rubidium |
Wed, 07 May 2008 21:45:27 +0000 | |
changeset 10457 | ea18877d8eba |
parent 10403 | 4925650db7ae |
child 10860 | ae89867701fe |
permissions | -rw-r--r-- |
10175
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
1 |
/* $Id$ */ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
2 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
3 |
/** @file thread_pthread.cpp POSIX pthread implementation of Threads. */ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
4 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
5 |
#include "stdafx.h" |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
6 |
#include "thread.h" |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
7 |
#include "debug.h" |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
8 |
#include "core/alloc_func.hpp" |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
9 |
#include <stdlib.h> |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
10 |
#include <pthread.h> |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
11 |
#include <semaphore.h> |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
12 |
#include <unistd.h> |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
13 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
14 |
/** |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
15 |
* POSIX pthread version for ThreadObject. |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
16 |
*/ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
17 |
class ThreadObject_pthread : public ThreadObject { |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
18 |
private: |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
19 |
pthread_t m_thr; ///< System thread identifier. |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
20 |
OTTDThreadFunc m_proc; ///< External thread procedure. |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
21 |
void *m_param; ///< Parameter for the external thread procedure. |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
22 |
bool m_attached; ///< True if the ThreadObject was attached to an existing thread. |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
23 |
sem_t m_sem_start; ///< Here the new thread waits before it starts. |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
24 |
sem_t m_sem_stop; ///< Here the other thread can wait for this thread to end. |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
25 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
26 |
public: |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
27 |
/** |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
28 |
* Create a pthread and start it, calling proc(param). |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
29 |
*/ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
30 |
ThreadObject_pthread(OTTDThreadFunc proc, void *param) : |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
31 |
m_thr(0), |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
32 |
m_proc(proc), |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
33 |
m_param(param), |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
34 |
m_attached(false) |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
35 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
36 |
sem_init(&m_sem_start, 0, 0); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
37 |
sem_init(&m_sem_stop, 0, 0); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
38 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
39 |
pthread_create(&m_thr, NULL, &stThreadProc, this); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
40 |
sem_post(&m_sem_start); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
41 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
42 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
43 |
/** |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
44 |
* Create a pthread and attach current thread to it. |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
45 |
*/ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
46 |
ThreadObject_pthread() : |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
47 |
m_thr(0), |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
48 |
m_proc(NULL), |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
49 |
m_param(0), |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
50 |
m_attached(true) |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
51 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
52 |
sem_init(&m_sem_start, 0, 0); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
53 |
sem_init(&m_sem_stop, 0, 0); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
54 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
55 |
m_thr = pthread_self(); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
56 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
57 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
58 |
/* virtual */ ~ThreadObject_pthread() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
59 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
60 |
sem_destroy(&m_sem_stop); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
61 |
sem_destroy(&m_sem_start); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
62 |
}; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
63 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
64 |
/* virtual */ bool IsRunning() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
65 |
{ |
10375
947e542f2bfc
(svn r12916) -Fix: let ThreadObject_pthread::IsRunning() behave the same way as ThreadObject_Win32::IsRunning() does
smatz
parents:
10175
diff
changeset
|
66 |
int sval; |
947e542f2bfc
(svn r12916) -Fix: let ThreadObject_pthread::IsRunning() behave the same way as ThreadObject_Win32::IsRunning() does
smatz
parents:
10175
diff
changeset
|
67 |
sem_getvalue(&m_sem_stop, &sval); |
947e542f2bfc
(svn r12916) -Fix: let ThreadObject_pthread::IsRunning() behave the same way as ThreadObject_Win32::IsRunning() does
smatz
parents:
10175
diff
changeset
|
68 |
return sval == 0; |
10175
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
69 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
70 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
71 |
/* virtual */ bool WaitForStop() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
72 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
73 |
/* You can't wait on yourself */ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
74 |
assert(!IsCurrent()); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
75 |
/* If the thread is not running, waiting is over */ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
76 |
if (!IsRunning()) return true; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
77 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
78 |
int ret = sem_wait(&m_sem_stop); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
79 |
if (ret == 0) { |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
80 |
/* We have passed semaphore so increment it again */ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
81 |
sem_post(&m_sem_stop); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
82 |
return true; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
83 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
84 |
return false; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
85 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
86 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
87 |
/* virtual */ bool Exit() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
88 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
89 |
/* You can only exit yourself */ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
90 |
assert(IsCurrent()); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
91 |
/* If the thread is not running, we are already closed */ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
92 |
if (!IsRunning()) return false; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
93 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
94 |
/* For now we terminate by throwing an error, gives much cleaner cleanup */ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
95 |
throw 0; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
96 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
97 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
98 |
/* virtual */ void *Join() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
99 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
100 |
/* You cannot join yourself */ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
101 |
assert(!IsCurrent()); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
102 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
103 |
void *ret; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
104 |
pthread_join(m_thr, &ret); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
105 |
m_thr = 0; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
106 |
|
10403
4925650db7ae
(svn r12945) -Fix: (small) memory leak when joining/exiting threads.
rubidium
parents:
10375
diff
changeset
|
107 |
delete this; |
4925650db7ae
(svn r12945) -Fix: (small) memory leak when joining/exiting threads.
rubidium
parents:
10375
diff
changeset
|
108 |
|
10175
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
109 |
return ret; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
110 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
111 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
112 |
/* virtual */ bool IsCurrent() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
113 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
114 |
return pthread_self() == m_thr; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
115 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
116 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
117 |
/* virtual */ uint GetId() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
118 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
119 |
return (uint)m_thr; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
120 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
121 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
122 |
private: |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
123 |
/** |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
124 |
* On thread creation, this function is called, which calls the real startup |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
125 |
* function. This to get back into the correct instance again. |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
126 |
*/ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
127 |
static void *stThreadProc(void *thr) |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
128 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
129 |
return ((ThreadObject_pthread *)thr)->ThreadProc(); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
130 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
131 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
132 |
/** |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
133 |
* A new thread is created, and this function is called. Call the custom |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
134 |
* function of the creator of the thread. |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
135 |
*/ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
136 |
void *ThreadProc() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
137 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
138 |
/* The new thread stops here so the calling thread can complete pthread_create() call */ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
139 |
sem_wait(&m_sem_start); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
140 |
|
10403
4925650db7ae
(svn r12945) -Fix: (small) memory leak when joining/exiting threads.
rubidium
parents:
10375
diff
changeset
|
141 |
/* Did this thread die naturally/via exit, or did it join? */ |
4925650db7ae
(svn r12945) -Fix: (small) memory leak when joining/exiting threads.
rubidium
parents:
10375
diff
changeset
|
142 |
bool exit = false; |
4925650db7ae
(svn r12945) -Fix: (small) memory leak when joining/exiting threads.
rubidium
parents:
10375
diff
changeset
|
143 |
|
10175
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
144 |
/* Call the proc of the creator to continue this thread */ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
145 |
try { |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
146 |
m_proc(m_param); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
147 |
} catch (...) { |
10403
4925650db7ae
(svn r12945) -Fix: (small) memory leak when joining/exiting threads.
rubidium
parents:
10375
diff
changeset
|
148 |
exit = true; |
10175
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
149 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
150 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
151 |
/* Notify threads waiting for our completion */ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
152 |
sem_post(&m_sem_stop); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
153 |
|
10403
4925650db7ae
(svn r12945) -Fix: (small) memory leak when joining/exiting threads.
rubidium
parents:
10375
diff
changeset
|
154 |
if (exit) delete this; |
4925650db7ae
(svn r12945) -Fix: (small) memory leak when joining/exiting threads.
rubidium
parents:
10375
diff
changeset
|
155 |
|
4925650db7ae
(svn r12945) -Fix: (small) memory leak when joining/exiting threads.
rubidium
parents:
10375
diff
changeset
|
156 |
pthread_exit(NULL); |
10175
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
157 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
158 |
}; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
159 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
160 |
/* static */ ThreadObject *ThreadObject::New(OTTDThreadFunc proc, void *param) |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
161 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
162 |
return new ThreadObject_pthread(proc, param); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
163 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
164 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
165 |
/* static */ ThreadObject *ThreadObject::AttachCurrent() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
166 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
167 |
return new ThreadObject_pthread(); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
168 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
169 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
170 |
/* static */ uint ThreadObject::CurrentId() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
171 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
172 |
return (uint)pthread_self(); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
173 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
174 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
175 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
176 |
/** |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
177 |
* POSIX pthread version of ThreadSemaphore. |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
178 |
*/ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
179 |
class ThreadSemaphore_pthread : public ThreadSemaphore { |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
180 |
private: |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
181 |
sem_t m_sem; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
182 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
183 |
public: |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
184 |
ThreadSemaphore_pthread() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
185 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
186 |
sem_init(&m_sem, 0, 0); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
187 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
188 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
189 |
/* virtual */ ~ThreadSemaphore_pthread() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
190 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
191 |
sem_destroy(&m_sem); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
192 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
193 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
194 |
/* virtual */ void Set() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
195 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
196 |
int val = 0; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
197 |
if (sem_getvalue(&m_sem, &val) == 0 && val == 0) sem_post(&m_sem); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
198 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
199 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
200 |
/* virtual */ void Wait() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
201 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
202 |
sem_wait(&m_sem); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
203 |
} |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
204 |
}; |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
205 |
|
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
206 |
/* static */ ThreadSemaphore *ThreadSemaphore::New() |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
207 |
{ |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
208 |
return new ThreadSemaphore_pthread(); |
1119f6640ee6
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
rubidium
parents:
diff
changeset
|
209 |
} |