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.67 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.122 by root, Mon Nov 12 02:39:51 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
8 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * (at your option) any later version. 9 * option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
18 * 19 *
19 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
20 */ 21 */
21 22
22#ifndef UTIL_H__ 23#ifndef UTIL_H__
23#define UTIL_H__ 24#define UTIL_H__
24 25
25#define DEBUG_SALLOC 0 26#include <compiler.h>
26#define PREFER_MALLOC 0
27 27
28#if __GNUC__ >= 3 28#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0
29# define is_constant(c) __builtin_constant_p (c) 29#define DEBUG_SALLOC 0 // add a debug wrapper around all sallocs
30# define expect(expr,value) __builtin_expect ((expr),(value)) 30#define PREFER_MALLOC 0 // use malloc and not the slice allocator
31# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
32#else
33# define is_constant(c) 0
34# define expect(expr,value) (expr)
35# define prefetch(addr,rw,locality)
36#endif
37
38#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4)
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 31
48#include <pthread.h> 32#include <pthread.h>
49 33
50#include <cstddef> 34#include <cstddef>
51#include <cmath> 35#include <cmath>
… …
65void *g_slice_alloc0 (unsigned long size); 49void *g_slice_alloc0 (unsigned long size);
66void g_slice_free1 (unsigned long size, void *ptr); 50void g_slice_free1 (unsigned long size, void *ptr);
67#elif PREFER_MALLOC 51#elif PREFER_MALLOC
68# define g_slice_alloc0(s) calloc (1, (s)) 52# define g_slice_alloc0(s) calloc (1, (s))
69# define g_slice_alloc(s) malloc ((s)) 53# define g_slice_alloc(s) malloc ((s))
70# define g_slice_free1(s,p) free ((s)) 54# define g_slice_free1(s,p) free ((p))
71#endif 55#endif
72 56
73// 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)
74#define auto(var,expr) decltype(expr) var = (expr) 58#define auto(var,expr) decltype(expr) var = (expr)
75 59
60#if cplusplus_does_not_suck
61// does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm)
62template<typename T, int N>
63static inline int array_length (const T (&arr)[N])
64{
65 return N;
66}
67#else
68#define array_length(name) (sizeof (name) / sizeof (name [0]))
69#endif
70
76// very ugly macro that basicaly declares and initialises a variable 71// very ugly macro that basically declares and initialises a variable
77// that is in scope for the next statement only 72// that is in scope for the next statement only
78// works only for stuff that can be assigned 0 and converts to false 73// works only for stuff that can be assigned 0 and converts to false
79// (note: works great for pointers) 74// (note: works great for pointers)
80// most ugly macro I ever wrote 75// most ugly macro I ever wrote
81#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1) 76#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
… …
91void cleanup (const char *cause, bool make_core = false); 86void cleanup (const char *cause, bool make_core = false);
92void fork_abort (const char *msg); 87void fork_abort (const char *msg);
93 88
94// rationale for using (U) not (T) is to reduce signed/unsigned issues, 89// rationale for using (U) not (T) is to reduce signed/unsigned issues,
95// as a is often a constant while b is the variable. it is still a bug, though. 90// as a is often a constant while b is the variable. it is still a bug, though.
96template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; } 91template<typename T, typename U> static inline T min (T a, U b) { return a < (T)b ? a : (T)b; }
97template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; } 92template<typename T, typename U> static inline T max (T a, U b) { return a > (T)b ? a : (T)b; }
98template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? (T)a : v >(T)b ? (T)b : v; } 93template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? (T)a : v >(T)b ? (T)b : v; }
94
95template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); }
96template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); }
97template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); }
99 98
100template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; } 99template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
101 100
102template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); } 101template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }
103template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); } 102template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }
104 103
104// sign returns -1 or +1
105template<typename T>
106static inline T sign (T v) { return v < 0 ? -1 : +1; }
107// relies on 2c representation
108template<>
109inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
110template<>
111inline sint16 sign (sint16 v) { return 1 - (sint16 (uint16 (v) >> 15) * 2); }
112template<>
113inline sint32 sign (sint32 v) { return 1 - (sint32 (uint32 (v) >> 31) * 2); }
114
115// sign0 returns -1, 0 or +1
116template<typename T>
117static inline T sign0 (T v) { return v ? sign (v) : 0; }
118
119//clashes with C++0x
120template<typename T, typename U>
121static inline T copysign (T a, U b) { return a > 0 ? b : -b; }
122
123// div* only work correctly for div > 0
124// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
125template<typename T> static inline T div (T val, T div)
126{
127 return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div;
128}
129
130template<> inline float div (float val, float div) { return val / div; }
131template<> inline double div (double val, double div) { return val / div; }
132
133// div, round-up
134template<typename T> static inline T div_ru (T val, T div)
135{
136 return expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div;
137}
138// div, round-down
139template<typename T> static inline T div_rd (T val, T div)
140{
141 return expect_false (val < 0) ? - ((-val + (div - 1) ) / div) : (val ) / div;
142}
143
144// lerp* only work correctly for min_in < max_in
145// Linear intERPolate, scales val from min_in..max_in to min_out..max_out
105template<typename T> 146template<typename T>
106static inline T 147static inline T
107lerp (T val, T min_in, T max_in, T min_out, T max_out) 148lerp (T val, T min_in, T max_in, T min_out, T max_out)
108{ 149{
109 return (val - min_in) * (max_out - min_out) / (max_in - min_in) + min_out; 150 return min_out + div <T> ((val - min_in) * (max_out - min_out), max_in - min_in);
151}
152
153// lerp, round-down
154template<typename T>
155static inline T
156lerp_rd (T val, T min_in, T max_in, T min_out, T max_out)
157{
158 return min_out + div_rd<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
159}
160
161// lerp, round-up
162template<typename T>
163static inline T
164lerp_ru (T val, T min_in, T max_in, T min_out, T max_out)
165{
166 return min_out + div_ru<T> ((val - min_in) * (max_out - min_out), max_in - min_in);
110} 167}
111 168
112// lots of stuff taken from FXT 169// lots of stuff taken from FXT
113 170
114/* Rotate right. This is used in various places for checksumming */ 171/* Rotate right. This is used in various places for checksumming */
… …
152 int32_t d = b - a; 209 int32_t d = b - a;
153 d &= d >> 31; 210 d &= d >> 31;
154 return b - d; 211 return b - d;
155} 212}
156 213
157// this is much faster than crossfires original algorithm 214// this is much faster than crossfire's original algorithm
158// on modern cpus 215// on modern cpus
159inline int 216inline int
160isqrt (int n) 217isqrt (int n)
161{ 218{
162 return (int)sqrtf ((float)n); 219 return (int)sqrtf ((float)n);
220}
221
222// this is kind of like the ^^ operator, if it would exist, without sequence point.
223// more handy than it looks like, due to the implicit !! done on its arguments
224inline bool
225logical_xor (bool a, bool b)
226{
227 return a != b;
228}
229
230inline bool
231logical_implies (bool a, bool b)
232{
233 return a <= b;
163} 234}
164 235
165// this is only twice as fast as naive sqrtf (dx*dy+dy*dy) 236// this is only twice as fast as naive sqrtf (dx*dy+dy*dy)
166#if 0 237#if 0
167// and has a max. error of 6 in the range -100..+100. 238// and has a max. error of 6 in the range -100..+100.
168#else 239#else
169// and has a max. error of 9 in the range -100..+100. 240// and has a max. error of 9 in the range -100..+100.
170#endif 241#endif
171inline int 242inline int
172idistance (int dx, int dy) 243idistance (int dx, int dy)
173{ 244{
174 unsigned int dx_ = abs (dx); 245 unsigned int dx_ = abs (dx);
175 unsigned int dy_ = abs (dy); 246 unsigned int dy_ = abs (dy);
176 247
177#if 0 248#if 0
178 return dx_ > dy_ 249 return dx_ > dy_
… …
181#else 252#else
182 return dx_ + dy_ - min (dx_, dy_) * 5 / 8; 253 return dx_ + dy_ - min (dx_, dy_) * 5 / 8;
183#endif 254#endif
184} 255}
185 256
257// can be substantially faster than floor, if your value range allows for it
258template<typename T>
259inline T
260fastfloor (T x)
261{
262 return std::floor (x);
263}
264
265inline float
266fastfloor (float x)
267{
268 return sint32(x) - (x < 0);
269}
270
271inline double
272fastfloor (double x)
273{
274 return sint64(x) - (x < 0);
275}
276
186/* 277/*
187 * absdir(int): Returns a number between 1 and 8, which represent 278 * absdir(int): Returns a number between 1 and 8, which represent
188 * the "absolute" direction of a number (it actually takes care of 279 * the "absolute" direction of a number (it actually takes care of
189 * "overflow" in previous calculations of a direction). 280 * "overflow" in previous calculations of a direction).
190 */ 281 */
… …
192absdir (int d) 283absdir (int d)
193{ 284{
194 return ((d - 1) & 7) + 1; 285 return ((d - 1) & 7) + 1;
195} 286}
196 287
288// avoid ctz name because netbsd or freebsd spams it's namespace with it
289#if GCC_VERSION(3,4)
290static inline int least_significant_bit (uint32_t x)
291{
292 return __builtin_ctz (x);
293}
294#else
295int least_significant_bit (uint32_t x);
296#endif
297
298#define for_all_bits_sparse_32(mask, idxvar) \
299 for (uint32_t idxvar, mask_ = mask; \
300 mask_ && ((idxvar = least_significant_bit (mask_)), mask_ &= ~(1 << idxvar), 1);)
301
197extern ssize_t slice_alloc; // statistics 302extern ssize_t slice_alloc; // statistics
198 303
199void *salloc_ (int n) throw (std::bad_alloc); 304void *salloc_ (int n) throw (std::bad_alloc);
200void *salloc_ (int n, void *src) throw (std::bad_alloc); 305void *salloc_ (int n, void *src) throw (std::bad_alloc);
201 306
… …
217inline void sfree (T *ptr, int n = 1) throw () 322inline void sfree (T *ptr, int n = 1) throw ()
218{ 323{
219 if (expect_true (ptr)) 324 if (expect_true (ptr))
220 { 325 {
221 slice_alloc -= n * sizeof (T); 326 slice_alloc -= n * sizeof (T);
327 if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
222 g_slice_free1 (n * sizeof (T), (void *)ptr); 328 g_slice_free1 (n * sizeof (T), (void *)ptr);
223 assert (slice_alloc >= 0);//D
224 } 329 }
330}
331
332// nulls the pointer
333template<typename T>
334inline void sfree0 (T *&ptr, int n = 1) throw ()
335{
336 sfree<T> (ptr, n);
337 ptr = 0;
225} 338}
226 339
227// makes dynamically allocated objects zero-initialised 340// makes dynamically allocated objects zero-initialised
228struct zero_initialised 341struct zero_initialised
229{ 342{
… …
239 } 352 }
240 353
241 void *operator new[] (size_t s) 354 void *operator new[] (size_t s)
242 { 355 {
243 return salloc0<char> (s); 356 return salloc0<char> (s);
357 }
358
359 void operator delete (void *p, size_t s)
360 {
361 sfree ((char *)p, s);
362 }
363
364 void operator delete[] (void *p, size_t s)
365 {
366 sfree ((char *)p, s);
367 }
368};
369
370// makes dynamically allocated objects zero-initialised
371struct slice_allocated
372{
373 void *operator new (size_t s, void *p)
374 {
375 return p;
376 }
377
378 void *operator new (size_t s)
379 {
380 return salloc<char> (s);
381 }
382
383 void *operator new[] (size_t s)
384 {
385 return salloc<char> (s);
244 } 386 }
245 387
246 void operator delete (void *p, size_t s) 388 void operator delete (void *p, size_t s)
247 { 389 {
248 sfree ((char *)p, s); 390 sfree ((char *)p, s);
… …
265 typedef const Tp *const_pointer; 407 typedef const Tp *const_pointer;
266 typedef Tp &reference; 408 typedef Tp &reference;
267 typedef const Tp &const_reference; 409 typedef const Tp &const_reference;
268 typedef Tp value_type; 410 typedef Tp value_type;
269 411
270 template <class U> 412 template <class U>
271 struct rebind 413 struct rebind
272 { 414 {
273 typedef slice_allocator<U> other; 415 typedef slice_allocator<U> other;
274 }; 416 };
275 417
… …
307 { 449 {
308 p->~Tp (); 450 p->~Tp ();
309 } 451 }
310}; 452};
311 453
312// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213. 454// basically a memory area, but refcounted
313// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps 455struct refcnt_buf
314// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
315struct tausworthe_random_generator
316{ 456{
317 // generator 457 char *data;
318 uint32_t state [4];
319 458
320 void operator =(const tausworthe_random_generator &src) 459 refcnt_buf (size_t size = 0);
321 { 460 refcnt_buf (void *data, size_t size);
322 state [0] = src.state [0];
323 state [1] = src.state [1];
324 state [2] = src.state [2];
325 state [3] = src.state [3];
326 }
327 461
328 void seed (uint32_t seed); 462 refcnt_buf (const refcnt_buf &src)
329 uint32_t next ();
330
331 // uniform distribution
332 uint32_t operator ()(uint32_t num)
333 { 463 {
334 return is_constant (num) 464 data = src.data;
335 ? (next () * (uint64_t)num) >> 32U 465 inc ();
336 : get_range (num);
337 } 466 }
338 467
339 // return a number within (min .. max) 468 ~refcnt_buf ();
340 int operator () (int r_min, int r_max)
341 {
342 return is_constant (r_min) && is_constant (r_max) && r_min <= r_max
343 ? r_min + operator ()(r_max - r_min + 1)
344 : get_range (r_min, r_max);
345 }
346 469
347 double operator ()() 470 refcnt_buf &operator =(const refcnt_buf &src);
471
472 operator char *()
348 { 473 {
349 return this->next () / (double)0xFFFFFFFFU; 474 return data;
475 }
476
477 size_t size () const
478 {
479 return _size ();
350 } 480 }
351 481
352protected: 482protected:
353 uint32_t get_range (uint32_t r_max); 483 enum {
354 int get_range (int r_min, int r_max); 484 overhead = sizeof (uint32_t) * 2
355}; 485 };
356 486
357typedef tausworthe_random_generator rand_gen; 487 uint32_t &_size () const
488 {
489 return ((unsigned int *)data)[-2];
490 }
358 491
359extern rand_gen rndm; 492 uint32_t &_refcnt () const
493 {
494 return ((unsigned int *)data)[-1];
495 }
496
497 void _alloc (uint32_t size)
498 {
499 data = ((char *)salloc<char> (size + overhead)) + overhead;
500 _size () = size;
501 _refcnt () = 1;
502 }
503
504 void _dealloc ();
505
506 void inc ()
507 {
508 ++_refcnt ();
509 }
510
511 void dec ()
512 {
513 if (!--_refcnt ())
514 _dealloc ();
515 }
516};
360 517
361INTERFACE_CLASS (attachable) 518INTERFACE_CLASS (attachable)
362struct refcnt_base 519struct refcnt_base
363{ 520{
364 typedef int refcnt_t; 521 typedef int refcnt_t;
… …
426typedef refptr<maptile> maptile_ptr; 583typedef refptr<maptile> maptile_ptr;
427typedef refptr<object> object_ptr; 584typedef refptr<object> object_ptr;
428typedef refptr<archetype> arch_ptr; 585typedef refptr<archetype> arch_ptr;
429typedef refptr<client> client_ptr; 586typedef refptr<client> client_ptr;
430typedef refptr<player> player_ptr; 587typedef refptr<player> player_ptr;
588typedef refptr<region> region_ptr;
589
590#define STRHSH_NULL 2166136261
591
592static inline uint32_t
593strhsh (const char *s)
594{
595 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
596 // it is about twice as fast as the one-at-a-time one,
597 // with good distribution.
598 // FNV-1a is faster on many cpus because the multiplication
599 // runs concurrently with the looping logic.
600 // we modify the hash a bit to improve its distribution
601 uint32_t hash = STRHSH_NULL;
602
603 while (*s)
604 hash = (hash ^ *s++) * 16777619U;
605
606 return hash ^ (hash >> 16);
607}
608
609static inline uint32_t
610memhsh (const char *s, size_t len)
611{
612 uint32_t hash = STRHSH_NULL;
613
614 while (len--)
615 hash = (hash ^ *s++) * 16777619U;
616
617 return hash;
618}
431 619
432struct str_hash 620struct str_hash
433{ 621{
434 std::size_t operator ()(const char *s) const 622 std::size_t operator ()(const char *s) const
435 { 623 {
436 unsigned long hash = 0;
437
438 /* use the one-at-a-time hash function, which supposedly is
439 * better than the djb2-like one used by perl5.005, but
440 * certainly is better then the bug used here before.
441 * see http://burtleburtle.net/bob/hash/doobs.html
442 */
443 while (*s)
444 {
445 hash += *s++;
446 hash += hash << 10;
447 hash ^= hash >> 6;
448 }
449
450 hash += hash << 3;
451 hash ^= hash >> 11;
452 hash += hash << 15;
453
454 return hash; 624 return strhsh (s);
625 }
626
627 std::size_t operator ()(const shstr &s) const
628 {
629 return strhsh (s);
455 } 630 }
456}; 631};
457 632
458struct str_equal 633struct str_equal
459{ 634{
… …
486 } 661 }
487}; 662};
488 663
489// This container blends advantages of linked lists 664// This container blends advantages of linked lists
490// (efficiency) with vectors (random access) by 665// (efficiency) with vectors (random access) by
491// by using an unordered vector and storing the vector 666// using an unordered vector and storing the vector
492// index inside the object. 667// index inside the object.
493// 668//
494// + memory-efficient on most 64 bit archs 669// + memory-efficient on most 64 bit archs
495// + O(1) insert/remove 670// + O(1) insert/remove
496// + free unique (but varying) id for inserted objects 671// + free unique (but varying) id for inserted objects
… …
533 insert (&obj); 708 insert (&obj);
534 } 709 }
535 710
536 void erase (T *obj) 711 void erase (T *obj)
537 { 712 {
538 unsigned int pos = obj->*indexmember; 713 object_vector_index pos = obj->*indexmember;
539 obj->*indexmember = 0; 714 obj->*indexmember = 0;
540 715
541 if (pos < this->size ()) 716 if (pos < this->size ())
542 { 717 {
543 (*this)[pos - 1] = (*this)[this->size () - 1]; 718 (*this)[pos - 1] = (*this)[this->size () - 1];
… …
551 { 726 {
552 erase (&obj); 727 erase (&obj);
553 } 728 }
554}; 729};
555 730
731/////////////////////////////////////////////////////////////////////////////
732
733// something like a vector or stack, but without
734// out of bounds checking
735template<typename T>
736struct fixed_stack
737{
738 T *data;
739 int size;
740 int max;
741
742 fixed_stack ()
743 : size (0), data (0)
744 {
745 }
746
747 fixed_stack (int max)
748 : size (0), max (max)
749 {
750 data = salloc<T> (max);
751 }
752
753 void reset (int new_max)
754 {
755 sfree (data, max);
756 size = 0;
757 max = new_max;
758 data = salloc<T> (max);
759 }
760
761 void free ()
762 {
763 sfree (data, max);
764 data = 0;
765 }
766
767 ~fixed_stack ()
768 {
769 sfree (data, max);
770 }
771
772 T &operator[](int idx)
773 {
774 return data [idx];
775 }
776
777 void push (T v)
778 {
779 data [size++] = v;
780 }
781
782 T &pop ()
783 {
784 return data [--size];
785 }
786
787 T remove (int idx)
788 {
789 T v = data [idx];
790
791 data [idx] = data [--size];
792
793 return v;
794 }
795};
796
797/////////////////////////////////////////////////////////////////////////////
798
556// basically does what strncpy should do, but appends "..." to strings exceeding length 799// basically does what strncpy should do, but appends "..." to strings exceeding length
800// returns the number of bytes actually used (including \0)
557void assign (char *dst, const char *src, int maxlen); 801int assign (char *dst, const char *src, int maxsize);
558 802
559// type-safe version of assign 803// type-safe version of assign
560template<int N> 804template<int N>
561inline void assign (char (&dst)[N], const char *src) 805inline int assign (char (&dst)[N], const char *src)
562{ 806{
563 assign ((char *)&dst, src, N); 807 return assign ((char *)&dst, src, N);
564} 808}
565 809
566typedef double tstamp; 810typedef double tstamp;
567 811
568// return current time as timestamp 812// return current time as timestamp
569tstamp now (); 813tstamp now ();
570 814
571int similar_direction (int a, int b); 815int similar_direction (int a, int b);
572 816
573// like sprintf, but returns a "static" buffer 817// like v?sprintf, but returns a "static" buffer
574const char *format (const char *format, ...); 818char *vformat (const char *format, va_list ap);
819char *format (const char *format, ...) attribute ((format (printf, 1, 2)));
820
821// safety-check player input which will become object->msg
822bool msg_is_safe (const char *msg);
575 823
576///////////////////////////////////////////////////////////////////////////// 824/////////////////////////////////////////////////////////////////////////////
577// threads, very very thin wrappers around pthreads 825// threads, very very thin wrappers around pthreads
578 826
579struct thread 827struct thread
… …
606#else 854#else
607 #define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER 855 #define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER
608#endif 856#endif
609 857
610#define SMUTEX(name) smutex name = SMUTEX_INITIALISER 858#define SMUTEX(name) smutex name = SMUTEX_INITIALISER
611#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name)) 859#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))
612#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name)) 860#define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))
613 861
862typedef pthread_cond_t scond;
863
864#define SCOND(name) scond name = PTHREAD_COND_INITIALIZER
865#define SCOND_SIGNAL(name) pthread_cond_signal (&(name))
866#define SCOND_BROADCAST(name) pthread_cond_broadcast (&(name))
867#define SCOND_WAIT(name,mutex) pthread_cond_wait (&(name), &(mutex))
868
614#endif 869#endif
615 870

Diff Legend

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