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

Diff Legend

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