ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/util.h
(Generate patch)

Comparing deliantra/server/include/util.h (file contents):
Revision 1.54 by root, Mon Aug 6 10:54:12 2007 UTC vs.
Revision 1.92 by root, Tue Oct 20 05:57:08 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Crossfire TRT is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
8 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * (at your option) any later version. 9 * option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
18 * 19 *
19 * The authors can be reached via e-mail to <crossfire@schmorp.de> 20 * The authors can be reached via e-mail to <support@deliantra.net>
20 */ 21 */
21 22
22#ifndef UTIL_H__ 23#ifndef UTIL_H__
23#define UTIL_H__ 24#define UTIL_H__
24 25
25//#define PREFER_MALLOC 26#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0
27#define DEBUG_SALLOC 0 // add a debug wrapper around all sallocs
28#define PREFER_MALLOC 0 // use malloc and not the slice allocator
26 29
27#if __GNUC__ >= 3 30#if __GNUC__ >= 3
28# define is_constant(c) __builtin_constant_p (c) 31# define is_constant(c) __builtin_constant_p (c)
29# define expect(expr,value) __builtin_expect ((expr),(value)) 32# define expect(expr,value) __builtin_expect ((expr),(value))
30# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) 33# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
34# define noinline __attribute__((__noinline__))
31#else 35#else
32# define is_constant(c) 0 36# define is_constant(c) 0
33# define expect(expr,value) (expr) 37# define expect(expr,value) (expr)
34# define prefetch(addr,rw,locality) 38# define prefetch(addr,rw,locality)
39# define noinline
35#endif 40#endif
36 41
37#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4) 42#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4)
38# define decltype(x) typeof(x) 43# define decltype(x) typeof(x)
39#endif 44#endif
40 45
41// put into ifs if you are very sure that the expression 46// put into ifs if you are very sure that the expression
42// is mostly true or mosty false. note that these return 47// is mostly true or mosty false. note that these return
43// booleans, not the expression. 48// booleans, not the expression.
44#define expect_false(expr) expect ((expr) != 0, 0) 49#define expect_false(expr) expect ((expr) ? 1 : 0, 0)
45#define expect_true(expr) expect ((expr) != 0, 1) 50#define expect_true(expr) expect ((expr) ? 1 : 0, 1)
51
52#include <pthread.h>
46 53
47#include <cstddef> 54#include <cstddef>
48#include <cmath> 55#include <cmath>
49#include <new> 56#include <new>
50#include <vector> 57#include <vector>
… …
52#include <glib.h> 59#include <glib.h>
53 60
54#include <shstr.h> 61#include <shstr.h>
55#include <traits.h> 62#include <traits.h>
56 63
64#if DEBUG_SALLOC
65# define g_slice_alloc0(s) debug_slice_alloc0(s)
66# define g_slice_alloc(s) debug_slice_alloc(s)
67# define g_slice_free1(s,p) debug_slice_free1(s,p)
68void *g_slice_alloc (unsigned long size);
69void *g_slice_alloc0 (unsigned long size);
70void g_slice_free1 (unsigned long size, void *ptr);
71#elif PREFER_MALLOC
72# define g_slice_alloc0(s) calloc (1, (s))
73# define g_slice_alloc(s) malloc ((s))
74# define g_slice_free1(s,p) free ((p))
75#endif
76
57// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever) 77// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
58#define auto(var,expr) decltype(expr) var = (expr) 78#define auto(var,expr) decltype(expr) var = (expr)
59 79
60// very ugly macro that basicaly declares and initialises a variable 80// very ugly macro that basically declares and initialises a variable
61// that is in scope for the next statement only 81// that is in scope for the next statement only
62// works only for stuff that can be assigned 0 and converts to false 82// works only for stuff that can be assigned 0 and converts to false
63// (note: works great for pointers) 83// (note: works great for pointers)
64// most ugly macro I ever wrote 84// most ugly macro I ever wrote
65#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1) 85#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
… …
70 90
71// in range excluding end 91// in range excluding end
72#define IN_RANGE_EXC(val,beg,end) \ 92#define IN_RANGE_EXC(val,beg,end) \
73 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg)) 93 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))
74 94
95void cleanup (const char *cause, bool make_core = false);
75void fork_abort (const char *msg); 96void fork_abort (const char *msg);
76 97
77// rationale for using (U) not (T) is to reduce signed/unsigned issues, 98// rationale for using (U) not (T) is to reduce signed/unsigned issues,
78// as a is often a constant while b is the variable. it is still a bug, though. 99// as a is often a constant while b is the variable. it is still a bug, though.
79template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; } 100template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; }
80template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; } 101template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; }
81template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? (T)a : v >(T)b ? (T)b : v; } 102template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? (T)a : v >(T)b ? (T)b : v; }
82 103
104template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); }
105template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); }
106template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); }
107
83template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; } 108template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
84 109
110template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }
111template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }
112
113// sign returns -1 or +1
114template<typename T>
115static inline T sign (T v) { return v < 0 ? -1 : +1; }
116// relies on 2c representation
117template<>
118inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
119
120// sign0 returns -1, 0 or +1
121template<typename T>
122static inline T sign0 (T v) { return v ? sign (v) : 0; }
123
124// div* only work correctly for div > 0
125// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
126template<typename T> static inline T div (T val, T div)
127{
128 return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div;
129}
130// div, round-up
131template<typename T> static inline T div_ru (T val, T div)
132{
133 return expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div;
134}
135// div, round-down
136template<typename T> static inline T div_rd (T val, T div)
137{
138 return expect_false (val < 0) ? - ((-val + (div - 1) ) / div) : (val ) / div;
139}
140
141// lerp* only work correctly for min_in < max_in
142// Linear intERPolate, scales val from min_in..max_in to min_out..max_out
85template<typename T> 143template<typename T>
86static inline T 144static inline T
87lerp (T val, T min_in, T max_in, T min_out, T max_out) 145lerp (T val, T min_in, T max_in, T min_out, T max_out)
88{ 146{
89 return (val - min_in) * (max_out - min_out) / (max_in - min_in) + min_out; 147 return min_out + div <T> ((val - min_in) * (max_out - min_out), max_in - min_in);
148}
149
150// lerp, round-down
151template<typename T>
152static inline T
153lerp_rd (T val, T min_in, T max_in, T min_out, T max_out)
154{
155 return min_out + div_rd<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
156}
157
158// lerp, round-up
159template<typename T>
160static inline T
161lerp_ru (T val, T min_in, T max_in, T min_out, T max_out)
162{
163 return min_out + div_ru<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
90} 164}
91 165
92// lots of stuff taken from FXT 166// lots of stuff taken from FXT
93 167
94/* Rotate right. This is used in various places for checksumming */ 168/* Rotate right. This is used in various places for checksumming */
… …
138// on modern cpus 212// on modern cpus
139inline int 213inline int
140isqrt (int n) 214isqrt (int n)
141{ 215{
142 return (int)sqrtf ((float)n); 216 return (int)sqrtf ((float)n);
217}
218
219// this is kind of like the ^^ operator, if it would exist, without sequence point.
220// more handy than it looks like, due to the implicit !! done on its arguments
221inline bool
222logical_xor (bool a, bool b)
223{
224 return a != b;
225}
226
227inline bool
228logical_implies (bool a, bool b)
229{
230 return a <= b;
143} 231}
144 232
145// this is only twice as fast as naive sqrtf (dx*dy+dy*dy) 233// this is only twice as fast as naive sqrtf (dx*dy+dy*dy)
146#if 0 234#if 0
147// and has a max. error of 6 in the range -100..+100. 235// and has a max. error of 6 in the range -100..+100.
… …
172absdir (int d) 260absdir (int d)
173{ 261{
174 return ((d - 1) & 7) + 1; 262 return ((d - 1) & 7) + 1;
175} 263}
176 264
265extern ssize_t slice_alloc; // statistics
266
267void *salloc_ (int n) throw (std::bad_alloc);
268void *salloc_ (int n, void *src) throw (std::bad_alloc);
269
270// strictly the same as g_slice_alloc, but never returns 0
271template<typename T>
272inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
273
274// also copies src into the new area, like "memdup"
275// if src is 0, clears the memory
276template<typename T>
277inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
278
279// clears the memory
280template<typename T>
281inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
282
283// for symmetry
284template<typename T>
285inline void sfree (T *ptr, int n = 1) throw ()
286{
287 if (expect_true (ptr))
288 {
289 slice_alloc -= n * sizeof (T);
290 if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
291 g_slice_free1 (n * sizeof (T), (void *)ptr);
292 assert (slice_alloc >= 0);//D
293 }
294}
295
296// nulls the pointer
297template<typename T>
298inline void sfree0 (T *&ptr, int n = 1) throw ()
299{
300 sfree<T> (ptr, n);
301 ptr = 0;
302}
303
177// makes dynamically allocated objects zero-initialised 304// makes dynamically allocated objects zero-initialised
178struct zero_initialised 305struct zero_initialised
179{ 306{
180 void *operator new (size_t s, void *p) 307 void *operator new (size_t s, void *p)
181 { 308 {
… …
183 return p; 310 return p;
184 } 311 }
185 312
186 void *operator new (size_t s) 313 void *operator new (size_t s)
187 { 314 {
188 return g_slice_alloc0 (s); 315 return salloc0<char> (s);
189 } 316 }
190 317
191 void *operator new[] (size_t s) 318 void *operator new[] (size_t s)
192 { 319 {
193 return g_slice_alloc0 (s); 320 return salloc0<char> (s);
194 } 321 }
195 322
196 void operator delete (void *p, size_t s) 323 void operator delete (void *p, size_t s)
197 { 324 {
198 g_slice_free1 (s, p); 325 sfree ((char *)p, s);
199 } 326 }
200 327
201 void operator delete[] (void *p, size_t s) 328 void operator delete[] (void *p, size_t s)
202 { 329 {
203 g_slice_free1 (s, p); 330 sfree ((char *)p, s);
204 } 331 }
205}; 332};
206 333
207void *salloc_ (int n) throw (std::bad_alloc); 334// makes dynamically allocated objects zero-initialised
208void *salloc_ (int n, void *src) throw (std::bad_alloc); 335struct slice_allocated
209
210// strictly the same as g_slice_alloc, but never returns 0
211template<typename T>
212inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
213
214// also copies src into the new area, like "memdup"
215// if src is 0, clears the memory
216template<typename T>
217inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
218
219// clears the memory
220template<typename T>
221inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
222
223// for symmetry
224template<typename T>
225inline void sfree (T *ptr, int n = 1) throw ()
226{ 336{
227#ifdef PREFER_MALLOC 337 void *operator new (size_t s, void *p)
228 free (ptr); 338 {
229#else 339 return p;
230 g_slice_free1 (n * sizeof (T), (void *)ptr); 340 }
231#endif 341
232} 342 void *operator new (size_t s)
343 {
344 return salloc<char> (s);
345 }
346
347 void *operator new[] (size_t s)
348 {
349 return salloc<char> (s);
350 }
351
352 void operator delete (void *p, size_t s)
353 {
354 sfree ((char *)p, s);
355 }
356
357 void operator delete[] (void *p, size_t s)
358 {
359 sfree ((char *)p, s);
360 }
361};
233 362
234// a STL-compatible allocator that uses g_slice 363// a STL-compatible allocator that uses g_slice
235// boy, this is verbose 364// boy, this is verbose
236template<typename Tp> 365template<typename Tp>
237struct slice_allocator 366struct slice_allocator
… …
249 { 378 {
250 typedef slice_allocator<U> other; 379 typedef slice_allocator<U> other;
251 }; 380 };
252 381
253 slice_allocator () throw () { } 382 slice_allocator () throw () { }
254 slice_allocator (const slice_allocator &o) throw () { } 383 slice_allocator (const slice_allocator &) throw () { }
255 template<typename Tp2> 384 template<typename Tp2>
256 slice_allocator (const slice_allocator<Tp2> &) throw () { } 385 slice_allocator (const slice_allocator<Tp2> &) throw () { }
257 386
258 ~slice_allocator () { } 387 ~slice_allocator () { }
259 388
… …
268 void deallocate (pointer p, size_type n) 397 void deallocate (pointer p, size_type n)
269 { 398 {
270 sfree<Tp> (p, n); 399 sfree<Tp> (p, n);
271 } 400 }
272 401
273 size_type max_size ()const throw () 402 size_type max_size () const throw ()
274 { 403 {
275 return size_t (-1) / sizeof (Tp); 404 return size_t (-1) / sizeof (Tp);
276 } 405 }
277 406
278 void construct (pointer p, const Tp &val) 407 void construct (pointer p, const Tp &val)
… …
289// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213. 418// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213.
290// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps 419// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps
291// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps 420// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
292struct tausworthe_random_generator 421struct tausworthe_random_generator
293{ 422{
294 // generator
295 uint32_t state [4]; 423 uint32_t state [4];
296 424
297 void operator =(const tausworthe_random_generator &src) 425 void operator =(const tausworthe_random_generator &src)
298 { 426 {
299 state [0] = src.state [0]; 427 state [0] = src.state [0];
… …
302 state [3] = src.state [3]; 430 state [3] = src.state [3];
303 } 431 }
304 432
305 void seed (uint32_t seed); 433 void seed (uint32_t seed);
306 uint32_t next (); 434 uint32_t next ();
435};
307 436
308 // uniform distribution 437// Xorshift RNGs, George Marsaglia
438// http://www.jstatsoft.org/v08/i14/paper
439// this one is about 40% faster than the tausworthe one above (i.e. not much),
440// despite the inlining, and has the issue of only creating 2**32-1 numbers.
441// see also http://www.iro.umontreal.ca/~lecuyer/myftp/papers/xorshift.pdf
442struct xorshift_random_generator
443{
444 uint32_t x, y;
445
446 void operator =(const xorshift_random_generator &src)
447 {
448 x = src.x;
449 y = src.y;
450 }
451
452 void seed (uint32_t seed)
453 {
454 x = seed;
455 y = seed * 69069U;
456 }
457
458 uint32_t next ()
459 {
460 uint32_t t = x ^ (x << 10);
461 x = y;
462 y = y ^ (y >> 13) ^ t ^ (t >> 10);
463 return y;
464 }
465};
466
467template<class generator>
468struct random_number_generator : generator
469{
470 // uniform distribution, 0 .. max (0, num - 1)
309 uint32_t operator ()(uint32_t num) 471 uint32_t operator ()(uint32_t num)
310 { 472 {
311 return is_constant (num) 473 return !is_constant (num) ? get_range (num) // non-constant
312 ? (next () * (uint64_t)num) >> 32U 474 : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
313 : get_range (num); 475 : this->next () & (num - 1); // constant, power-of-two
314 } 476 }
315 477
316 // return a number within (min .. max) 478 // return a number within (min .. max)
317 int operator () (int r_min, int r_max) 479 int operator () (int r_min, int r_max)
318 { 480 {
… …
329protected: 491protected:
330 uint32_t get_range (uint32_t r_max); 492 uint32_t get_range (uint32_t r_max);
331 int get_range (int r_min, int r_max); 493 int get_range (int r_min, int r_max);
332}; 494};
333 495
334typedef tausworthe_random_generator rand_gen; 496typedef random_number_generator<tausworthe_random_generator> rand_gen;
335 497
336extern rand_gen rndm; 498extern rand_gen rndm, rmg_rndm;
337 499
338INTERFACE_CLASS (attachable) 500INTERFACE_CLASS (attachable)
339struct refcnt_base 501struct refcnt_base
340{ 502{
341 typedef int refcnt_t; 503 typedef int refcnt_t;
… …
345 MTH void refcnt_dec () const { --refcnt; } 507 MTH void refcnt_dec () const { --refcnt; }
346 508
347 refcnt_base () : refcnt (0) { } 509 refcnt_base () : refcnt (0) { }
348}; 510};
349 511
512// to avoid branches with more advanced compilers
350extern refcnt_base::refcnt_t refcnt_dummy; 513extern refcnt_base::refcnt_t refcnt_dummy;
351 514
352template<class T> 515template<class T>
353struct refptr 516struct refptr
354{ 517{
… …
407 570
408struct str_hash 571struct str_hash
409{ 572{
410 std::size_t operator ()(const char *s) const 573 std::size_t operator ()(const char *s) const
411 { 574 {
412 unsigned long hash = 0; 575#if 0
576 uint32_t hash = 0;
413 577
414 /* use the one-at-a-time hash function, which supposedly is 578 /* use the one-at-a-time hash function, which supposedly is
415 * better than the djb2-like one used by perl5.005, but 579 * better than the djb2-like one used by perl5.005, but
416 * certainly is better then the bug used here before. 580 * certainly is better then the bug used here before.
417 * see http://burtleburtle.net/bob/hash/doobs.html 581 * see http://burtleburtle.net/bob/hash/doobs.html
… …
424 } 588 }
425 589
426 hash += hash << 3; 590 hash += hash << 3;
427 hash ^= hash >> 11; 591 hash ^= hash >> 11;
428 hash += hash << 15; 592 hash += hash << 15;
593#else
594 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
595 // it is about twice as fast as the one-at-a-time one,
596 // with good distribution.
597 // FNV-1a is faster on many cpus because the multiplication
598 // runs concurrent with the looping logic.
599 uint32_t hash = 2166136261;
600
601 while (*s)
602 hash = (hash ^ *s++) * 16777619;
603#endif
429 604
430 return hash; 605 return hash;
431 } 606 }
432}; 607};
433 608
… …
528 erase (&obj); 703 erase (&obj);
529 } 704 }
530}; 705};
531 706
532// basically does what strncpy should do, but appends "..." to strings exceeding length 707// basically does what strncpy should do, but appends "..." to strings exceeding length
708// returns the number of bytes actually used (including \0)
533void assign (char *dst, const char *src, int maxlen); 709int assign (char *dst, const char *src, int maxsize);
534 710
535// type-safe version of assign 711// type-safe version of assign
536template<int N> 712template<int N>
537inline void assign (char (&dst)[N], const char *src) 713inline int assign (char (&dst)[N], const char *src)
538{ 714{
539 assign ((char *)&dst, src, N); 715 return assign ((char *)&dst, src, N);
540} 716}
541 717
542typedef double tstamp; 718typedef double tstamp;
543 719
544// return current time as timestampe 720// return current time as timestamp
545tstamp now (); 721tstamp now ();
546 722
547int similar_direction (int a, int b); 723int similar_direction (int a, int b);
548 724
549// like printf, but returns a std::string 725// like v?sprintf, but returns a "static" buffer
726char *vformat (const char *format, va_list ap);
550const std::string format (const char *format, ...); 727char *format (const char *format, ...);
551 728
729// safety-check player input which will become object->msg
730bool msg_is_safe (const char *msg);
731
732/////////////////////////////////////////////////////////////////////////////
733// threads, very very thin wrappers around pthreads
734
735struct thread
736{
737 pthread_t id;
738
739 void start (void *(*start_routine)(void *), void *arg = 0);
740
741 void cancel ()
742 {
743 pthread_cancel (id);
744 }
745
746 void *join ()
747 {
748 void *ret;
749
750 if (pthread_join (id, &ret))
751 cleanup ("pthread_join failed", 1);
752
753 return ret;
754 }
755};
756
757// note that mutexes are not classes
758typedef pthread_mutex_t smutex;
759
760#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
761 #define SMUTEX_INITIALISER PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
762#else
763 #define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER
552#endif 764#endif
553 765
766#define SMUTEX(name) smutex name = SMUTEX_INITIALISER
767#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))
768#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))
769
770typedef pthread_cond_t scond;
771
772#define SCOND(name) scond name = PTHREAD_COND_INITIALIZER
773#define SCOND_SIGNAL(name) pthread_cond_signal (&(name))
774#define SCOND_BROADCAST(name) pthread_cond_broadcast (&(name))
775#define SCOND_WAIT(name,mutex) pthread_cond_wait (&(name), &(mutex))
776
777#endif
778

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines