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.61 by root, Fri Jan 25 18:09:23 2008 UTC vs.
Revision 1.92 by root, Tue Oct 20 05:57:08 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#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0
26//#define DEBUG_SALLOC 27#define DEBUG_SALLOC 0 // add a debug wrapper around all sallocs
28#define PREFER_MALLOC 0 // use malloc and not the slice allocator
27 29
28#if __GNUC__ >= 3 30#if __GNUC__ >= 3
29# define is_constant(c) __builtin_constant_p (c) 31# define is_constant(c) __builtin_constant_p (c)
30# define expect(expr,value) __builtin_expect ((expr),(value)) 32# define expect(expr,value) __builtin_expect ((expr),(value))
31# 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__))
32#else 35#else
33# define is_constant(c) 0 36# define is_constant(c) 0
34# define expect(expr,value) (expr) 37# define expect(expr,value) (expr)
35# define prefetch(addr,rw,locality) 38# define prefetch(addr,rw,locality)
39# define noinline
36#endif 40#endif
37 41
38#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4) 42#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4)
39# define decltype(x) typeof(x) 43# define decltype(x) typeof(x)
40#endif 44#endif
41 45
42// put into ifs if you are very sure that the expression 46// put into ifs if you are very sure that the expression
43// is mostly true or mosty false. note that these return 47// is mostly true or mosty false. note that these return
44// booleans, not the expression. 48// booleans, not the expression.
45#define expect_false(expr) expect ((expr) != 0, 0) 49#define expect_false(expr) expect ((expr) ? 1 : 0, 0)
46#define expect_true(expr) expect ((expr) != 0, 1) 50#define expect_true(expr) expect ((expr) ? 1 : 0, 1)
51
52#include <pthread.h>
47 53
48#include <cstddef> 54#include <cstddef>
49#include <cmath> 55#include <cmath>
50#include <new> 56#include <new>
51#include <vector> 57#include <vector>
… …
53#include <glib.h> 59#include <glib.h>
54 60
55#include <shstr.h> 61#include <shstr.h>
56#include <traits.h> 62#include <traits.h>
57 63
58#ifdef DEBUG_SALLOC 64#if DEBUG_SALLOC
59# define g_slice_alloc0(s) debug_slice_alloc0(s) 65# define g_slice_alloc0(s) debug_slice_alloc0(s)
60# define g_slice_alloc(s) debug_slice_alloc(s) 66# define g_slice_alloc(s) debug_slice_alloc(s)
61# define g_slice_free1(s,p) debug_slice_free1(s,p) 67# define g_slice_free1(s,p) debug_slice_free1(s,p)
62void *g_slice_alloc (unsigned long size); 68void *g_slice_alloc (unsigned long size);
63void *g_slice_alloc0 (unsigned long size); 69void *g_slice_alloc0 (unsigned long size);
64void g_slice_free1 (unsigned long size, void *ptr); 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))
65#endif 75#endif
66 76
67// 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)
68#define auto(var,expr) decltype(expr) var = (expr) 78#define auto(var,expr) decltype(expr) var = (expr)
69 79
70// very ugly macro that basicaly declares and initialises a variable 80// very ugly macro that basically declares and initialises a variable
71// that is in scope for the next statement only 81// that is in scope for the next statement only
72// 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
73// (note: works great for pointers) 83// (note: works great for pointers)
74// most ugly macro I ever wrote 84// most ugly macro I ever wrote
75#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)
… …
80 90
81// in range excluding end 91// in range excluding end
82#define IN_RANGE_EXC(val,beg,end) \ 92#define IN_RANGE_EXC(val,beg,end) \
83 ((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))
84 94
95void cleanup (const char *cause, bool make_core = false);
85void fork_abort (const char *msg); 96void fork_abort (const char *msg);
86 97
87// 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,
88// 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.
89template<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; }
90template<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; }
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; } 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; }
92 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
93template<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; }
94 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
95template<typename T> 143template<typename T>
96static inline T 144static inline T
97lerp (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)
98{ 146{
99 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);
100} 164}
101 165
102// lots of stuff taken from FXT 166// lots of stuff taken from FXT
103 167
104/* Rotate right. This is used in various places for checksumming */ 168/* Rotate right. This is used in various places for checksumming */
… …
148// on modern cpus 212// on modern cpus
149inline int 213inline int
150isqrt (int n) 214isqrt (int n)
151{ 215{
152 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;
153} 231}
154 232
155// 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)
156#if 0 234#if 0
157// 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.
… …
182absdir (int d) 260absdir (int d)
183{ 261{
184 return ((d - 1) & 7) + 1; 262 return ((d - 1) & 7) + 1;
185} 263}
186 264
187extern size_t slice_alloc; // statistics 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}
188 303
189// makes dynamically allocated objects zero-initialised 304// makes dynamically allocated objects zero-initialised
190struct zero_initialised 305struct zero_initialised
191{ 306{
192 void *operator new (size_t s, void *p) 307 void *operator new (size_t s, void *p)
… …
195 return p; 310 return p;
196 } 311 }
197 312
198 void *operator new (size_t s) 313 void *operator new (size_t s)
199 { 314 {
200 slice_alloc += s;
201 return g_slice_alloc0 (s); 315 return salloc0<char> (s);
202 } 316 }
203 317
204 void *operator new[] (size_t s) 318 void *operator new[] (size_t s)
205 { 319 {
206 slice_alloc += s;
207 return g_slice_alloc0 (s); 320 return salloc0<char> (s);
208 } 321 }
209 322
210 void operator delete (void *p, size_t s) 323 void operator delete (void *p, size_t s)
211 { 324 {
212 slice_alloc -= s; 325 sfree ((char *)p, s);
213 g_slice_free1 (s, p);
214 } 326 }
215 327
216 void operator delete[] (void *p, size_t s) 328 void operator delete[] (void *p, size_t s)
217 { 329 {
218 slice_alloc -= s; 330 sfree ((char *)p, s);
219 g_slice_free1 (s, p);
220 } 331 }
221}; 332};
222 333
223void *salloc_ (int n) throw (std::bad_alloc); 334// makes dynamically allocated objects zero-initialised
224void *salloc_ (int n, void *src) throw (std::bad_alloc); 335struct 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{ 336{
243#ifdef PREFER_MALLOC 337 void *operator new (size_t s, void *p)
244 free (ptr); 338 {
245#else 339 return p;
246 slice_alloc -= n * sizeof (T); 340 }
247 g_slice_free1 (n * sizeof (T), (void *)ptr); 341
248#endif 342 void *operator new (size_t s)
249} 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};
250 362
251// a STL-compatible allocator that uses g_slice 363// a STL-compatible allocator that uses g_slice
252// boy, this is verbose 364// boy, this is verbose
253template<typename Tp> 365template<typename Tp>
254struct slice_allocator 366struct slice_allocator
… …
266 { 378 {
267 typedef slice_allocator<U> other; 379 typedef slice_allocator<U> other;
268 }; 380 };
269 381
270 slice_allocator () throw () { } 382 slice_allocator () throw () { }
271 slice_allocator (const slice_allocator &o) throw () { } 383 slice_allocator (const slice_allocator &) throw () { }
272 template<typename Tp2> 384 template<typename Tp2>
273 slice_allocator (const slice_allocator<Tp2> &) throw () { } 385 slice_allocator (const slice_allocator<Tp2> &) throw () { }
274 386
275 ~slice_allocator () { } 387 ~slice_allocator () { }
276 388
… …
285 void deallocate (pointer p, size_type n) 397 void deallocate (pointer p, size_type n)
286 { 398 {
287 sfree<Tp> (p, n); 399 sfree<Tp> (p, n);
288 } 400 }
289 401
290 size_type max_size ()const throw () 402 size_type max_size () const throw ()
291 { 403 {
292 return size_t (-1) / sizeof (Tp); 404 return size_t (-1) / sizeof (Tp);
293 } 405 }
294 406
295 void construct (pointer p, const Tp &val) 407 void construct (pointer p, const Tp &val)
… …
306// 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.
307// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps 419// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps
308// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps 420// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
309struct tausworthe_random_generator 421struct tausworthe_random_generator
310{ 422{
311 // generator
312 uint32_t state [4]; 423 uint32_t state [4];
313 424
314 void operator =(const tausworthe_random_generator &src) 425 void operator =(const tausworthe_random_generator &src)
315 { 426 {
316 state [0] = src.state [0]; 427 state [0] = src.state [0];
… …
319 state [3] = src.state [3]; 430 state [3] = src.state [3];
320 } 431 }
321 432
322 void seed (uint32_t seed); 433 void seed (uint32_t seed);
323 uint32_t next (); 434 uint32_t next ();
435};
324 436
325 // 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)
326 uint32_t operator ()(uint32_t num) 471 uint32_t operator ()(uint32_t num)
327 { 472 {
328 return is_constant (num) 473 return !is_constant (num) ? get_range (num) // non-constant
329 ? (next () * (uint64_t)num) >> 32U 474 : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
330 : get_range (num); 475 : this->next () & (num - 1); // constant, power-of-two
331 } 476 }
332 477
333 // return a number within (min .. max) 478 // return a number within (min .. max)
334 int operator () (int r_min, int r_max) 479 int operator () (int r_min, int r_max)
335 { 480 {
… …
346protected: 491protected:
347 uint32_t get_range (uint32_t r_max); 492 uint32_t get_range (uint32_t r_max);
348 int get_range (int r_min, int r_max); 493 int get_range (int r_min, int r_max);
349}; 494};
350 495
351typedef tausworthe_random_generator rand_gen; 496typedef random_number_generator<tausworthe_random_generator> rand_gen;
352 497
353extern rand_gen rndm; 498extern rand_gen rndm, rmg_rndm;
354 499
355INTERFACE_CLASS (attachable) 500INTERFACE_CLASS (attachable)
356struct refcnt_base 501struct refcnt_base
357{ 502{
358 typedef int refcnt_t; 503 typedef int refcnt_t;
… …
425 570
426struct str_hash 571struct str_hash
427{ 572{
428 std::size_t operator ()(const char *s) const 573 std::size_t operator ()(const char *s) const
429 { 574 {
430 unsigned long hash = 0; 575#if 0
576 uint32_t hash = 0;
431 577
432 /* use the one-at-a-time hash function, which supposedly is 578 /* use the one-at-a-time hash function, which supposedly is
433 * better than the djb2-like one used by perl5.005, but 579 * better than the djb2-like one used by perl5.005, but
434 * certainly is better then the bug used here before. 580 * certainly is better then the bug used here before.
435 * see http://burtleburtle.net/bob/hash/doobs.html 581 * see http://burtleburtle.net/bob/hash/doobs.html
… …
442 } 588 }
443 589
444 hash += hash << 3; 590 hash += hash << 3;
445 hash ^= hash >> 11; 591 hash ^= hash >> 11;
446 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
447 604
448 return hash; 605 return hash;
449 } 606 }
450}; 607};
451 608
… …
546 erase (&obj); 703 erase (&obj);
547 } 704 }
548}; 705};
549 706
550// 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)
551void assign (char *dst, const char *src, int maxlen); 709int assign (char *dst, const char *src, int maxsize);
552 710
553// type-safe version of assign 711// type-safe version of assign
554template<int N> 712template<int N>
555inline void assign (char (&dst)[N], const char *src) 713inline int assign (char (&dst)[N], const char *src)
556{ 714{
557 assign ((char *)&dst, src, N); 715 return assign ((char *)&dst, src, N);
558} 716}
559 717
560typedef double tstamp; 718typedef double tstamp;
561 719
562// return current time as timestamp 720// return current time as timestamp
563tstamp now (); 721tstamp now ();
564 722
565int similar_direction (int a, int b); 723int similar_direction (int a, int b);
566 724
567// like sprintf, but returns a "static" buffer 725// like v?sprintf, but returns a "static" buffer
726char *vformat (const char *format, va_list ap);
568const char *format (const char *format, ...); 727char *format (const char *format, ...);
569 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
570#endif 764#endif
571 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