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.88 by root, Tue May 5 04:51:56 2009 UTC vs.
Revision 1.127 by root, Sat Nov 17 23:40:02 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 6 *
6 * Deliantra is free software: you can redistribute it and/or modify 7 * 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 8 * 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 9 * Free Software Foundation, either version 3 of the License, or (at your
9 * (at your option) any later version. 10 * option) any later version.
10 * 11 *
11 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 15 * GNU General Public License for more details.
15 * 16 *
16 * You should have received a copy of the GNU General Public License 17 * 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/>. 18 * and the GNU General Public License along with this program. If not, see
19 * <http://www.gnu.org/licenses/>.
18 * 20 *
19 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
20 */ 22 */
21 23
22#ifndef UTIL_H__ 24#ifndef UTIL_H__
23#define UTIL_H__ 25#define UTIL_H__
26
27#include <compiler.h>
24 28
25#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0 29#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0
26#define DEBUG_SALLOC 0 // add a debug wrapper around all sallocs 30#define DEBUG_SALLOC 0 // add a debug wrapper around all sallocs
27#define PREFER_MALLOC 0 // use malloc and not the slice allocator 31#define PREFER_MALLOC 0 // use malloc and not the slice allocator
28
29#if __GNUC__ >= 3
30# define is_constant(c) __builtin_constant_p (c)
31# define expect(expr,value) __builtin_expect ((expr),(value))
32# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
33# define noinline __attribute__((__noinline__))
34#else
35# define is_constant(c) 0
36# define expect(expr,value) (expr)
37# define prefetch(addr,rw,locality)
38# define noinline
39#endif
40
41#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4)
42# define decltype(x) typeof(x)
43#endif
44
45// put into ifs if you are very sure that the expression
46// is mostly true or mosty false. note that these return
47// booleans, not the expression.
48#define expect_false(expr) expect ((expr) ? 1 : 0, 0)
49#define expect_true(expr) expect ((expr) ? 1 : 0, 1)
50 32
51#include <pthread.h> 33#include <pthread.h>
52 34
53#include <cstddef> 35#include <cstddef>
54#include <cmath> 36#include <cmath>
… …
74#endif 56#endif
75 57
76// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever) 58// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
77#define auto(var,expr) decltype(expr) var = (expr) 59#define auto(var,expr) decltype(expr) var = (expr)
78 60
61#if cplusplus_does_not_suck /* still sucks in codesize with gcc 6, although local types work now */
62// does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm)
63template<typename T, int N>
64static inline int array_length (const T (&arr)[N])
65{
66 return N;
67}
68#else
69#define array_length(name) (sizeof (name) / sizeof (name [0]))
70#endif
71
79// very ugly macro that basically declares and initialises a variable 72// very ugly macro that basically declares and initialises a variable
80// that is in scope for the next statement only 73// that is in scope for the next statement only
81// works only for stuff that can be assigned 0 and converts to false 74// works only for stuff that can be assigned 0 and converts to false
82// (note: works great for pointers) 75// (note: works great for pointers)
83// most ugly macro I ever wrote 76// most ugly macro I ever wrote
… …
89 82
90// in range excluding end 83// in range excluding end
91#define IN_RANGE_EXC(val,beg,end) \ 84#define IN_RANGE_EXC(val,beg,end) \
92 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg)) 85 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))
93 86
94void cleanup (const char *cause, bool make_core = false); 87ecb_cold void cleanup (const char *cause, bool make_core = false);
95void fork_abort (const char *msg); 88ecb_cold void fork_abort (const char *msg);
96 89
97// rationale for using (U) not (T) is to reduce signed/unsigned issues, 90// rationale for using (U) not (T) is to reduce signed/unsigned issues,
98// as a is often a constant while b is the variable. it is still a bug, though. 91// as a is often a constant while b is the variable. it is still a bug, though.
99template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; } 92template<typename T, typename U> static inline T min (T a, U b) { return a < (T)b ? a : (T)b; }
100template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; } 93template<typename T, typename U> static inline T max (T a, U b) { return a > (T)b ? a : (T)b; }
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; } 94template<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; }
102 95
103template<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 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); } 97template<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); } 98template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); }
… …
112// sign returns -1 or +1 105// sign returns -1 or +1
113template<typename T> 106template<typename T>
114static inline T sign (T v) { return v < 0 ? -1 : +1; } 107static inline T sign (T v) { return v < 0 ? -1 : +1; }
115// relies on 2c representation 108// relies on 2c representation
116template<> 109template<>
117inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); } 110inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
111template<>
112inline sint16 sign (sint16 v) { return 1 - (sint16 (uint16 (v) >> 15) * 2); }
113template<>
114inline sint32 sign (sint32 v) { return 1 - (sint32 (uint32 (v) >> 31) * 2); }
118 115
119// sign0 returns -1, 0 or +1 116// sign0 returns -1, 0 or +1
120template<typename T> 117template<typename T>
121static inline T sign0 (T v) { return v ? sign (v) : 0; } 118static inline T sign0 (T v) { return v ? sign (v) : 0; }
119
120//clashes with C++0x
121template<typename T, typename U>
122static inline T copysign (T a, U b) { return a > 0 ? b : -b; }
122 123
123// div* only work correctly for div > 0 124// div* only work correctly for div > 0
124// div, with correct rounding (< 0.5 downwards, >=0.5 upwards) 125// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
125template<typename T> static inline T div (T val, T div) 126template<typename T> static inline T div (T val, T div)
126{ 127{
127 return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div; 128 return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div;
128} 129}
130
131template<> inline float div (float val, float div) { return val / div; }
132template<> inline double div (double val, double div) { return val / div; }
133
129// div, round-up 134// div, round-up
130template<typename T> static inline T div_ru (T val, T div) 135template<typename T> static inline T div_ru (T val, T div)
131{ 136{
132 return expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div; 137 return expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div;
133} 138}
… …
205 int32_t d = b - a; 210 int32_t d = b - a;
206 d &= d >> 31; 211 d &= d >> 31;
207 return b - d; 212 return b - d;
208} 213}
209 214
210// this is much faster than crossfires original algorithm 215// this is much faster than crossfire's original algorithm
211// on modern cpus 216// on modern cpus
212inline int 217inline int
213isqrt (int n) 218isqrt (int n)
214{ 219{
215 return (int)sqrtf ((float)n); 220 return (int)sqrtf ((float)n);
221}
222
223// this is kind of like the ^^ operator, if it would exist, without sequence point.
224// more handy than it looks like, due to the implicit !! done on its arguments
225inline bool
226logical_xor (bool a, bool b)
227{
228 return a != b;
229}
230
231inline bool
232logical_implies (bool a, bool b)
233{
234 return a <= b;
216} 235}
217 236
218// this is only twice as fast as naive sqrtf (dx*dy+dy*dy) 237// this is only twice as fast as naive sqrtf (dx*dy+dy*dy)
219#if 0 238#if 0
220// and has a max. error of 6 in the range -100..+100. 239// and has a max. error of 6 in the range -100..+100.
221#else 240#else
222// and has a max. error of 9 in the range -100..+100. 241// and has a max. error of 9 in the range -100..+100.
223#endif 242#endif
224inline int 243inline int
225idistance (int dx, int dy) 244idistance (int dx, int dy)
226{ 245{
227 unsigned int dx_ = abs (dx); 246 unsigned int dx_ = abs (dx);
228 unsigned int dy_ = abs (dy); 247 unsigned int dy_ = abs (dy);
229 248
230#if 0 249#if 0
231 return dx_ > dy_ 250 return dx_ > dy_
… …
234#else 253#else
235 return dx_ + dy_ - min (dx_, dy_) * 5 / 8; 254 return dx_ + dy_ - min (dx_, dy_) * 5 / 8;
236#endif 255#endif
237} 256}
238 257
258// can be substantially faster than floor, if your value range allows for it
259template<typename T>
260inline T
261fastfloor (T x)
262{
263 return std::floor (x);
264}
265
266inline float
267fastfloor (float x)
268{
269 return sint32(x) - (x < 0);
270}
271
272inline double
273fastfloor (double x)
274{
275 return sint64(x) - (x < 0);
276}
277
239/* 278/*
240 * absdir(int): Returns a number between 1 and 8, which represent 279 * absdir(int): Returns a number between 1 and 8, which represent
241 * the "absolute" direction of a number (it actually takes care of 280 * the "absolute" direction of a number (it actually takes care of
242 * "overflow" in previous calculations of a direction). 281 * "overflow" in previous calculations of a direction).
243 */ 282 */
… …
245absdir (int d) 284absdir (int d)
246{ 285{
247 return ((d - 1) & 7) + 1; 286 return ((d - 1) & 7) + 1;
248} 287}
249 288
289#define for_all_bits_sparse_32(mask, idxvar) \
290 for (uint32_t idxvar, mask_ = mask; \
291 mask_ && ((idxvar = ecb_ctz32 (mask_)), mask_ &= ~(1 << idxvar), 1);)
292
250extern ssize_t slice_alloc; // statistics 293extern ssize_t slice_alloc; // statistics
251 294
252void *salloc_ (int n) throw (std::bad_alloc); 295void *salloc_ (int n);
253void *salloc_ (int n, void *src) throw (std::bad_alloc); 296void *salloc_ (int n, void *src);
254 297
255// strictly the same as g_slice_alloc, but never returns 0 298// strictly the same as g_slice_alloc, but never returns 0
256template<typename T> 299template<typename T>
257inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); } 300inline T *salloc (int n = 1) { return (T *)salloc_ (n * sizeof (T)); }
258 301
259// also copies src into the new area, like "memdup" 302// also copies src into the new area, like "memdup"
260// if src is 0, clears the memory 303// if src is 0, clears the memory
261template<typename T> 304template<typename T>
262inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); } 305inline T *salloc (int n, T *src) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
263 306
264// clears the memory 307// clears the memory
265template<typename T> 308template<typename T>
266inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); } 309inline T *salloc0(int n = 1) { return (T *)salloc_ (n * sizeof (T), 0); }
267 310
268// for symmetry 311// for symmetry
269template<typename T> 312template<typename T>
270inline void sfree (T *ptr, int n = 1) throw () 313inline void sfree (T *ptr, int n = 1) noexcept
271{ 314{
272 if (expect_true (ptr)) 315 if (expect_true (ptr))
273 { 316 {
274 slice_alloc -= n * sizeof (T); 317 slice_alloc -= n * sizeof (T);
275 if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T)); 318 if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
276 g_slice_free1 (n * sizeof (T), (void *)ptr); 319 g_slice_free1 (n * sizeof (T), (void *)ptr);
277 assert (slice_alloc >= 0);//D
278 } 320 }
279} 321}
280 322
281// nulls the pointer 323// nulls the pointer
282template<typename T> 324template<typename T>
283inline void sfree0 (T *&ptr, int n = 1) throw () 325inline void sfree0 (T *&ptr, int n = 1) noexcept
284{ 326{
285 sfree<T> (ptr, n); 327 sfree<T> (ptr, n);
286 ptr = 0; 328 ptr = 0;
287} 329}
288 330
… …
356 typedef const Tp *const_pointer; 398 typedef const Tp *const_pointer;
357 typedef Tp &reference; 399 typedef Tp &reference;
358 typedef const Tp &const_reference; 400 typedef const Tp &const_reference;
359 typedef Tp value_type; 401 typedef Tp value_type;
360 402
361 template <class U> 403 template <class U>
362 struct rebind 404 struct rebind
363 { 405 {
364 typedef slice_allocator<U> other; 406 typedef slice_allocator<U> other;
365 }; 407 };
366 408
367 slice_allocator () throw () { } 409 slice_allocator () noexcept { }
368 slice_allocator (const slice_allocator &) throw () { } 410 slice_allocator (const slice_allocator &) noexcept { }
369 template<typename Tp2> 411 template<typename Tp2>
370 slice_allocator (const slice_allocator<Tp2> &) throw () { } 412 slice_allocator (const slice_allocator<Tp2> &) noexcept { }
371 413
372 ~slice_allocator () { } 414 ~slice_allocator () { }
373 415
374 pointer address (reference x) const { return &x; } 416 pointer address (reference x) const { return &x; }
375 const_pointer address (const_reference x) const { return &x; } 417 const_pointer address (const_reference x) const { return &x; }
… …
382 void deallocate (pointer p, size_type n) 424 void deallocate (pointer p, size_type n)
383 { 425 {
384 sfree<Tp> (p, n); 426 sfree<Tp> (p, n);
385 } 427 }
386 428
387 size_type max_size () const throw () 429 size_type max_size () const noexcept
388 { 430 {
389 return size_t (-1) / sizeof (Tp); 431 return size_t (-1) / sizeof (Tp);
390 } 432 }
391 433
392 void construct (pointer p, const Tp &val) 434 void construct (pointer p, const Tp &val)
… …
398 { 440 {
399 p->~Tp (); 441 p->~Tp ();
400 } 442 }
401}; 443};
402 444
403// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213. 445// basically a memory area, but refcounted
404// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps 446struct refcnt_buf
405// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
406struct tausworthe_random_generator
407{ 447{
408 uint32_t state [4]; 448 char *data;
409 449
410 void operator =(const tausworthe_random_generator &src) 450 refcnt_buf (size_t size = 0);
411 { 451 refcnt_buf (void *data, size_t size);
412 state [0] = src.state [0];
413 state [1] = src.state [1];
414 state [2] = src.state [2];
415 state [3] = src.state [3];
416 }
417 452
418 void seed (uint32_t seed); 453 refcnt_buf (const refcnt_buf &src)
419 uint32_t next ();
420};
421
422// Xorshift RNGs, George Marsaglia
423// http://www.jstatsoft.org/v08/i14/paper
424// this one is about 40% faster than the tausworthe one above (i.e. not much),
425// despite the inlining, and has the issue of only creating 2**32-1 numbers.
426// see also http://www.iro.umontreal.ca/~lecuyer/myftp/papers/xorshift.pdf
427struct xorshift_random_generator
428{
429 uint32_t x, y;
430
431 void operator =(const xorshift_random_generator &src)
432 { 454 {
433 x = src.x; 455 data = src.data;
434 y = src.y; 456 inc ();
435 } 457 }
436 458
437 void seed (uint32_t seed) 459 ~refcnt_buf ();
438 {
439 x = seed;
440 y = seed * 69069U;
441 }
442 460
443 uint32_t next () 461 refcnt_buf &operator =(const refcnt_buf &src);
462
463 operator char *()
444 { 464 {
445 uint32_t t = x ^ (x << 10);
446 x = y;
447 y = y ^ (y >> 13) ^ t ^ (t >> 10);
448 return y; 465 return data;
449 } 466 }
450};
451 467
452template<class generator> 468 size_t size () const
453struct random_number_generator : generator
454{
455 // uniform distribution, 0 .. max (0, num - 1)
456 uint32_t operator ()(uint32_t num)
457 { 469 {
458 return !is_constant (num) ? get_range (num) // non-constant 470 return _size ();
459 : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
460 : this->next () & (num - 1); // constant, power-of-two
461 }
462
463 // return a number within (min .. max)
464 int operator () (int r_min, int r_max)
465 {
466 return is_constant (r_min) && is_constant (r_max) && r_min <= r_max
467 ? r_min + operator ()(r_max - r_min + 1)
468 : get_range (r_min, r_max);
469 }
470
471 double operator ()()
472 {
473 return this->next () / (double)0xFFFFFFFFU;
474 } 471 }
475 472
476protected: 473protected:
477 uint32_t get_range (uint32_t r_max); 474 enum {
478 int get_range (int r_min, int r_max); 475 overhead = sizeof (uint32_t) * 2
479}; 476 };
480 477
481typedef random_number_generator<tausworthe_random_generator> rand_gen; 478 uint32_t &_size () const
479 {
480 return ((unsigned int *)data)[-2];
481 }
482 482
483extern rand_gen rndm, rmg_rndm; 483 uint32_t &_refcnt () const
484 {
485 return ((unsigned int *)data)[-1];
486 }
487
488 void _alloc (uint32_t size)
489 {
490 data = ((char *)salloc<char> (size + overhead)) + overhead;
491 _size () = size;
492 _refcnt () = 1;
493 }
494
495 void _dealloc ();
496
497 void inc ()
498 {
499 ++_refcnt ();
500 }
501
502 void dec ()
503 {
504 if (!--_refcnt ())
505 _dealloc ();
506 }
507};
484 508
485INTERFACE_CLASS (attachable) 509INTERFACE_CLASS (attachable)
486struct refcnt_base 510struct refcnt_base
487{ 511{
488 typedef int refcnt_t; 512 typedef int refcnt_t;
… …
503 // p if not null 527 // p if not null
504 refcnt_base::refcnt_t *refcnt_ref () { return p ? &p->refcnt : &refcnt_dummy; } 528 refcnt_base::refcnt_t *refcnt_ref () { return p ? &p->refcnt : &refcnt_dummy; }
505 529
506 void refcnt_dec () 530 void refcnt_dec ()
507 { 531 {
508 if (!is_constant (p)) 532 if (!ecb_is_constant (p))
509 --*refcnt_ref (); 533 --*refcnt_ref ();
510 else if (p) 534 else if (p)
511 --p->refcnt; 535 --p->refcnt;
512 } 536 }
513 537
514 void refcnt_inc () 538 void refcnt_inc ()
515 { 539 {
516 if (!is_constant (p)) 540 if (!ecb_is_constant (p))
517 ++*refcnt_ref (); 541 ++*refcnt_ref ();
518 else if (p) 542 else if (p)
519 ++p->refcnt; 543 ++p->refcnt;
520 } 544 }
521 545
… …
550typedef refptr<maptile> maptile_ptr; 574typedef refptr<maptile> maptile_ptr;
551typedef refptr<object> object_ptr; 575typedef refptr<object> object_ptr;
552typedef refptr<archetype> arch_ptr; 576typedef refptr<archetype> arch_ptr;
553typedef refptr<client> client_ptr; 577typedef refptr<client> client_ptr;
554typedef refptr<player> player_ptr; 578typedef refptr<player> player_ptr;
579typedef refptr<region> region_ptr;
580
581#define STRHSH_NULL 2166136261
582
583static inline uint32_t
584strhsh (const char *s)
585{
586 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
587 // it is about twice as fast as the one-at-a-time one,
588 // with good distribution.
589 // FNV-1a is faster on many cpus because the multiplication
590 // runs concurrently with the looping logic.
591 // we modify the hash a bit to improve its distribution
592 uint32_t hash = STRHSH_NULL;
593
594 while (*s)
595 hash = (hash ^ *s++) * 16777619U;
596
597 return hash ^ (hash >> 16);
598}
599
600static inline uint32_t
601memhsh (const char *s, size_t len)
602{
603 uint32_t hash = STRHSH_NULL;
604
605 while (len--)
606 hash = (hash ^ *s++) * 16777619U;
607
608 return hash;
609}
555 610
556struct str_hash 611struct str_hash
557{ 612{
558 std::size_t operator ()(const char *s) const 613 std::size_t operator ()(const char *s) const
559 { 614 {
560#if 0
561 uint32_t hash = 0;
562
563 /* use the one-at-a-time hash function, which supposedly is
564 * better than the djb2-like one used by perl5.005, but
565 * certainly is better then the bug used here before.
566 * see http://burtleburtle.net/bob/hash/doobs.html
567 */
568 while (*s)
569 {
570 hash += *s++;
571 hash += hash << 10;
572 hash ^= hash >> 6;
573 }
574
575 hash += hash << 3;
576 hash ^= hash >> 11;
577 hash += hash << 15;
578#else
579 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
580 // it is about twice as fast as the one-at-a-time one,
581 // with good distribution.
582 // FNV-1a is faster on many cpus because the multiplication
583 // runs concurrent with the looping logic.
584 uint32_t hash = 2166136261;
585
586 while (*s)
587 hash = (hash ^ *s++) * 16777619;
588#endif
589
590 return hash; 615 return strhsh (s);
616 }
617
618 std::size_t operator ()(const shstr &s) const
619 {
620 return strhsh (s);
591 } 621 }
592}; 622};
593 623
594struct str_equal 624struct str_equal
595{ 625{
… …
622 } 652 }
623}; 653};
624 654
625// This container blends advantages of linked lists 655// This container blends advantages of linked lists
626// (efficiency) with vectors (random access) by 656// (efficiency) with vectors (random access) by
627// by using an unordered vector and storing the vector 657// using an unordered vector and storing the vector
628// index inside the object. 658// index inside the object.
629// 659//
630// + memory-efficient on most 64 bit archs 660// + memory-efficient on most 64 bit archs
631// + O(1) insert/remove 661// + O(1) insert/remove
632// + free unique (but varying) id for inserted objects 662// + free unique (but varying) id for inserted objects
… …
669 insert (&obj); 699 insert (&obj);
670 } 700 }
671 701
672 void erase (T *obj) 702 void erase (T *obj)
673 { 703 {
674 unsigned int pos = obj->*indexmember; 704 object_vector_index pos = obj->*indexmember;
675 obj->*indexmember = 0; 705 obj->*indexmember = 0;
676 706
677 if (pos < this->size ()) 707 if (pos < this->size ())
678 { 708 {
679 (*this)[pos - 1] = (*this)[this->size () - 1]; 709 (*this)[pos - 1] = (*this)[this->size () - 1];
… …
687 { 717 {
688 erase (&obj); 718 erase (&obj);
689 } 719 }
690}; 720};
691 721
722/////////////////////////////////////////////////////////////////////////////
723
724// something like a vector or stack, but without
725// out of bounds checking
726template<typename T>
727struct fixed_stack
728{
729 T *data;
730 int size;
731 int max;
732
733 fixed_stack ()
734 : size (0), data (0)
735 {
736 }
737
738 fixed_stack (int max)
739 : size (0), max (max)
740 {
741 data = salloc<T> (max);
742 }
743
744 void reset (int new_max)
745 {
746 sfree (data, max);
747 size = 0;
748 max = new_max;
749 data = salloc<T> (max);
750 }
751
752 void free ()
753 {
754 sfree (data, max);
755 data = 0;
756 }
757
758 ~fixed_stack ()
759 {
760 sfree (data, max);
761 }
762
763 T &operator[](int idx)
764 {
765 return data [idx];
766 }
767
768 void push (T v)
769 {
770 data [size++] = v;
771 }
772
773 T &pop ()
774 {
775 return data [--size];
776 }
777
778 T remove (int idx)
779 {
780 T v = data [idx];
781
782 data [idx] = data [--size];
783
784 return v;
785 }
786};
787
788/////////////////////////////////////////////////////////////////////////////
789
692// basically does what strncpy should do, but appends "..." to strings exceeding length 790// basically does what strncpy should do, but appends "..." to strings exceeding length
693// returns the number of bytes actually used (including \0) 791// returns the number of bytes actually used (including \0)
694int assign (char *dst, const char *src, int maxsize); 792int assign (char *dst, const char *src, int maxsize);
695 793
696// type-safe version of assign 794// type-safe version of assign
… …
705// return current time as timestamp 803// return current time as timestamp
706tstamp now (); 804tstamp now ();
707 805
708int similar_direction (int a, int b); 806int similar_direction (int a, int b);
709 807
710// like sprintf, but returns a "static" buffer 808// like v?sprintf, but returns a "static" buffer
711const char *format (const char *format, ...); 809char *vformat (const char *format, va_list ap);
810char *format (const char *format, ...) ecb_attribute ((format (printf, 1, 2)));
811
812// safety-check player input which will become object->msg
813bool msg_is_safe (const char *msg);
712 814
713///////////////////////////////////////////////////////////////////////////// 815/////////////////////////////////////////////////////////////////////////////
714// threads, very very thin wrappers around pthreads 816// threads, very very thin wrappers around pthreads
715 817
716struct thread 818struct thread

Diff Legend

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