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.50 by root, Sun Jun 24 00:33:54 2007 UTC vs.
Revision 1.85 by root, Thu Jan 1 20:49:48 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 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 it 6 * Deliantra is free software: you can redistribute it and/or modify
7 * under the terms of the GNU General Public License as published by the Free 7 * it under the terms of the GNU General Public License as published by
8 * Software Foundation; either version 2 of the License, or (at your option) 8 * the Free Software Foundation, either version 3 of the License, or
9 * any later version. 9 * (at your option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, but 11 * This program is distributed in the hope that it will be useful,
12 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * 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 along 16 * You should have received a copy of the GNU General Public License
17 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 * 18 *
20 * The authors can be reached via e-mail to <crossfire@schmorp.de> 19 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 20 */
22 21
23#ifndef UTIL_H__ 22#ifndef UTIL_H__
24#define UTIL_H__ 23#define UTIL_H__
25 24
26//#define PREFER_MALLOC 25#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0
26#define DEBUG_SALLOC 0 // add a debug wrapper around all sallocs
27#define PREFER_MALLOC 0 // use malloc and not the slice allocator
27 28
28#if __GNUC__ >= 3 29#if __GNUC__ >= 3
29# define is_constant(c) __builtin_constant_p (c) 30# define is_constant(c) __builtin_constant_p (c)
30# define expect(expr,value) __builtin_expect ((expr),(value)) 31# define expect(expr,value) __builtin_expect ((expr),(value))
31# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) 32# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
33# define noinline __attribute__((__noinline__))
32#else 34#else
33# define is_constant(c) 0 35# define is_constant(c) 0
34# define expect(expr,value) (expr) 36# define expect(expr,value) (expr)
35# define prefetch(addr,rw,locality) 37# define prefetch(addr,rw,locality)
38# define noinline
36#endif 39#endif
37 40
38#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4) 41#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4)
39# define decltype(x) typeof(x) 42# define decltype(x) typeof(x)
40#endif 43#endif
41 44
42// put into ifs if you are very sure that the expression 45// put into ifs if you are very sure that the expression
43// is mostly true or mosty false. note that these return 46// is mostly true or mosty false. note that these return
44// booleans, not the expression. 47// booleans, not the expression.
45#define expect_false(expr) expect ((expr) != 0, 0) 48#define expect_false(expr) expect ((expr) ? 1 : 0, 0)
46#define expect_true(expr) expect ((expr) != 0, 1) 49#define expect_true(expr) expect ((expr) ? 1 : 0, 1)
50
51#include <pthread.h>
47 52
48#include <cstddef> 53#include <cstddef>
49#include <cmath> 54#include <cmath>
50#include <new> 55#include <new>
51#include <vector> 56#include <vector>
… …
53#include <glib.h> 58#include <glib.h>
54 59
55#include <shstr.h> 60#include <shstr.h>
56#include <traits.h> 61#include <traits.h>
57 62
63#if DEBUG_SALLOC
64# define g_slice_alloc0(s) debug_slice_alloc0(s)
65# define g_slice_alloc(s) debug_slice_alloc(s)
66# define g_slice_free1(s,p) debug_slice_free1(s,p)
67void *g_slice_alloc (unsigned long size);
68void *g_slice_alloc0 (unsigned long size);
69void g_slice_free1 (unsigned long size, void *ptr);
70#elif PREFER_MALLOC
71# define g_slice_alloc0(s) calloc (1, (s))
72# define g_slice_alloc(s) malloc ((s))
73# define g_slice_free1(s,p) free ((p))
74#endif
75
58// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever) 76// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
59#define auto(var,expr) decltype(expr) var = (expr) 77#define auto(var,expr) decltype(expr) var = (expr)
60 78
61// very ugly macro that basicaly declares and initialises a variable 79// very ugly macro that basically declares and initialises a variable
62// that is in scope for the next statement only 80// that is in scope for the next statement only
63// works only for stuff that can be assigned 0 and converts to false 81// works only for stuff that can be assigned 0 and converts to false
64// (note: works great for pointers) 82// (note: works great for pointers)
65// most ugly macro I ever wrote 83// most ugly macro I ever wrote
66#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1) 84#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
… …
71 89
72// in range excluding end 90// in range excluding end
73#define IN_RANGE_EXC(val,beg,end) \ 91#define IN_RANGE_EXC(val,beg,end) \
74 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg)) 92 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))
75 93
94void cleanup (const char *cause, bool make_core = false);
76void fork_abort (const char *msg); 95void fork_abort (const char *msg);
77 96
78// rationale for using (U) not (T) is to reduce signed/unsigned issues, 97// rationale for using (U) not (T) is to reduce signed/unsigned issues,
79// as a is often a constant while b is the variable. it is still a bug, though. 98// as a is often a constant while b is the variable. it is still a bug, though.
80template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; } 99template<typename T, typename U> static inline T min (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; } 100template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; }
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; } 101template<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; }
83 102
103template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); }
104template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); }
105template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); }
106
84template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; } 107template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
108
109template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }
110template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }
111
112// sign returns -1 or +1
113template<typename T>
114static inline T sign (T v) { return v < 0 ? -1 : +1; }
115// relies on 2c representation
116template<>
117inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
118
119// sign0 returns -1, 0 or +1
120template<typename T>
121static inline T sign0 (T v) { return v ? sign (v) : 0; }
122
123// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
124template<typename T> static inline T div (T val, T div) { return (val + div / 2) / div; }
125// div, round-up
126template<typename T> static inline T div_ru (T val, T div) { return (val + div - 1) / div; }
127// div, round-down
128template<typename T> static inline T div_rd (T val, T div) { return (val ) / div; }
85 129
86template<typename T> 130template<typename T>
87static inline T 131static inline T
88lerp (T val, T min_in, T max_in, T min_out, T max_out) 132lerp (T val, T min_in, T max_in, T min_out, T max_out)
89{ 133{
90 return (val - min_in) * (max_out - min_out) / (max_in - min_in) + min_out; 134 return min_out + div <T> ((val - min_in) * (max_out - min_out), max_in - min_in);
135}
136
137// lerp, round-down
138template<typename T>
139static inline T
140lerp_rd (T val, T min_in, T max_in, T min_out, T max_out)
141{
142 return min_out + div_rd<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
143}
144
145// lerp, round-up
146template<typename T>
147static inline T
148lerp_ru (T val, T min_in, T max_in, T min_out, T max_out)
149{
150 return min_out + div_ru<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
91} 151}
92 152
93// lots of stuff taken from FXT 153// lots of stuff taken from FXT
94 154
95/* Rotate right. This is used in various places for checksumming */ 155/* Rotate right. This is used in various places for checksumming */
… …
173absdir (int d) 233absdir (int d)
174{ 234{
175 return ((d - 1) & 7) + 1; 235 return ((d - 1) & 7) + 1;
176} 236}
177 237
238extern ssize_t slice_alloc; // statistics
239
240void *salloc_ (int n) throw (std::bad_alloc);
241void *salloc_ (int n, void *src) throw (std::bad_alloc);
242
243// strictly the same as g_slice_alloc, but never returns 0
244template<typename T>
245inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
246
247// also copies src into the new area, like "memdup"
248// if src is 0, clears the memory
249template<typename T>
250inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
251
252// clears the memory
253template<typename T>
254inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
255
256// for symmetry
257template<typename T>
258inline void sfree (T *ptr, int n = 1) throw ()
259{
260 if (expect_true (ptr))
261 {
262 slice_alloc -= n * sizeof (T);
263 if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
264 g_slice_free1 (n * sizeof (T), (void *)ptr);
265 assert (slice_alloc >= 0);//D
266 }
267}
268
269// nulls the pointer
270template<typename T>
271inline void sfree0 (T *&ptr, int n = 1) throw ()
272{
273 sfree<T> (ptr, n);
274 ptr = 0;
275}
276
178// makes dynamically allocated objects zero-initialised 277// makes dynamically allocated objects zero-initialised
179struct zero_initialised 278struct zero_initialised
180{ 279{
181 void *operator new (size_t s, void *p) 280 void *operator new (size_t s, void *p)
182 { 281 {
… …
184 return p; 283 return p;
185 } 284 }
186 285
187 void *operator new (size_t s) 286 void *operator new (size_t s)
188 { 287 {
189 return g_slice_alloc0 (s); 288 return salloc0<char> (s);
190 } 289 }
191 290
192 void *operator new[] (size_t s) 291 void *operator new[] (size_t s)
193 { 292 {
194 return g_slice_alloc0 (s); 293 return salloc0<char> (s);
195 } 294 }
196 295
197 void operator delete (void *p, size_t s) 296 void operator delete (void *p, size_t s)
198 { 297 {
199 g_slice_free1 (s, p); 298 sfree ((char *)p, s);
200 } 299 }
201 300
202 void operator delete[] (void *p, size_t s) 301 void operator delete[] (void *p, size_t s)
203 { 302 {
204 g_slice_free1 (s, p); 303 sfree ((char *)p, s);
205 } 304 }
206}; 305};
207 306
208void *salloc_ (int n) throw (std::bad_alloc); 307// makes dynamically allocated objects zero-initialised
209void *salloc_ (int n, void *src) throw (std::bad_alloc); 308struct slice_allocated
210
211// strictly the same as g_slice_alloc, but never returns 0
212template<typename T>
213inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
214
215// also copies src into the new area, like "memdup"
216// if src is 0, clears the memory
217template<typename T>
218inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
219
220// clears the memory
221template<typename T>
222inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
223
224// for symmetry
225template<typename T>
226inline void sfree (T *ptr, int n = 1) throw ()
227{ 309{
228#ifdef PREFER_MALLOC 310 void *operator new (size_t s, void *p)
229 free (ptr); 311 {
230#else 312 return p;
231 g_slice_free1 (n * sizeof (T), (void *)ptr); 313 }
232#endif 314
233} 315 void *operator new (size_t s)
316 {
317 return salloc<char> (s);
318 }
319
320 void *operator new[] (size_t s)
321 {
322 return salloc<char> (s);
323 }
324
325 void operator delete (void *p, size_t s)
326 {
327 sfree ((char *)p, s);
328 }
329
330 void operator delete[] (void *p, size_t s)
331 {
332 sfree ((char *)p, s);
333 }
334};
234 335
235// a STL-compatible allocator that uses g_slice 336// a STL-compatible allocator that uses g_slice
236// boy, this is verbose 337// boy, this is verbose
237template<typename Tp> 338template<typename Tp>
238struct slice_allocator 339struct slice_allocator
… …
250 { 351 {
251 typedef slice_allocator<U> other; 352 typedef slice_allocator<U> other;
252 }; 353 };
253 354
254 slice_allocator () throw () { } 355 slice_allocator () throw () { }
255 slice_allocator (const slice_allocator &o) throw () { } 356 slice_allocator (const slice_allocator &) throw () { }
256 template<typename Tp2> 357 template<typename Tp2>
257 slice_allocator (const slice_allocator<Tp2> &) throw () { } 358 slice_allocator (const slice_allocator<Tp2> &) throw () { }
258 359
259 ~slice_allocator () { } 360 ~slice_allocator () { }
260 361
… …
269 void deallocate (pointer p, size_type n) 370 void deallocate (pointer p, size_type n)
270 { 371 {
271 sfree<Tp> (p, n); 372 sfree<Tp> (p, n);
272 } 373 }
273 374
274 size_type max_size ()const throw () 375 size_type max_size () const throw ()
275 { 376 {
276 return size_t (-1) / sizeof (Tp); 377 return size_t (-1) / sizeof (Tp);
277 } 378 }
278 379
279 void construct (pointer p, const Tp &val) 380 void construct (pointer p, const Tp &val)
… …
290// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213. 391// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213.
291// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps 392// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps
292// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps 393// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
293struct tausworthe_random_generator 394struct tausworthe_random_generator
294{ 395{
295 // generator
296 uint32_t state [4]; 396 uint32_t state [4];
297 397
298 void operator =(const tausworthe_random_generator &src) 398 void operator =(const tausworthe_random_generator &src)
299 { 399 {
300 state [0] = src.state [0]; 400 state [0] = src.state [0];
… …
303 state [3] = src.state [3]; 403 state [3] = src.state [3];
304 } 404 }
305 405
306 void seed (uint32_t seed); 406 void seed (uint32_t seed);
307 uint32_t next (); 407 uint32_t next ();
408};
308 409
309 // uniform distribution 410// Xorshift RNGs, George Marsaglia
411// http://www.jstatsoft.org/v08/i14/paper
412// this one is about 40% faster than the tausworthe one above (i.e. not much),
413// despite the inlining, and has the issue of only creating 2**32-1 numbers.
414struct xorshift_random_generator
415{
416 uint32_t x, y;
417
418 void operator =(const xorshift_random_generator &src)
419 {
420 x = src.x;
421 y = src.y;
422 }
423
424 void seed (uint32_t seed)
425 {
426 x = seed;
427 y = seed * 69069U;
428 }
429
430 uint32_t next ()
431 {
432 uint32_t t = x ^ (x << 10);
433 x = y;
434 y = y ^ (y >> 13) ^ t ^ (t >> 10);
435 return y;
436 }
437};
438
439template<class generator>
440struct random_number_generator : generator
441{
442 // uniform distribution, 0 .. max (0, num - 1)
310 uint32_t operator ()(uint32_t num) 443 uint32_t operator ()(uint32_t num)
311 { 444 {
312 return is_constant (num) 445 return !is_constant (num) ? get_range (num) // non-constant
313 ? (next () * (uint64_t)num) >> 32U 446 : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
314 : get_range (num); 447 : this->next () & (num - 1); // constant, power-of-two
315 } 448 }
316 449
317 // return a number within (min .. max) 450 // return a number within (min .. max)
318 int operator () (int r_min, int r_max) 451 int operator () (int r_min, int r_max)
319 { 452 {
… …
330protected: 463protected:
331 uint32_t get_range (uint32_t r_max); 464 uint32_t get_range (uint32_t r_max);
332 int get_range (int r_min, int r_max); 465 int get_range (int r_min, int r_max);
333}; 466};
334 467
335typedef tausworthe_random_generator rand_gen; 468typedef random_number_generator<tausworthe_random_generator> rand_gen;
336 469
337extern rand_gen rndm; 470extern rand_gen rndm, rmg_rndm;
471
472INTERFACE_CLASS (attachable)
473struct refcnt_base
474{
475 typedef int refcnt_t;
476 mutable refcnt_t ACC (RW, refcnt);
477
478 MTH void refcnt_inc () const { ++refcnt; }
479 MTH void refcnt_dec () const { --refcnt; }
480
481 refcnt_base () : refcnt (0) { }
482};
483
484// to avoid branches with more advanced compilers
485extern refcnt_base::refcnt_t refcnt_dummy;
338 486
339template<class T> 487template<class T>
340struct refptr 488struct refptr
341{ 489{
490 // p if not null
491 refcnt_base::refcnt_t *refcnt_ref () { return p ? &p->refcnt : &refcnt_dummy; }
492
493 void refcnt_dec ()
494 {
495 if (!is_constant (p))
496 --*refcnt_ref ();
497 else if (p)
498 --p->refcnt;
499 }
500
501 void refcnt_inc ()
502 {
503 if (!is_constant (p))
504 ++*refcnt_ref ();
505 else if (p)
506 ++p->refcnt;
507 }
508
342 T *p; 509 T *p;
343 510
344 refptr () : p(0) { } 511 refptr () : p(0) { }
345 refptr (const refptr<T> &p) : p(p.p) { if (p) p->refcnt_inc (); } 512 refptr (const refptr<T> &p) : p(p.p) { refcnt_inc (); }
346 refptr (T *p) : p(p) { if (p) p->refcnt_inc (); } 513 refptr (T *p) : p(p) { refcnt_inc (); }
347 ~refptr () { if (p) p->refcnt_dec (); } 514 ~refptr () { refcnt_dec (); }
348 515
349 const refptr<T> &operator =(T *o) 516 const refptr<T> &operator =(T *o)
350 { 517 {
518 // if decrementing ever destroys we need to reverse the order here
351 if (p) p->refcnt_dec (); 519 refcnt_dec ();
352 p = o; 520 p = o;
353 if (p) p->refcnt_inc (); 521 refcnt_inc ();
354
355 return *this; 522 return *this;
356 } 523 }
357 524
358 const refptr<T> &operator =(const refptr<T> o) 525 const refptr<T> &operator =(const refptr<T> &o)
359 { 526 {
360 *this = o.p; 527 *this = o.p;
361 return *this; 528 return *this;
362 } 529 }
363 530
364 T &operator * () const { return *p; } 531 T &operator * () const { return *p; }
365 T *operator ->() const { return p; } 532 T *operator ->() const { return p; }
366 533
367 operator T *() const { return p; } 534 operator T *() const { return p; }
368}; 535};
369 536
370typedef refptr<maptile> maptile_ptr; 537typedef refptr<maptile> maptile_ptr;
… …
375 542
376struct str_hash 543struct str_hash
377{ 544{
378 std::size_t operator ()(const char *s) const 545 std::size_t operator ()(const char *s) const
379 { 546 {
380 unsigned long hash = 0; 547#if 0
548 uint32_t hash = 0;
381 549
382 /* use the one-at-a-time hash function, which supposedly is 550 /* use the one-at-a-time hash function, which supposedly is
383 * better than the djb2-like one used by perl5.005, but 551 * better than the djb2-like one used by perl5.005, but
384 * certainly is better then the bug used here before. 552 * certainly is better then the bug used here before.
385 * see http://burtleburtle.net/bob/hash/doobs.html 553 * see http://burtleburtle.net/bob/hash/doobs.html
… …
392 } 560 }
393 561
394 hash += hash << 3; 562 hash += hash << 3;
395 hash ^= hash >> 11; 563 hash ^= hash >> 11;
396 hash += hash << 15; 564 hash += hash << 15;
565#else
566 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
567 // it is about twice as fast as the one-at-a-time one,
568 // with good distribution.
569 // FNV-1a is faster on many cpus because the multiplication
570 // runs concurrent with the looping logic.
571 uint32_t hash = 2166136261;
572
573 while (*s)
574 hash = (hash ^ *s++) * 16777619;
575#endif
397 576
398 return hash; 577 return hash;
399 } 578 }
400}; 579};
401 580
… …
406 return !strcmp (a, b); 585 return !strcmp (a, b);
407 } 586 }
408}; 587};
409 588
410// Mostly the same as std::vector, but insert/erase can reorder 589// Mostly the same as std::vector, but insert/erase can reorder
411// the elements, making insret/remove O(1) instead of O(n). 590// the elements, making append(=insert)/remove O(1) instead of O(n).
412// 591//
413// NOTE: only some forms of erase/insert are available 592// NOTE: only some forms of erase are available
414template<class T> 593template<class T>
415struct unordered_vector : std::vector<T, slice_allocator<T> > 594struct unordered_vector : std::vector<T, slice_allocator<T> >
416{ 595{
417 typedef typename unordered_vector::iterator iterator; 596 typedef typename unordered_vector::iterator iterator;
418 597
… …
459 return obj->*indexmember 638 return obj->*indexmember
460 ? this->begin () + obj->*indexmember - 1 639 ? this->begin () + obj->*indexmember - 1
461 : this->end (); 640 : this->end ();
462 } 641 }
463 642
643 void push_back (T *obj)
644 {
645 std::vector<T *, slice_allocator<T *> >::push_back (obj);
646 obj->*indexmember = this->size ();
647 }
648
464 void insert (T *obj) 649 void insert (T *obj)
465 { 650 {
466 push_back (obj); 651 push_back (obj);
467 obj->*indexmember = this->size ();
468 } 652 }
469 653
470 void insert (T &obj) 654 void insert (T &obj)
471 { 655 {
472 insert (&obj); 656 insert (&obj);
… …
502 assign ((char *)&dst, src, N); 686 assign ((char *)&dst, src, N);
503} 687}
504 688
505typedef double tstamp; 689typedef double tstamp;
506 690
507// return current time as timestampe 691// return current time as timestamp
508tstamp now (); 692tstamp now ();
509 693
510int similar_direction (int a, int b); 694int similar_direction (int a, int b);
511 695
512// like printf, but returns a std::string 696// like sprintf, but returns a "static" buffer
513const std::string format (const char *format, ...); 697const char *format (const char *format, ...);
514 698
699/////////////////////////////////////////////////////////////////////////////
700// threads, very very thin wrappers around pthreads
701
702struct thread
703{
704 pthread_t id;
705
706 void start (void *(*start_routine)(void *), void *arg = 0);
707
708 void cancel ()
709 {
710 pthread_cancel (id);
711 }
712
713 void *join ()
714 {
715 void *ret;
716
717 if (pthread_join (id, &ret))
718 cleanup ("pthread_join failed", 1);
719
720 return ret;
721 }
722};
723
724// note that mutexes are not classes
725typedef pthread_mutex_t smutex;
726
727#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
728 #define SMUTEX_INITIALISER PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
729#else
730 #define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER
515#endif 731#endif
516 732
733#define SMUTEX(name) smutex name = SMUTEX_INITIALISER
734#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))
735#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))
736
737typedef pthread_cond_t scond;
738
739#define SCOND(name) scond name = PTHREAD_COND_INITIALIZER
740#define SCOND_SIGNAL(name) pthread_cond_signal (&(name))
741#define SCOND_BROADCAST(name) pthread_cond_broadcast (&(name))
742#define SCOND_WAIT(name,mutex) pthread_cond_wait (&(name), &(mutex))
743
744#endif
745

Diff Legend

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