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.62 by root, Fri Jan 25 18:13:57 2008 UTC vs.
Revision 1.95 by root, Tue Nov 10 00:01:31 2009 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 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 PREFER_MALLOC 26#include <compiler.h>
26#define DEBUG_SALLOC
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>
53#include <glib.h> 39#include <glib.h>
54 40
55#include <shstr.h> 41#include <shstr.h>
56#include <traits.h> 42#include <traits.h>
57 43
58#ifdef DEBUG_SALLOC 44#if DEBUG_SALLOC
59# define g_slice_alloc0(s) debug_slice_alloc0(s) 45# define g_slice_alloc0(s) debug_slice_alloc0(s)
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
70// very ugly macro that basicaly declares and initialises a variable 60// very ugly macro that basically declares and initialises a variable
71// that is in scope for the next statement only 61// that is in scope for the next statement only
72// works only for stuff that can be assigned 0 and converts to false 62// works only for stuff that can be assigned 0 and converts to false
73// (note: works great for pointers) 63// (note: works great for pointers)
74// most ugly macro I ever wrote 64// most ugly macro I ever wrote
75#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1) 65#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
80 70
81// in range excluding end 71// in range excluding end
82#define IN_RANGE_EXC(val,beg,end) \ 72#define IN_RANGE_EXC(val,beg,end) \
83 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg)) 73 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))
84 74
75void cleanup (const char *cause, bool make_core = false);
85void fork_abort (const char *msg); 76void fork_abort (const char *msg);
86 77
87// rationale for using (U) not (T) is to reduce signed/unsigned issues, 78// 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. 79// 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; } 80template<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; } 81template<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; } 82template<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 83
84template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); }
85template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); }
86template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); }
87
93template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; } 88template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
94 89
90template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }
91template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }
92
93// sign returns -1 or +1
94template<typename T>
95static inline T sign (T v) { return v < 0 ? -1 : +1; }
96// relies on 2c representation
97template<>
98inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
99
100// sign0 returns -1, 0 or +1
101template<typename T>
102static inline T sign0 (T v) { return v ? sign (v) : 0; }
103
104// div* only work correctly for div > 0
105// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
106template<typename T> static inline T div (T val, T div)
107{
108 return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div;
109}
110// div, round-up
111template<typename T> static inline T div_ru (T val, T div)
112{
113 return expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div;
114}
115// div, round-down
116template<typename T> static inline T div_rd (T val, T div)
117{
118 return expect_false (val < 0) ? - ((-val + (div - 1) ) / div) : (val ) / div;
119}
120
121// lerp* only work correctly for min_in < max_in
122// Linear intERPolate, scales val from min_in..max_in to min_out..max_out
95template<typename T> 123template<typename T>
96static inline T 124static inline T
97lerp (T val, T min_in, T max_in, T min_out, T max_out) 125lerp (T val, T min_in, T max_in, T min_out, T max_out)
98{ 126{
99 return (val - min_in) * (max_out - min_out) / (max_in - min_in) + min_out; 127 return min_out + div <T> ((val - min_in) * (max_out - min_out), max_in - min_in);
128}
129
130// lerp, round-down
131template<typename T>
132static inline T
133lerp_rd (T val, T min_in, T max_in, T min_out, T max_out)
134{
135 return min_out + div_rd<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
136}
137
138// lerp, round-up
139template<typename T>
140static inline T
141lerp_ru (T val, T min_in, T max_in, T min_out, T max_out)
142{
143 return min_out + div_ru<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
100} 144}
101 145
102// lots of stuff taken from FXT 146// lots of stuff taken from FXT
103 147
104/* Rotate right. This is used in various places for checksumming */ 148/* Rotate right. This is used in various places for checksumming */
142 int32_t d = b - a; 186 int32_t d = b - a;
143 d &= d >> 31; 187 d &= d >> 31;
144 return b - d; 188 return b - d;
145} 189}
146 190
147// this is much faster than crossfires original algorithm 191// this is much faster than crossfire's original algorithm
148// on modern cpus 192// on modern cpus
149inline int 193inline int
150isqrt (int n) 194isqrt (int n)
151{ 195{
152 return (int)sqrtf ((float)n); 196 return (int)sqrtf ((float)n);
197}
198
199// this is kind of like the ^^ operator, if it would exist, without sequence point.
200// more handy than it looks like, due to the implicit !! done on its arguments
201inline bool
202logical_xor (bool a, bool b)
203{
204 return a != b;
205}
206
207inline bool
208logical_implies (bool a, bool b)
209{
210 return a <= b;
153} 211}
154 212
155// this is only twice as fast as naive sqrtf (dx*dy+dy*dy) 213// this is only twice as fast as naive sqrtf (dx*dy+dy*dy)
156#if 0 214#if 0
157// and has a max. error of 6 in the range -100..+100. 215// and has a max. error of 6 in the range -100..+100.
182absdir (int d) 240absdir (int d)
183{ 241{
184 return ((d - 1) & 7) + 1; 242 return ((d - 1) & 7) + 1;
185} 243}
186 244
187extern size_t slice_alloc; // statistics 245extern ssize_t slice_alloc; // statistics
246
247void *salloc_ (int n) throw (std::bad_alloc);
248void *salloc_ (int n, void *src) throw (std::bad_alloc);
249
250// strictly the same as g_slice_alloc, but never returns 0
251template<typename T>
252inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
253
254// also copies src into the new area, like "memdup"
255// if src is 0, clears the memory
256template<typename T>
257inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
258
259// clears the memory
260template<typename T>
261inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
262
263// for symmetry
264template<typename T>
265inline void sfree (T *ptr, int n = 1) throw ()
266{
267 if (expect_true (ptr))
268 {
269 slice_alloc -= n * sizeof (T);
270 if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
271 g_slice_free1 (n * sizeof (T), (void *)ptr);
272 assert (slice_alloc >= 0);//D
273 }
274}
275
276// nulls the pointer
277template<typename T>
278inline void sfree0 (T *&ptr, int n = 1) throw ()
279{
280 sfree<T> (ptr, n);
281 ptr = 0;
282}
188 283
189// makes dynamically allocated objects zero-initialised 284// makes dynamically allocated objects zero-initialised
190struct zero_initialised 285struct zero_initialised
191{ 286{
192 void *operator new (size_t s, void *p) 287 void *operator new (size_t s, void *p)
195 return p; 290 return p;
196 } 291 }
197 292
198 void *operator new (size_t s) 293 void *operator new (size_t s)
199 { 294 {
200 slice_alloc += s;
201 return g_slice_alloc0 (s); 295 return salloc0<char> (s);
202 } 296 }
203 297
204 void *operator new[] (size_t s) 298 void *operator new[] (size_t s)
205 { 299 {
206 slice_alloc += s;
207 return g_slice_alloc0 (s); 300 return salloc0<char> (s);
208 } 301 }
209 302
210 void operator delete (void *p, size_t s) 303 void operator delete (void *p, size_t s)
211 { 304 {
212 slice_alloc -= s; 305 sfree ((char *)p, s);
213 g_slice_free1 (s, p);
214 } 306 }
215 307
216 void operator delete[] (void *p, size_t s) 308 void operator delete[] (void *p, size_t s)
217 { 309 {
218 slice_alloc -= s; 310 sfree ((char *)p, s);
219 g_slice_free1 (s, p);
220 } 311 }
221}; 312};
222 313
223void *salloc_ (int n) throw (std::bad_alloc); 314// makes dynamically allocated objects zero-initialised
224void *salloc_ (int n, void *src) throw (std::bad_alloc); 315struct slice_allocated
225
226// strictly the same as g_slice_alloc, but never returns 0
227template<typename T>
228inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
229
230// also copies src into the new area, like "memdup"
231// if src is 0, clears the memory
232template<typename T>
233inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
234
235// clears the memory
236template<typename T>
237inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
238
239// for symmetry
240template<typename T>
241inline void sfree (T *ptr, int n = 1) throw ()
242{ 316{
243#ifdef PREFER_MALLOC 317 void *operator new (size_t s, void *p)
244 free (ptr); 318 {
245#else 319 return p;
246 slice_alloc -= n * sizeof (T); 320 }
247 g_slice_free1 (n * sizeof (T), (void *)ptr); 321
248#endif 322 void *operator new (size_t s)
249} 323 {
324 return salloc<char> (s);
325 }
326
327 void *operator new[] (size_t s)
328 {
329 return salloc<char> (s);
330 }
331
332 void operator delete (void *p, size_t s)
333 {
334 sfree ((char *)p, s);
335 }
336
337 void operator delete[] (void *p, size_t s)
338 {
339 sfree ((char *)p, s);
340 }
341};
250 342
251// a STL-compatible allocator that uses g_slice 343// a STL-compatible allocator that uses g_slice
252// boy, this is verbose 344// boy, this is verbose
253template<typename Tp> 345template<typename Tp>
254struct slice_allocator 346struct slice_allocator
266 { 358 {
267 typedef slice_allocator<U> other; 359 typedef slice_allocator<U> other;
268 }; 360 };
269 361
270 slice_allocator () throw () { } 362 slice_allocator () throw () { }
271 slice_allocator (const slice_allocator &o) throw () { } 363 slice_allocator (const slice_allocator &) throw () { }
272 template<typename Tp2> 364 template<typename Tp2>
273 slice_allocator (const slice_allocator<Tp2> &) throw () { } 365 slice_allocator (const slice_allocator<Tp2> &) throw () { }
274 366
275 ~slice_allocator () { } 367 ~slice_allocator () { }
276 368
285 void deallocate (pointer p, size_type n) 377 void deallocate (pointer p, size_type n)
286 { 378 {
287 sfree<Tp> (p, n); 379 sfree<Tp> (p, n);
288 } 380 }
289 381
290 size_type max_size ()const throw () 382 size_type max_size () const throw ()
291 { 383 {
292 return size_t (-1) / sizeof (Tp); 384 return size_t (-1) / sizeof (Tp);
293 } 385 }
294 386
295 void construct (pointer p, const Tp &val) 387 void construct (pointer p, const Tp &val)
306// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213. 398// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213.
307// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps 399// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps
308// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps 400// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
309struct tausworthe_random_generator 401struct tausworthe_random_generator
310{ 402{
311 // generator
312 uint32_t state [4]; 403 uint32_t state [4];
313 404
314 void operator =(const tausworthe_random_generator &src) 405 void operator =(const tausworthe_random_generator &src)
315 { 406 {
316 state [0] = src.state [0]; 407 state [0] = src.state [0];
319 state [3] = src.state [3]; 410 state [3] = src.state [3];
320 } 411 }
321 412
322 void seed (uint32_t seed); 413 void seed (uint32_t seed);
323 uint32_t next (); 414 uint32_t next ();
415};
324 416
325 // uniform distribution 417// Xorshift RNGs, George Marsaglia
418// http://www.jstatsoft.org/v08/i14/paper
419// this one is about 40% faster than the tausworthe one above (i.e. not much),
420// despite the inlining, and has the issue of only creating 2**32-1 numbers.
421// see also http://www.iro.umontreal.ca/~lecuyer/myftp/papers/xorshift.pdf
422struct xorshift_random_generator
423{
424 uint32_t x, y;
425
426 void operator =(const xorshift_random_generator &src)
427 {
428 x = src.x;
429 y = src.y;
430 }
431
432 void seed (uint32_t seed)
433 {
434 x = seed;
435 y = seed * 69069U;
436 }
437
438 uint32_t next ()
439 {
440 uint32_t t = x ^ (x << 10);
441 x = y;
442 y = y ^ (y >> 13) ^ t ^ (t >> 10);
443 return y;
444 }
445};
446
447template<class generator>
448struct random_number_generator : generator
449{
450 // uniform distribution, 0 .. max (0, num - 1)
326 uint32_t operator ()(uint32_t num) 451 uint32_t operator ()(uint32_t num)
327 { 452 {
328 return is_constant (num) 453 return !is_constant (num) ? get_range (num) // non-constant
329 ? (next () * (uint64_t)num) >> 32U 454 : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
330 : get_range (num); 455 : this->next () & (num - 1); // constant, power-of-two
331 } 456 }
332 457
333 // return a number within (min .. max) 458 // return a number within (min .. max)
334 int operator () (int r_min, int r_max) 459 int operator () (int r_min, int r_max)
335 { 460 {
346protected: 471protected:
347 uint32_t get_range (uint32_t r_max); 472 uint32_t get_range (uint32_t r_max);
348 int get_range (int r_min, int r_max); 473 int get_range (int r_min, int r_max);
349}; 474};
350 475
351typedef tausworthe_random_generator rand_gen; 476typedef random_number_generator<tausworthe_random_generator> rand_gen;
352 477
353extern rand_gen rndm; 478extern rand_gen rndm, rmg_rndm;
354 479
355INTERFACE_CLASS (attachable) 480INTERFACE_CLASS (attachable)
356struct refcnt_base 481struct refcnt_base
357{ 482{
358 typedef int refcnt_t; 483 typedef int refcnt_t;
421typedef refptr<object> object_ptr; 546typedef refptr<object> object_ptr;
422typedef refptr<archetype> arch_ptr; 547typedef refptr<archetype> arch_ptr;
423typedef refptr<client> client_ptr; 548typedef refptr<client> client_ptr;
424typedef refptr<player> player_ptr; 549typedef refptr<player> player_ptr;
425 550
551#define STRHSH_NULL 2166136261
552
553static inline uint32_t
554strhsh (const char *s)
555{
556 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
557 // it is about twice as fast as the one-at-a-time one,
558 // with good distribution.
559 // FNV-1a is faster on many cpus because the multiplication
560 // runs concurrently with the looping logic.
561 uint32_t hash = STRHSH_NULL;
562
563 while (*s)
564 hash = (hash ^ *s++) * 16777619;
565
566 return hash;
567}
568
569static inline uint32_t
570memhsh (const char *s, size_t len)
571{
572 uint32_t hash = STRHSH_NULL;
573
574 while (len--)
575 hash = (hash ^ *s++) * 16777619;
576
577 return hash;
578}
579
426struct str_hash 580struct str_hash
427{ 581{
428 std::size_t operator ()(const char *s) const 582 std::size_t operator ()(const char *s) const
429 { 583 {
430 unsigned long hash = 0;
431
432 /* use the one-at-a-time hash function, which supposedly is
433 * better than the djb2-like one used by perl5.005, but
434 * certainly is better then the bug used here before.
435 * see http://burtleburtle.net/bob/hash/doobs.html
436 */
437 while (*s)
438 {
439 hash += *s++;
440 hash += hash << 10;
441 hash ^= hash >> 6;
442 }
443
444 hash += hash << 3;
445 hash ^= hash >> 11;
446 hash += hash << 15;
447
448 return hash; 584 return strhsh (s);
585 }
586
587 std::size_t operator ()(const shstr &s) const
588 {
589 return strhsh (s);
449 } 590 }
450}; 591};
451 592
452struct str_equal 593struct str_equal
453{ 594{
546 erase (&obj); 687 erase (&obj);
547 } 688 }
548}; 689};
549 690
550// basically does what strncpy should do, but appends "..." to strings exceeding length 691// basically does what strncpy should do, but appends "..." to strings exceeding length
692// returns the number of bytes actually used (including \0)
551void assign (char *dst, const char *src, int maxlen); 693int assign (char *dst, const char *src, int maxsize);
552 694
553// type-safe version of assign 695// type-safe version of assign
554template<int N> 696template<int N>
555inline void assign (char (&dst)[N], const char *src) 697inline int assign (char (&dst)[N], const char *src)
556{ 698{
557 assign ((char *)&dst, src, N); 699 return assign ((char *)&dst, src, N);
558} 700}
559 701
560typedef double tstamp; 702typedef double tstamp;
561 703
562// return current time as timestamp 704// return current time as timestamp
563tstamp now (); 705tstamp now ();
564 706
565int similar_direction (int a, int b); 707int similar_direction (int a, int b);
566 708
567// like sprintf, but returns a "static" buffer 709// like v?sprintf, but returns a "static" buffer
568const char *format (const char *format, ...); 710char *vformat (const char *format, va_list ap);
711char *format (const char *format, ...) attribute ((format (printf, 1, 2)));
569 712
713// safety-check player input which will become object->msg
714bool msg_is_safe (const char *msg);
715
716/////////////////////////////////////////////////////////////////////////////
717// threads, very very thin wrappers around pthreads
718
719struct thread
720{
721 pthread_t id;
722
723 void start (void *(*start_routine)(void *), void *arg = 0);
724
725 void cancel ()
726 {
727 pthread_cancel (id);
728 }
729
730 void *join ()
731 {
732 void *ret;
733
734 if (pthread_join (id, &ret))
735 cleanup ("pthread_join failed", 1);
736
737 return ret;
738 }
739};
740
741// note that mutexes are not classes
742typedef pthread_mutex_t smutex;
743
744#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
745 #define SMUTEX_INITIALISER PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
746#else
747 #define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER
570#endif 748#endif
571 749
750#define SMUTEX(name) smutex name = SMUTEX_INITIALISER
751#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))
752#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))
753
754typedef pthread_cond_t scond;
755
756#define SCOND(name) scond name = PTHREAD_COND_INITIALIZER
757#define SCOND_SIGNAL(name) pthread_cond_signal (&(name))
758#define SCOND_BROADCAST(name) pthread_cond_broadcast (&(name))
759#define SCOND_WAIT(name,mutex) pthread_cond_wait (&(name), &(mutex))
760
761#endif
762

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines