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.65 by root, Tue Apr 1 19:50:38 2008 UTC vs.
Revision 1.113 by root, Fri Apr 22 02:03:11 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra 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 <support@deliantra.net> 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 DEBUG_SALLOC 0 26#include <compiler.h>
26#define PREFER_MALLOC 0
27 27
28#if __GNUC__ >= 3 28#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0
29# define is_constant(c) __builtin_constant_p (c) 29#define DEBUG_SALLOC 0 // add a debug wrapper around all sallocs
30# define expect(expr,value) __builtin_expect ((expr),(value)) 30#define PREFER_MALLOC 0 // use malloc and not the slice allocator
31# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
32#else
33# define is_constant(c) 0
34# define expect(expr,value) (expr)
35# define prefetch(addr,rw,locality)
36#endif
37 31
38#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4) 32#include <pthread.h>
39# define decltype(x) typeof(x)
40#endif
41
42// put into ifs if you are very sure that the expression
43// is mostly true or mosty false. note that these return
44// booleans, not the expression.
45#define expect_false(expr) expect ((expr) != 0, 0)
46#define expect_true(expr) expect ((expr) != 0, 1)
47 33
48#include <cstddef> 34#include <cstddef>
49#include <cmath> 35#include <cmath>
50#include <new> 36#include <new>
51#include <vector> 37#include <vector>
60# define g_slice_alloc(s) debug_slice_alloc(s) 46# define g_slice_alloc(s) debug_slice_alloc(s)
61# define g_slice_free1(s,p) debug_slice_free1(s,p) 47# define g_slice_free1(s,p) debug_slice_free1(s,p)
62void *g_slice_alloc (unsigned long size); 48void *g_slice_alloc (unsigned long size);
63void *g_slice_alloc0 (unsigned long size); 49void *g_slice_alloc0 (unsigned long size);
64void g_slice_free1 (unsigned long size, void *ptr); 50void g_slice_free1 (unsigned long size, void *ptr);
51#elif PREFER_MALLOC
52# define g_slice_alloc0(s) calloc (1, (s))
53# define g_slice_alloc(s) malloc ((s))
54# define g_slice_free1(s,p) free ((p))
65#endif 55#endif
66 56
67// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever) 57// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
68#define auto(var,expr) decltype(expr) var = (expr) 58#define auto(var,expr) decltype(expr) var = (expr)
69 59
60#if cplusplus_does_not_suck
61// does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm)
62template<typename T, int N>
63static inline int array_length (const T (&arr)[N])
64{
65 return N;
66}
67#else
68#define array_length(name) (sizeof (name) / sizeof (name [0]))
69#endif
70
70// very ugly macro that basicaly declares and initialises a variable 71// very ugly macro that basically declares and initialises a variable
71// that is in scope for the next statement only 72// that is in scope for the next statement only
72// works only for stuff that can be assigned 0 and converts to false 73// works only for stuff that can be assigned 0 and converts to false
73// (note: works great for pointers) 74// (note: works great for pointers)
74// most ugly macro I ever wrote 75// most ugly macro I ever wrote
75#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1) 76#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
80 81
81// in range excluding end 82// in range excluding end
82#define IN_RANGE_EXC(val,beg,end) \ 83#define IN_RANGE_EXC(val,beg,end) \
83 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg)) 84 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))
84 85
86void cleanup (const char *cause, bool make_core = false);
85void fork_abort (const char *msg); 87void fork_abort (const char *msg);
86 88
87// rationale for using (U) not (T) is to reduce signed/unsigned issues, 89// rationale for using (U) not (T) is to reduce signed/unsigned issues,
88// as a is often a constant while b is the variable. it is still a bug, though. 90// as a is often a constant while b is the variable. it is still a bug, though.
89template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; } 91template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; }
90template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; } 92template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; }
91template<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; } 93template<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; }
92 94
95template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); }
96template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); }
97template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); }
98
93template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; } 99template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
94 100
95template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); } 101template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }
96template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); } 102template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }
97 103
104// sign returns -1 or +1
105template<typename T>
106static inline T sign (T v) { return v < 0 ? -1 : +1; }
107// relies on 2c representation
108template<>
109inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
110template<>
111inline sint16 sign (sint16 v) { return 1 - (sint16 (uint16 (v) >> 15) * 2); }
112template<>
113inline sint32 sign (sint32 v) { return 1 - (sint32 (uint32 (v) >> 31) * 2); }
114
115// sign0 returns -1, 0 or +1
116template<typename T>
117static inline T sign0 (T v) { return v ? sign (v) : 0; }
118
119//clashes with C++0x
120template<typename T, typename U>
121static inline T copysign (T a, U b) { return a > 0 ? b : -b; }
122
123// div* only work correctly for div > 0
124// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
125template<typename T> static inline T div (T val, T div)
126{
127 return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div;
128}
129
130template<> inline float div (float val, float div) { return val / div; }
131template<> inline double div (double val, double div) { return val / div; }
132
133// div, round-up
134template<typename T> static inline T div_ru (T val, T div)
135{
136 return expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div;
137}
138// div, round-down
139template<typename T> static inline T div_rd (T val, T div)
140{
141 return expect_false (val < 0) ? - ((-val + (div - 1) ) / div) : (val ) / div;
142}
143
144// lerp* only work correctly for min_in < max_in
145// Linear intERPolate, scales val from min_in..max_in to min_out..max_out
98template<typename T> 146template<typename T>
99static inline T 147static inline T
100lerp (T val, T min_in, T max_in, T min_out, T max_out) 148lerp (T val, T min_in, T max_in, T min_out, T max_out)
101{ 149{
102 return (val - min_in) * (max_out - min_out) / (max_in - min_in) + min_out; 150 return min_out + div <T> ((val - min_in) * (max_out - min_out), max_in - min_in);
151}
152
153// lerp, round-down
154template<typename T>
155static inline T
156lerp_rd (T val, T min_in, T max_in, T min_out, T max_out)
157{
158 return min_out + div_rd<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
159}
160
161// lerp, round-up
162template<typename T>
163static inline T
164lerp_ru (T val, T min_in, T max_in, T min_out, T max_out)
165{
166 return min_out + div_ru<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
103} 167}
104 168
105// lots of stuff taken from FXT 169// lots of stuff taken from FXT
106 170
107/* Rotate right. This is used in various places for checksumming */ 171/* Rotate right. This is used in various places for checksumming */
145 int32_t d = b - a; 209 int32_t d = b - a;
146 d &= d >> 31; 210 d &= d >> 31;
147 return b - d; 211 return b - d;
148} 212}
149 213
150// this is much faster than crossfires original algorithm 214// this is much faster than crossfire's original algorithm
151// on modern cpus 215// on modern cpus
152inline int 216inline int
153isqrt (int n) 217isqrt (int n)
154{ 218{
155 return (int)sqrtf ((float)n); 219 return (int)sqrtf ((float)n);
220}
221
222// this is kind of like the ^^ operator, if it would exist, without sequence point.
223// more handy than it looks like, due to the implicit !! done on its arguments
224inline bool
225logical_xor (bool a, bool b)
226{
227 return a != b;
228}
229
230inline bool
231logical_implies (bool a, bool b)
232{
233 return a <= b;
156} 234}
157 235
158// this is only twice as fast as naive sqrtf (dx*dy+dy*dy) 236// this is only twice as fast as naive sqrtf (dx*dy+dy*dy)
159#if 0 237#if 0
160// and has a max. error of 6 in the range -100..+100. 238// and has a max. error of 6 in the range -100..+100.
185absdir (int d) 263absdir (int d)
186{ 264{
187 return ((d - 1) & 7) + 1; 265 return ((d - 1) & 7) + 1;
188} 266}
189 267
268// avoid ctz name because netbsd or freebsd spams it's namespace with it
269#if GCC_VERSION(3,4)
270static inline int least_significant_bit (uint32_t x)
271{
272 return __builtin_ctz (x);
273}
274#else
275int least_significant_bit (uint32_t x);
276#endif
277
278#define for_all_bits_sparse_32(mask, idxvar) \
279 for (uint32_t idxvar, mask_ = mask; \
280 mask_ && ((idxvar = least_significant_bit (mask_)), mask_ &= ~(1 << idxvar), 1);)
281
190extern size_t slice_alloc; // statistics 282extern ssize_t slice_alloc; // statistics
283
284void *salloc_ (int n) throw (std::bad_alloc);
285void *salloc_ (int n, void *src) throw (std::bad_alloc);
286
287// strictly the same as g_slice_alloc, but never returns 0
288template<typename T>
289inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
290
291// also copies src into the new area, like "memdup"
292// if src is 0, clears the memory
293template<typename T>
294inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
295
296// clears the memory
297template<typename T>
298inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
299
300// for symmetry
301template<typename T>
302inline void sfree (T *ptr, int n = 1) throw ()
303{
304 if (expect_true (ptr))
305 {
306 slice_alloc -= n * sizeof (T);
307 if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
308 g_slice_free1 (n * sizeof (T), (void *)ptr);
309 assert (slice_alloc >= 0);//D
310 }
311}
312
313// nulls the pointer
314template<typename T>
315inline void sfree0 (T *&ptr, int n = 1) throw ()
316{
317 sfree<T> (ptr, n);
318 ptr = 0;
319}
191 320
192// makes dynamically allocated objects zero-initialised 321// makes dynamically allocated objects zero-initialised
193struct zero_initialised 322struct zero_initialised
194{ 323{
195 void *operator new (size_t s, void *p) 324 void *operator new (size_t s, void *p)
198 return p; 327 return p;
199 } 328 }
200 329
201 void *operator new (size_t s) 330 void *operator new (size_t s)
202 { 331 {
203 slice_alloc += s;
204 return g_slice_alloc0 (s); 332 return salloc0<char> (s);
205 } 333 }
206 334
207 void *operator new[] (size_t s) 335 void *operator new[] (size_t s)
208 { 336 {
209 slice_alloc += s;
210 return g_slice_alloc0 (s); 337 return salloc0<char> (s);
211 } 338 }
212 339
213 void operator delete (void *p, size_t s) 340 void operator delete (void *p, size_t s)
214 { 341 {
215 slice_alloc -= s; 342 sfree ((char *)p, s);
216 g_slice_free1 (s, p);
217 } 343 }
218 344
219 void operator delete[] (void *p, size_t s) 345 void operator delete[] (void *p, size_t s)
220 { 346 {
221 slice_alloc -= s; 347 sfree ((char *)p, s);
222 g_slice_free1 (s, p);
223 } 348 }
224}; 349};
225 350
226void *salloc_ (int n) throw (std::bad_alloc); 351// makes dynamically allocated objects zero-initialised
227void *salloc_ (int n, void *src) throw (std::bad_alloc); 352struct slice_allocated
228
229// strictly the same as g_slice_alloc, but never returns 0
230template<typename T>
231inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
232
233// also copies src into the new area, like "memdup"
234// if src is 0, clears the memory
235template<typename T>
236inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
237
238// clears the memory
239template<typename T>
240inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
241
242// for symmetry
243template<typename T>
244inline void sfree (T *ptr, int n = 1) throw ()
245{ 353{
246#if PREFER_MALLOC 354 void *operator new (size_t s, void *p)
247 free (ptr); 355 {
248#else 356 return p;
249 slice_alloc -= n * sizeof (T); 357 }
250 g_slice_free1 (n * sizeof (T), (void *)ptr); 358
251#endif 359 void *operator new (size_t s)
252} 360 {
361 return salloc<char> (s);
362 }
363
364 void *operator new[] (size_t s)
365 {
366 return salloc<char> (s);
367 }
368
369 void operator delete (void *p, size_t s)
370 {
371 sfree ((char *)p, s);
372 }
373
374 void operator delete[] (void *p, size_t s)
375 {
376 sfree ((char *)p, s);
377 }
378};
253 379
254// a STL-compatible allocator that uses g_slice 380// a STL-compatible allocator that uses g_slice
255// boy, this is verbose 381// boy, this is verbose
256template<typename Tp> 382template<typename Tp>
257struct slice_allocator 383struct slice_allocator
304 { 430 {
305 p->~Tp (); 431 p->~Tp ();
306 } 432 }
307}; 433};
308 434
309// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213.
310// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps
311// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
312struct tausworthe_random_generator
313{
314 // generator
315 uint32_t state [4];
316
317 void operator =(const tausworthe_random_generator &src)
318 {
319 state [0] = src.state [0];
320 state [1] = src.state [1];
321 state [2] = src.state [2];
322 state [3] = src.state [3];
323 }
324
325 void seed (uint32_t seed);
326 uint32_t next ();
327
328 // uniform distribution
329 uint32_t operator ()(uint32_t num)
330 {
331 return is_constant (num)
332 ? (next () * (uint64_t)num) >> 32U
333 : get_range (num);
334 }
335
336 // return a number within (min .. max)
337 int operator () (int r_min, int r_max)
338 {
339 return is_constant (r_min) && is_constant (r_max) && r_min <= r_max
340 ? r_min + operator ()(r_max - r_min + 1)
341 : get_range (r_min, r_max);
342 }
343
344 double operator ()()
345 {
346 return this->next () / (double)0xFFFFFFFFU;
347 }
348
349protected:
350 uint32_t get_range (uint32_t r_max);
351 int get_range (int r_min, int r_max);
352};
353
354typedef tausworthe_random_generator rand_gen;
355
356extern rand_gen rndm;
357
358INTERFACE_CLASS (attachable) 435INTERFACE_CLASS (attachable)
359struct refcnt_base 436struct refcnt_base
360{ 437{
361 typedef int refcnt_t; 438 typedef int refcnt_t;
362 mutable refcnt_t ACC (RW, refcnt); 439 mutable refcnt_t ACC (RW, refcnt);
423typedef refptr<maptile> maptile_ptr; 500typedef refptr<maptile> maptile_ptr;
424typedef refptr<object> object_ptr; 501typedef refptr<object> object_ptr;
425typedef refptr<archetype> arch_ptr; 502typedef refptr<archetype> arch_ptr;
426typedef refptr<client> client_ptr; 503typedef refptr<client> client_ptr;
427typedef refptr<player> player_ptr; 504typedef refptr<player> player_ptr;
505typedef refptr<region> region_ptr;
506
507#define STRHSH_NULL 2166136261
508
509static inline uint32_t
510strhsh (const char *s)
511{
512 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
513 // it is about twice as fast as the one-at-a-time one,
514 // with good distribution.
515 // FNV-1a is faster on many cpus because the multiplication
516 // runs concurrently with the looping logic.
517 // we modify the hash a bit to improve its distribution
518 uint32_t hash = STRHSH_NULL;
519
520 while (*s)
521 hash = (hash ^ *s++) * 16777619U;
522
523 return hash ^ (hash >> 16);
524}
525
526static inline uint32_t
527memhsh (const char *s, size_t len)
528{
529 uint32_t hash = STRHSH_NULL;
530
531 while (len--)
532 hash = (hash ^ *s++) * 16777619U;
533
534 return hash;
535}
428 536
429struct str_hash 537struct str_hash
430{ 538{
431 std::size_t operator ()(const char *s) const 539 std::size_t operator ()(const char *s) const
432 { 540 {
433 unsigned long hash = 0;
434
435 /* use the one-at-a-time hash function, which supposedly is
436 * better than the djb2-like one used by perl5.005, but
437 * certainly is better then the bug used here before.
438 * see http://burtleburtle.net/bob/hash/doobs.html
439 */
440 while (*s)
441 {
442 hash += *s++;
443 hash += hash << 10;
444 hash ^= hash >> 6;
445 }
446
447 hash += hash << 3;
448 hash ^= hash >> 11;
449 hash += hash << 15;
450
451 return hash; 541 return strhsh (s);
542 }
543
544 std::size_t operator ()(const shstr &s) const
545 {
546 return strhsh (s);
452 } 547 }
453}; 548};
454 549
455struct str_equal 550struct str_equal
456{ 551{
548 { 643 {
549 erase (&obj); 644 erase (&obj);
550 } 645 }
551}; 646};
552 647
648/////////////////////////////////////////////////////////////////////////////
649
650// something like a vector or stack, but without
651// out of bounds checking
652template<typename T>
653struct fixed_stack
654{
655 T *data;
656 int size;
657 int max;
658
659 fixed_stack ()
660 : size (0), data (0)
661 {
662 }
663
664 fixed_stack (int max)
665 : size (0), max (max)
666 {
667 data = salloc<T> (max);
668 }
669
670 void reset (int new_max)
671 {
672 sfree (data, max);
673 size = 0;
674 max = new_max;
675 data = salloc<T> (max);
676 }
677
678 void free ()
679 {
680 sfree (data, max);
681 data = 0;
682 }
683
684 ~fixed_stack ()
685 {
686 sfree (data, max);
687 }
688
689 T &operator[](int idx)
690 {
691 return data [idx];
692 }
693
694 void push (T v)
695 {
696 data [size++] = v;
697 }
698
699 T &pop ()
700 {
701 return data [--size];
702 }
703
704 T remove (int idx)
705 {
706 T v = data [idx];
707
708 data [idx] = data [--size];
709
710 return v;
711 }
712};
713
714/////////////////////////////////////////////////////////////////////////////
715
553// basically does what strncpy should do, but appends "..." to strings exceeding length 716// basically does what strncpy should do, but appends "..." to strings exceeding length
717// returns the number of bytes actually used (including \0)
554void assign (char *dst, const char *src, int maxlen); 718int assign (char *dst, const char *src, int maxsize);
555 719
556// type-safe version of assign 720// type-safe version of assign
557template<int N> 721template<int N>
558inline void assign (char (&dst)[N], const char *src) 722inline int assign (char (&dst)[N], const char *src)
559{ 723{
560 assign ((char *)&dst, src, N); 724 return assign ((char *)&dst, src, N);
561} 725}
562 726
563typedef double tstamp; 727typedef double tstamp;
564 728
565// return current time as timestamp 729// return current time as timestamp
566tstamp now (); 730tstamp now ();
567 731
568int similar_direction (int a, int b); 732int similar_direction (int a, int b);
569 733
570// like sprintf, but returns a "static" buffer 734// like v?sprintf, but returns a "static" buffer
571const char *format (const char *format, ...); 735char *vformat (const char *format, va_list ap);
736char *format (const char *format, ...) attribute ((format (printf, 1, 2)));
572 737
738// safety-check player input which will become object->msg
739bool msg_is_safe (const char *msg);
740
741/////////////////////////////////////////////////////////////////////////////
742// threads, very very thin wrappers around pthreads
743
744struct thread
745{
746 pthread_t id;
747
748 void start (void *(*start_routine)(void *), void *arg = 0);
749
750 void cancel ()
751 {
752 pthread_cancel (id);
753 }
754
755 void *join ()
756 {
757 void *ret;
758
759 if (pthread_join (id, &ret))
760 cleanup ("pthread_join failed", 1);
761
762 return ret;
763 }
764};
765
766// note that mutexes are not classes
767typedef pthread_mutex_t smutex;
768
769#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
770 #define SMUTEX_INITIALISER PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
771#else
772 #define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER
573#endif 773#endif
574 774
775#define SMUTEX(name) smutex name = SMUTEX_INITIALISER
776#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))
777#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))
778
779typedef pthread_cond_t scond;
780
781#define SCOND(name) scond name = PTHREAD_COND_INITIALIZER
782#define SCOND_SIGNAL(name) pthread_cond_signal (&(name))
783#define SCOND_BROADCAST(name) pthread_cond_broadcast (&(name))
784#define SCOND_WAIT(name,mutex) pthread_cond_wait (&(name), &(mutex))
785
786#endif
787

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines