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.46 by root, Mon May 28 21:15:56 2007 UTC vs.
Revision 1.83 by root, Tue Dec 30 07:24:16 2008 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 is_constant(c) 0 34# define is_constant(c) 0
34# define expect(expr,value) (expr) 35# define expect(expr,value) (expr)
35# define prefetch(addr,rw,locality) 36# define prefetch(addr,rw,locality)
36#endif 37#endif
37 38
39#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4)
40# define decltype(x) typeof(x)
41#endif
42
38// put into ifs if you are very sure that the expression 43// put into ifs if you are very sure that the expression
39// is mostly true or mosty false. note that these return 44// is mostly true or mosty false. note that these return
40// booleans, not the expression. 45// booleans, not the expression.
41#define expect_false(expr) expect ((expr) != 0, 0) 46#define expect_false(expr) expect ((expr) != 0, 0)
42#define expect_true(expr) expect ((expr) != 0, 1) 47#define expect_true(expr) expect ((expr) != 0, 1)
43 48
49#include <pthread.h>
50
44#include <cstddef> 51#include <cstddef>
45#include <cmath> 52#include <cmath>
46#include <new> 53#include <new>
47#include <vector> 54#include <vector>
48 55
49#include <glib.h> 56#include <glib.h>
50 57
51#include <shstr.h> 58#include <shstr.h>
52#include <traits.h> 59#include <traits.h>
53 60
61#if DEBUG_SALLOC
62# define g_slice_alloc0(s) debug_slice_alloc0(s)
63# define g_slice_alloc(s) debug_slice_alloc(s)
64# define g_slice_free1(s,p) debug_slice_free1(s,p)
65void *g_slice_alloc (unsigned long size);
66void *g_slice_alloc0 (unsigned long size);
67void g_slice_free1 (unsigned long size, void *ptr);
68#elif PREFER_MALLOC
69# define g_slice_alloc0(s) calloc (1, (s))
70# define g_slice_alloc(s) malloc ((s))
71# define g_slice_free1(s,p) free ((p))
72#endif
73
54// use a gcc extension for auto declarations until ISO C++ sanctifies them 74// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
55#define auto(var,expr) typeof(expr) var = (expr) 75#define auto(var,expr) decltype(expr) var = (expr)
56 76
57// very ugly macro that basicaly declares and initialises a variable 77// very ugly macro that basically declares and initialises a variable
58// that is in scope for the next statement only 78// that is in scope for the next statement only
59// works only for stuff that can be assigned 0 and converts to false 79// works only for stuff that can be assigned 0 and converts to false
60// (note: works great for pointers) 80// (note: works great for pointers)
61// most ugly macro I ever wrote 81// most ugly macro I ever wrote
62#define declvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1) 82#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
63 83
64// in range including end 84// in range including end
65#define IN_RANGE_INC(val,beg,end) \ 85#define IN_RANGE_INC(val,beg,end) \
66 ((unsigned int)(val) - (unsigned int)(beg) <= (unsigned int)(end) - (unsigned int)(beg)) 86 ((unsigned int)(val) - (unsigned int)(beg) <= (unsigned int)(end) - (unsigned int)(beg))
67 87
68// in range excluding end 88// in range excluding end
69#define IN_RANGE_EXC(val,beg,end) \ 89#define IN_RANGE_EXC(val,beg,end) \
70 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg)) 90 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))
71 91
92void cleanup (const char *cause, bool make_core = false);
72void fork_abort (const char *msg); 93void fork_abort (const char *msg);
73 94
74// rationale for using (U) not (T) is to reduce signed/unsigned issues, 95// rationale for using (U) not (T) is to reduce signed/unsigned issues,
75// as a is often a constant while b is the variable. it is still a bug, though. 96// as a is often a constant while b is the variable. it is still a bug, though.
76template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; } 97template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; }
77template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; } 98template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; }
78template<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; } 99template<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; }
79 100
101template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); }
102template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); }
103template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); }
104
80template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; } 105template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
106
107template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }
108template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }
109
110// sign returns -1 or +1
111template<typename T>
112static inline T sign (T v) { return v < 0 ? -1 : +1; }
113// relies on 2c representation
114template<>
115inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
116
117// sign0 returns -1, 0 or +1
118template<typename T>
119static inline T sign0 (T v) { return v ? sign (v) : 0; }
120
121// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
122template<typename T> static inline T div (T val, T div) { return (val + div / 2) / div; }
123// div, round-up
124template<typename T> static inline T div_ru (T val, T div) { return (val + div - 1) / div; }
125// div, round-down
126template<typename T> static inline T div_rd (T val, T div) { return (val ) / div; }
81 127
82template<typename T> 128template<typename T>
83static inline T 129static inline T
84lerp (T val, T min_in, T max_in, T min_out, T max_out) 130lerp (T val, T min_in, T max_in, T min_out, T max_out)
85{ 131{
86 return (val - min_in) * (max_out - min_out) / (max_in - min_in) + min_out; 132 return min_out + div <T> ((val - min_in) * (max_out - min_out), max_in - min_in);
133}
134
135// lerp, round-down
136template<typename T>
137static inline T
138lerp_rd (T val, T min_in, T max_in, T min_out, T max_out)
139{
140 return min_out + div_rd<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
141}
142
143// lerp, round-up
144template<typename T>
145static inline T
146lerp_ru (T val, T min_in, T max_in, T min_out, T max_out)
147{
148 return min_out + div_ru<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
87} 149}
88 150
89// lots of stuff taken from FXT 151// lots of stuff taken from FXT
90 152
91/* Rotate right. This is used in various places for checksumming */ 153/* Rotate right. This is used in various places for checksumming */
… …
169absdir (int d) 231absdir (int d)
170{ 232{
171 return ((d - 1) & 7) + 1; 233 return ((d - 1) & 7) + 1;
172} 234}
173 235
236extern ssize_t slice_alloc; // statistics
237
238void *salloc_ (int n) throw (std::bad_alloc);
239void *salloc_ (int n, void *src) throw (std::bad_alloc);
240
241// strictly the same as g_slice_alloc, but never returns 0
242template<typename T>
243inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
244
245// also copies src into the new area, like "memdup"
246// if src is 0, clears the memory
247template<typename T>
248inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
249
250// clears the memory
251template<typename T>
252inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
253
254// for symmetry
255template<typename T>
256inline void sfree (T *ptr, int n = 1) throw ()
257{
258 if (expect_true (ptr))
259 {
260 slice_alloc -= n * sizeof (T);
261 if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
262 g_slice_free1 (n * sizeof (T), (void *)ptr);
263 assert (slice_alloc >= 0);//D
264 }
265}
266
267// nulls the pointer
268template<typename T>
269inline void sfree0 (T *&ptr, int n = 1) throw ()
270{
271 sfree<T> (ptr, n);
272 ptr = 0;
273}
274
174// makes dynamically allocated objects zero-initialised 275// makes dynamically allocated objects zero-initialised
175struct zero_initialised 276struct zero_initialised
176{ 277{
177 void *operator new (size_t s, void *p) 278 void *operator new (size_t s, void *p)
178 { 279 {
… …
180 return p; 281 return p;
181 } 282 }
182 283
183 void *operator new (size_t s) 284 void *operator new (size_t s)
184 { 285 {
185 return g_slice_alloc0 (s); 286 return salloc0<char> (s);
186 } 287 }
187 288
188 void *operator new[] (size_t s) 289 void *operator new[] (size_t s)
189 { 290 {
190 return g_slice_alloc0 (s); 291 return salloc0<char> (s);
191 } 292 }
192 293
193 void operator delete (void *p, size_t s) 294 void operator delete (void *p, size_t s)
194 { 295 {
195 g_slice_free1 (s, p); 296 sfree ((char *)p, s);
196 } 297 }
197 298
198 void operator delete[] (void *p, size_t s) 299 void operator delete[] (void *p, size_t s)
199 { 300 {
200 g_slice_free1 (s, p); 301 sfree ((char *)p, s);
201 } 302 }
202}; 303};
203 304
204void *salloc_ (int n) throw (std::bad_alloc); 305// makes dynamically allocated objects zero-initialised
205void *salloc_ (int n, void *src) throw (std::bad_alloc); 306struct slice_allocated
206
207// strictly the same as g_slice_alloc, but never returns 0
208template<typename T>
209inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
210
211// also copies src into the new area, like "memdup"
212// if src is 0, clears the memory
213template<typename T>
214inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
215
216// clears the memory
217template<typename T>
218inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
219
220// for symmetry
221template<typename T>
222inline void sfree (T *ptr, int n = 1) throw ()
223{ 307{
224#ifdef PREFER_MALLOC 308 void *operator new (size_t s, void *p)
225 free (ptr); 309 {
226#else 310 return p;
227 g_slice_free1 (n * sizeof (T), (void *)ptr); 311 }
228#endif 312
229} 313 void *operator new (size_t s)
314 {
315 return salloc<char> (s);
316 }
317
318 void *operator new[] (size_t s)
319 {
320 return salloc<char> (s);
321 }
322
323 void operator delete (void *p, size_t s)
324 {
325 sfree ((char *)p, s);
326 }
327
328 void operator delete[] (void *p, size_t s)
329 {
330 sfree ((char *)p, s);
331 }
332};
230 333
231// a STL-compatible allocator that uses g_slice 334// a STL-compatible allocator that uses g_slice
232// boy, this is verbose 335// boy, this is verbose
233template<typename Tp> 336template<typename Tp>
234struct slice_allocator 337struct slice_allocator
… …
246 { 349 {
247 typedef slice_allocator<U> other; 350 typedef slice_allocator<U> other;
248 }; 351 };
249 352
250 slice_allocator () throw () { } 353 slice_allocator () throw () { }
251 slice_allocator (const slice_allocator &o) throw () { } 354 slice_allocator (const slice_allocator &) throw () { }
252 template<typename Tp2> 355 template<typename Tp2>
253 slice_allocator (const slice_allocator<Tp2> &) throw () { } 356 slice_allocator (const slice_allocator<Tp2> &) throw () { }
254 357
255 ~slice_allocator () { } 358 ~slice_allocator () { }
256 359
… …
265 void deallocate (pointer p, size_type n) 368 void deallocate (pointer p, size_type n)
266 { 369 {
267 sfree<Tp> (p, n); 370 sfree<Tp> (p, n);
268 } 371 }
269 372
270 size_type max_size ()const throw () 373 size_type max_size () const throw ()
271 { 374 {
272 return size_t (-1) / sizeof (Tp); 375 return size_t (-1) / sizeof (Tp);
273 } 376 }
274 377
275 void construct (pointer p, const Tp &val) 378 void construct (pointer p, const Tp &val)
… …
286// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213. 389// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213.
287// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps 390// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps
288// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps 391// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
289struct tausworthe_random_generator 392struct tausworthe_random_generator
290{ 393{
291 // generator
292 uint32_t state [4]; 394 uint32_t state [4];
293 395
294 void operator =(const tausworthe_random_generator &src) 396 void operator =(const tausworthe_random_generator &src)
295 { 397 {
296 state [0] = src.state [0]; 398 state [0] = src.state [0];
… …
299 state [3] = src.state [3]; 401 state [3] = src.state [3];
300 } 402 }
301 403
302 void seed (uint32_t seed); 404 void seed (uint32_t seed);
303 uint32_t next (); 405 uint32_t next ();
406};
304 407
305 // uniform distribution 408// Xorshift RNGs, George Marsaglia
409// http://www.jstatsoft.org/v08/i14/paper
410// this one is about 40% faster than the tausworthe one above (i.e. not much),
411// despite the inlining, and has the issue of only creating 2**32-1 numbers.
412struct xorshift_random_generator
413{
414 uint32_t x, y;
415
416 void operator =(const xorshift_random_generator &src)
417 {
418 x = src.x;
419 y = src.y;
420 }
421
422 void seed (uint32_t seed)
423 {
424 x = seed;
425 y = seed * 69069U;
426 }
427
428 uint32_t next ()
429 {
430 uint32_t t = x ^ (x << 10);
431 x = y;
432 y = y ^ (y >> 13) ^ t ^ (t >> 10);
433 return y;
434 }
435};
436
437template<class generator>
438struct random_number_generator : generator
439{
440 // uniform distribution, 0 .. max (0, num - 1)
306 uint32_t operator ()(uint32_t num) 441 uint32_t operator ()(uint32_t num)
307 { 442 {
308 return is_constant (num) 443 return !is_constant (num) ? get_range (num) // non-constant
309 ? (next () * (uint64_t)num) >> 32U 444 : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
310 : get_range (num); 445 : this->next () & (num - 1); // constant, power-of-two
311 } 446 }
312 447
313 // return a number within (min .. max) 448 // return a number within (min .. max)
314 int operator () (int r_min, int r_max) 449 int operator () (int r_min, int r_max)
315 { 450 {
… …
326protected: 461protected:
327 uint32_t get_range (uint32_t r_max); 462 uint32_t get_range (uint32_t r_max);
328 int get_range (int r_min, int r_max); 463 int get_range (int r_min, int r_max);
329}; 464};
330 465
331typedef tausworthe_random_generator rand_gen; 466typedef random_number_generator<tausworthe_random_generator> rand_gen;
332 467
333extern rand_gen rndm; 468extern rand_gen rndm, rmg_rndm;
469
470INTERFACE_CLASS (attachable)
471struct refcnt_base
472{
473 typedef int refcnt_t;
474 mutable refcnt_t ACC (RW, refcnt);
475
476 MTH void refcnt_inc () const { ++refcnt; }
477 MTH void refcnt_dec () const { --refcnt; }
478
479 refcnt_base () : refcnt (0) { }
480};
481
482// to avoid branches with more advanced compilers
483extern refcnt_base::refcnt_t refcnt_dummy;
334 484
335template<class T> 485template<class T>
336struct refptr 486struct refptr
337{ 487{
488 // p if not null
489 refcnt_base::refcnt_t *refcnt_ref () { return p ? &p->refcnt : &refcnt_dummy; }
490
491 void refcnt_dec ()
492 {
493 if (!is_constant (p))
494 --*refcnt_ref ();
495 else if (p)
496 --p->refcnt;
497 }
498
499 void refcnt_inc ()
500 {
501 if (!is_constant (p))
502 ++*refcnt_ref ();
503 else if (p)
504 ++p->refcnt;
505 }
506
338 T *p; 507 T *p;
339 508
340 refptr () : p(0) { } 509 refptr () : p(0) { }
341 refptr (const refptr<T> &p) : p(p.p) { if (p) p->refcnt_inc (); } 510 refptr (const refptr<T> &p) : p(p.p) { refcnt_inc (); }
342 refptr (T *p) : p(p) { if (p) p->refcnt_inc (); } 511 refptr (T *p) : p(p) { refcnt_inc (); }
343 ~refptr () { if (p) p->refcnt_dec (); } 512 ~refptr () { refcnt_dec (); }
344 513
345 const refptr<T> &operator =(T *o) 514 const refptr<T> &operator =(T *o)
346 { 515 {
516 // if decrementing ever destroys we need to reverse the order here
347 if (p) p->refcnt_dec (); 517 refcnt_dec ();
348 p = o; 518 p = o;
349 if (p) p->refcnt_inc (); 519 refcnt_inc ();
350
351 return *this; 520 return *this;
352 } 521 }
353 522
354 const refptr<T> &operator =(const refptr<T> o) 523 const refptr<T> &operator =(const refptr<T> &o)
355 { 524 {
356 *this = o.p; 525 *this = o.p;
357 return *this; 526 return *this;
358 } 527 }
359 528
360 T &operator * () const { return *p; } 529 T &operator * () const { return *p; }
361 T *operator ->() const { return p; } 530 T *operator ->() const { return p; }
362 531
363 operator T *() const { return p; } 532 operator T *() const { return p; }
364}; 533};
365 534
366typedef refptr<maptile> maptile_ptr; 535typedef refptr<maptile> maptile_ptr;
… …
401 { 570 {
402 return !strcmp (a, b); 571 return !strcmp (a, b);
403 } 572 }
404}; 573};
405 574
575// Mostly the same as std::vector, but insert/erase can reorder
576// the elements, making append(=insert)/remove O(1) instead of O(n).
577//
578// NOTE: only some forms of erase are available
406template<class T> 579template<class T>
407struct unordered_vector : std::vector<T, slice_allocator<T> > 580struct unordered_vector : std::vector<T, slice_allocator<T> >
408{ 581{
409 typedef typename unordered_vector::iterator iterator; 582 typedef typename unordered_vector::iterator iterator;
410 583
… …
420 { 593 {
421 erase ((unsigned int )(i - this->begin ())); 594 erase ((unsigned int )(i - this->begin ()));
422 } 595 }
423}; 596};
424 597
425template<class T, int T::* index> 598// This container blends advantages of linked lists
599// (efficiency) with vectors (random access) by
600// by using an unordered vector and storing the vector
601// index inside the object.
602//
603// + memory-efficient on most 64 bit archs
604// + O(1) insert/remove
605// + free unique (but varying) id for inserted objects
606// + cache-friendly iteration
607// - only works for pointers to structs
608//
609// NOTE: only some forms of erase/insert are available
610typedef int object_vector_index;
611
612template<class T, object_vector_index T::*indexmember>
426struct object_vector : std::vector<T *, slice_allocator<T *> > 613struct object_vector : std::vector<T *, slice_allocator<T *> >
427{ 614{
615 typedef typename object_vector::iterator iterator;
616
617 bool contains (const T *obj) const
618 {
619 return obj->*indexmember;
620 }
621
622 iterator find (const T *obj)
623 {
624 return obj->*indexmember
625 ? this->begin () + obj->*indexmember - 1
626 : this->end ();
627 }
628
629 void push_back (T *obj)
630 {
631 std::vector<T *, slice_allocator<T *> >::push_back (obj);
632 obj->*indexmember = this->size ();
633 }
634
428 void insert (T *obj) 635 void insert (T *obj)
429 { 636 {
430 assert (!(obj->*index));
431 push_back (obj); 637 push_back (obj);
432 obj->*index = this->size ();
433 } 638 }
434 639
435 void insert (T &obj) 640 void insert (T &obj)
436 { 641 {
437 insert (&obj); 642 insert (&obj);
438 } 643 }
439 644
440 void erase (T *obj) 645 void erase (T *obj)
441 { 646 {
442 assert (obj->*index);
443 unsigned int pos = obj->*index; 647 unsigned int pos = obj->*indexmember;
444 obj->*index = 0; 648 obj->*indexmember = 0;
445 649
446 if (pos < this->size ()) 650 if (pos < this->size ())
447 { 651 {
448 (*this)[pos - 1] = (*this)[this->size () - 1]; 652 (*this)[pos - 1] = (*this)[this->size () - 1];
449 (*this)[pos - 1]->*index = pos; 653 (*this)[pos - 1]->*indexmember = pos;
450 } 654 }
451 655
452 this->pop_back (); 656 this->pop_back ();
453 } 657 }
454 658
455 void erase (T &obj) 659 void erase (T &obj)
456 { 660 {
457 errase (&obj); 661 erase (&obj);
458 } 662 }
459}; 663};
460 664
461// basically does what strncpy should do, but appends "..." to strings exceeding length 665// basically does what strncpy should do, but appends "..." to strings exceeding length
462void assign (char *dst, const char *src, int maxlen); 666void assign (char *dst, const char *src, int maxlen);
… …
468 assign ((char *)&dst, src, N); 672 assign ((char *)&dst, src, N);
469} 673}
470 674
471typedef double tstamp; 675typedef double tstamp;
472 676
473// return current time as timestampe 677// return current time as timestamp
474tstamp now (); 678tstamp now ();
475 679
476int similar_direction (int a, int b); 680int similar_direction (int a, int b);
477 681
478// like printf, but returns a std::string 682// like sprintf, but returns a "static" buffer
479const std::string format (const char *format, ...); 683const char *format (const char *format, ...);
480 684
685/////////////////////////////////////////////////////////////////////////////
686// threads, very very thin wrappers around pthreads
687
688struct thread
689{
690 pthread_t id;
691
692 void start (void *(*start_routine)(void *), void *arg = 0);
693
694 void cancel ()
695 {
696 pthread_cancel (id);
697 }
698
699 void *join ()
700 {
701 void *ret;
702
703 if (pthread_join (id, &ret))
704 cleanup ("pthread_join failed", 1);
705
706 return ret;
707 }
708};
709
710// note that mutexes are not classes
711typedef pthread_mutex_t smutex;
712
713#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
714 #define SMUTEX_INITIALISER PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
715#else
716 #define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER
481#endif 717#endif
482 718
719#define SMUTEX(name) smutex name = SMUTEX_INITIALISER
720#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))
721#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))
722
723typedef pthread_cond_t scond;
724
725#define SCOND(name) scond name = PTHREAD_COND_INITIALIZER
726#define SCOND_SIGNAL(name) pthread_cond_signal (&(name))
727#define SCOND_BROADCAST(name) pthread_cond_broadcast (&(name))
728#define SCOND_WAIT(name,mutex) pthread_cond_wait (&(name), &(mutex))
729
730#endif
731

Diff Legend

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