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.97 by root, Fri Mar 26 01:04:44 2010 UTC vs.
Revision 1.132 by root, Thu Dec 20 04:40:15 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,2009,2010 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__
25
26#include <compiler.h>
27 26
28#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0 27#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0
29#define DEBUG_SALLOC 0 // add a debug wrapper around all sallocs 28#define DEBUG_SALLOC 0 // add a debug wrapper around all sallocs
30#define PREFER_MALLOC 0 // use malloc and not the slice allocator 29#define PREFER_MALLOC 0 // use malloc and not the slice allocator
31 30
… …
36#include <new> 35#include <new>
37#include <vector> 36#include <vector>
38 37
39#include <glib.h> 38#include <glib.h>
40 39
40#include <flat_hash_map.hpp>
41
41#include <shstr.h> 42#include <shstr.h>
42#include <traits.h> 43#include <traits.h>
44
45#include "ecb.h"
43 46
44#if DEBUG_SALLOC 47#if DEBUG_SALLOC
45# define g_slice_alloc0(s) debug_slice_alloc0(s) 48# define g_slice_alloc0(s) debug_slice_alloc0(s)
46# define g_slice_alloc(s) debug_slice_alloc(s) 49# define g_slice_alloc(s) debug_slice_alloc(s)
47# define g_slice_free1(s,p) debug_slice_free1(s,p) 50# define g_slice_free1(s,p) debug_slice_free1(s,p)
… …
52# define g_slice_alloc0(s) calloc (1, (s)) 55# define g_slice_alloc0(s) calloc (1, (s))
53# define g_slice_alloc(s) malloc ((s)) 56# define g_slice_alloc(s) malloc ((s))
54# define g_slice_free1(s,p) free ((p)) 57# define g_slice_free1(s,p) free ((p))
55#endif 58#endif
56 59
57// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
58#define auto(var,expr) decltype(expr) var = (expr)
59
60// very ugly macro that basically declares and initialises a variable 60// very ugly macro that basically declares and initialises a variable
61// that is in scope for the next statement only 61// that is in scope for the next statement only
62// works only for stuff that can be assigned 0 and converts to false 62// works only for stuff that can be assigned 0 and converts to false
63// (note: works great for pointers) 63// (note: works great for pointers)
64// most ugly macro I ever wrote 64// most ugly macro I ever wrote
… …
70 70
71// in range excluding end 71// in range excluding end
72#define IN_RANGE_EXC(val,beg,end) \ 72#define IN_RANGE_EXC(val,beg,end) \
73 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg)) 73 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))
74 74
75void cleanup (const char *cause, bool make_core = false); 75ecb_cold void cleanup (const char *cause, bool make_core = false);
76void fork_abort (const char *msg); 76ecb_cold void fork_abort (const char *msg);
77 77
78// rationale for using (U) not (T) is to reduce signed/unsigned issues, 78// rationale for using (U) not (T) is to reduce signed/unsigned issues,
79// as a is often a constant while b is the variable. it is still a bug, though. 79// as a is often a constant while b is the variable. it is still a bug, though.
80template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; } 80template<typename T, typename U> static inline T min (T a, U b) { return a < (T)b ? a : (T)b; }
81template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; } 81template<typename T, typename U> static inline T max (T a, U b) { return a > (T)b ? a : (T)b; }
82template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? (T)a : v >(T)b ? (T)b : v; } 82template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? (T)a : v >(T)b ? (T)b : v; }
83 83
84template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); } 84template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); }
85template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); } 85template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); }
86template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); } 86template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); }
… …
93// sign returns -1 or +1 93// sign returns -1 or +1
94template<typename T> 94template<typename T>
95static inline T sign (T v) { return v < 0 ? -1 : +1; } 95static inline T sign (T v) { return v < 0 ? -1 : +1; }
96// relies on 2c representation 96// relies on 2c representation
97template<> 97template<>
98inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); } 98inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
99template<>
100inline sint16 sign (sint16 v) { return 1 - (sint16 (uint16 (v) >> 15) * 2); }
101template<>
102inline sint32 sign (sint32 v) { return 1 - (sint32 (uint32 (v) >> 31) * 2); }
99 103
100// sign0 returns -1, 0 or +1 104// sign0 returns -1, 0 or +1
101template<typename T> 105template<typename T>
102static inline T sign0 (T v) { return v ? sign (v) : 0; } 106static inline T sign0 (T v) { return v ? sign (v) : 0; }
107
108//clashes with C++0x
109template<typename T, typename U>
110static inline T copysign (T a, U b) { return a > 0 ? b : -b; }
103 111
104// div* only work correctly for div > 0 112// div* only work correctly for div > 0
105// div, with correct rounding (< 0.5 downwards, >=0.5 upwards) 113// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
106template<typename T> static inline T div (T val, T div) 114template<typename T> static inline T div (T val, T div)
107{ 115{
108 return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div; 116 return ecb_expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div;
109} 117}
118
119template<> inline float div (float val, float div) { return val / div; }
120template<> inline double div (double val, double div) { return val / div; }
121
110// div, round-up 122// div, round-up
111template<typename T> static inline T div_ru (T val, T div) 123template<typename T> static inline T div_ru (T val, T div)
112{ 124{
113 return expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div; 125 return ecb_expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div;
114} 126}
115// div, round-down 127// div, round-down
116template<typename T> static inline T div_rd (T val, T div) 128template<typename T> static inline T div_rd (T val, T div)
117{ 129{
118 return expect_false (val < 0) ? - ((-val + (div - 1) ) / div) : (val ) / div; 130 return ecb_expect_false (val < 0) ? - ((-val + (div - 1) ) / div) : (val ) / div;
119} 131}
120 132
121// lerp* only work correctly for min_in < max_in 133// lerp* only work correctly for min_in < max_in
122// Linear intERPolate, scales val from min_in..max_in to min_out..max_out 134// Linear intERPolate, scales val from min_in..max_in to min_out..max_out
123template<typename T> 135template<typename T>
… …
214#if 0 226#if 0
215// and has a max. error of 6 in the range -100..+100. 227// and has a max. error of 6 in the range -100..+100.
216#else 228#else
217// and has a max. error of 9 in the range -100..+100. 229// and has a max. error of 9 in the range -100..+100.
218#endif 230#endif
219inline int 231inline int
220idistance (int dx, int dy) 232idistance (int dx, int dy)
221{ 233{
222 unsigned int dx_ = abs (dx); 234 unsigned int dx_ = abs (dx);
223 unsigned int dy_ = abs (dy); 235 unsigned int dy_ = abs (dy);
224 236
225#if 0 237#if 0
226 return dx_ > dy_ 238 return dx_ > dy_
… …
229#else 241#else
230 return dx_ + dy_ - min (dx_, dy_) * 5 / 8; 242 return dx_ + dy_ - min (dx_, dy_) * 5 / 8;
231#endif 243#endif
232} 244}
233 245
246// can be substantially faster than floor, if your value range allows for it
247template<typename T>
248inline T
249fastfloor (T x)
250{
251 return std::floor (x);
252}
253
254inline float
255fastfloor (float x)
256{
257 return sint32(x) - (x < 0);
258}
259
260inline double
261fastfloor (double x)
262{
263 return sint64(x) - (x < 0);
264}
265
234/* 266/*
235 * absdir(int): Returns a number between 1 and 8, which represent 267 * absdir(int): Returns a number between 1 and 8, which represent
236 * the "absolute" direction of a number (it actually takes care of 268 * the "absolute" direction of a number (it actually takes care of
237 * "overflow" in previous calculations of a direction). 269 * "overflow" in previous calculations of a direction).
238 */ 270 */
… …
240absdir (int d) 272absdir (int d)
241{ 273{
242 return ((d - 1) & 7) + 1; 274 return ((d - 1) & 7) + 1;
243} 275}
244 276
245// avoid ctz name because netbsd or freebsd spams it's namespace with it
246#if GCC_VERSION(3,4)
247static inline int least_significant_bit (uint32_t x)
248{
249 return __builtin_ctz (x);
250}
251#else
252int least_significant_bit (uint32_t x);
253#endif
254
255#define for_all_bits_sparse_32(mask, idxvar) \ 277#define for_all_bits_sparse_32(mask, idxvar) \
256 for (uint32_t idxvar, mask_ = mask; \ 278 for (uint32_t idxvar, mask_ = mask; \
257 mask_ && ((idxvar = least_significant_bit (mask_)), mask_ &= ~(1 << idxvar), 1);) 279 mask_ && ((idxvar = ecb_ctz32 (mask_)), mask_ &= ~(1 << idxvar), 1);)
258 280
259extern ssize_t slice_alloc; // statistics 281extern ssize_t slice_alloc; // statistics
260 282
261void *salloc_ (int n) throw (std::bad_alloc); 283void *salloc_ (int n);
262void *salloc_ (int n, void *src) throw (std::bad_alloc); 284void *salloc_ (int n, void *src);
263 285
264// strictly the same as g_slice_alloc, but never returns 0 286// strictly the same as g_slice_alloc, but never returns 0
265template<typename T> 287template<typename T>
266inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); } 288inline T *salloc (int n = 1) { return (T *)salloc_ (n * sizeof (T)); }
267 289
268// also copies src into the new area, like "memdup" 290// also copies src into the new area, like "memdup"
269// if src is 0, clears the memory 291// if src is 0, clears the memory
270template<typename T> 292template<typename T>
271inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); } 293inline T *salloc (int n, T *src) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
272 294
273// clears the memory 295// clears the memory
274template<typename T> 296template<typename T>
275inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); } 297inline T *salloc0(int n = 1) { return (T *)salloc_ (n * sizeof (T), 0); }
276 298
277// for symmetry 299// for symmetry
278template<typename T> 300template<typename T>
279inline void sfree (T *ptr, int n = 1) throw () 301inline void sfree (T *ptr, int n = 1) noexcept
280{ 302{
281 if (expect_true (ptr)) 303 if (ecb_expect_true (ptr))
282 { 304 {
283 slice_alloc -= n * sizeof (T); 305 slice_alloc -= n * sizeof (T);
284 if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T)); 306 if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
285 g_slice_free1 (n * sizeof (T), (void *)ptr); 307 g_slice_free1 (n * sizeof (T), (void *)ptr);
286 assert (slice_alloc >= 0);//D
287 } 308 }
288} 309}
289 310
290// nulls the pointer 311// nulls the pointer
291template<typename T> 312template<typename T>
292inline void sfree0 (T *&ptr, int n = 1) throw () 313inline void sfree0 (T *&ptr, int n = 1) noexcept
293{ 314{
294 sfree<T> (ptr, n); 315 sfree<T> (ptr, n);
295 ptr = 0; 316 ptr = 0;
296} 317}
297 318
… …
353 sfree ((char *)p, s); 374 sfree ((char *)p, s);
354 } 375 }
355}; 376};
356 377
357// a STL-compatible allocator that uses g_slice 378// a STL-compatible allocator that uses g_slice
358// boy, this is verbose 379// boy, this is much less verbose in newer C++ versions
359template<typename Tp> 380template<typename Tp>
360struct slice_allocator 381struct slice_allocator
361{ 382{
362 typedef size_t size_type; 383 using value_type = Tp;
363 typedef ptrdiff_t difference_type;
364 typedef Tp *pointer;
365 typedef const Tp *const_pointer;
366 typedef Tp &reference;
367 typedef const Tp &const_reference;
368 typedef Tp value_type;
369 384
370 template <class U> 385 slice_allocator () noexcept { }
371 struct rebind 386 template<class U> slice_allocator (const slice_allocator<U> &) noexcept {}
387
388 value_type *allocate (std::size_t n)
372 { 389 {
373 typedef slice_allocator<U> other; 390 return salloc<Tp> (n);
391 }
392
393 void deallocate (value_type *p, std::size_t n)
394 {
395 sfree<Tp> (p, n);
396 }
397};
398
399template<class T, class U>
400bool operator == (const slice_allocator<T> &, const slice_allocator<U> &) noexcept
401{
402 return true;
403}
404
405template<class T, class U>
406bool operator != (const slice_allocator<T> &x, const slice_allocator<U> &y) noexcept
407{
408 return !(x == y);
409}
410
411// basically a memory area, but refcounted
412struct refcnt_buf
413{
414 char *data;
415
416 refcnt_buf (size_t size = 0);
417 refcnt_buf (void *data, size_t size);
418
419 refcnt_buf (const refcnt_buf &src)
420 {
421 data = src.data;
422 inc ();
423 }
424
425 ~refcnt_buf ();
426
427 refcnt_buf &operator =(const refcnt_buf &src);
428
429 operator char *()
430 {
431 return data;
432 }
433
434 size_t size () const
435 {
436 return _size ();
437 }
438
439protected:
440 enum {
441 overhead = sizeof (uint32_t) * 2
374 }; 442 };
375 443
376 slice_allocator () throw () { } 444 uint32_t &_size () const
377 slice_allocator (const slice_allocator &) throw () { }
378 template<typename Tp2>
379 slice_allocator (const slice_allocator<Tp2> &) throw () { }
380
381 ~slice_allocator () { }
382
383 pointer address (reference x) const { return &x; }
384 const_pointer address (const_reference x) const { return &x; }
385
386 pointer allocate (size_type n, const_pointer = 0)
387 { 445 {
388 return salloc<Tp> (n); 446 return ((unsigned int *)data)[-2];
389 } 447 }
390 448
391 void deallocate (pointer p, size_type n) 449 uint32_t &_refcnt () const
392 { 450 {
393 sfree<Tp> (p, n); 451 return ((unsigned int *)data)[-1];
394 } 452 }
395 453
396 size_type max_size () const throw ()
397 {
398 return size_t (-1) / sizeof (Tp);
399 }
400
401 void construct (pointer p, const Tp &val)
402 {
403 ::new (p) Tp (val);
404 }
405
406 void destroy (pointer p)
407 {
408 p->~Tp ();
409 }
410};
411
412// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213.
413// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps
414// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
415struct tausworthe_random_generator
416{
417 uint32_t state [4];
418
419 void operator =(const tausworthe_random_generator &src)
420 {
421 state [0] = src.state [0];
422 state [1] = src.state [1];
423 state [2] = src.state [2];
424 state [3] = src.state [3];
425 }
426
427 void seed (uint32_t seed);
428 uint32_t next ();
429};
430
431// Xorshift RNGs, George Marsaglia
432// http://www.jstatsoft.org/v08/i14/paper
433// this one is about 40% faster than the tausworthe one above (i.e. not much),
434// despite the inlining, and has the issue of only creating 2**32-1 numbers.
435// see also http://www.iro.umontreal.ca/~lecuyer/myftp/papers/xorshift.pdf
436struct xorshift_random_generator
437{
438 uint32_t x, y;
439
440 void operator =(const xorshift_random_generator &src)
441 {
442 x = src.x;
443 y = src.y;
444 }
445
446 void seed (uint32_t seed) 454 void _alloc (uint32_t size)
447 { 455 {
448 x = seed; 456 data = ((char *)salloc<char> (size + overhead)) + overhead;
449 y = seed * 69069U; 457 _size () = size;
458 _refcnt () = 1;
450 } 459 }
451 460
452 uint32_t next () 461 void _dealloc ();
453 {
454 uint32_t t = x ^ (x << 10);
455 x = y;
456 y = y ^ (y >> 13) ^ t ^ (t >> 10);
457 return y;
458 }
459};
460 462
461template<class generator> 463 void inc ()
462struct random_number_generator : generator
463{
464 // uniform distribution, 0 .. max (0, num - 1)
465 uint32_t operator ()(uint32_t num)
466 { 464 {
467 return !is_constant (num) ? get_range (num) // non-constant 465 ++_refcnt ();
468 : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
469 : this->next () & (num - 1); // constant, power-of-two
470 } 466 }
471 467
472 // return a number within (min .. max) 468 void dec ()
473 int operator () (int r_min, int r_max)
474 { 469 {
475 return is_constant (r_min) && is_constant (r_max) && r_min <= r_max 470 if (!--_refcnt ())
476 ? r_min + operator ()(r_max - r_min + 1) 471 _dealloc ();
477 : get_range (r_min, r_max);
478 } 472 }
479
480 double operator ()()
481 {
482 return this->next () / (double)0xFFFFFFFFU;
483 }
484
485protected:
486 uint32_t get_range (uint32_t r_max);
487 int get_range (int r_min, int r_max);
488}; 473};
489
490typedef random_number_generator<tausworthe_random_generator> rand_gen;
491
492extern rand_gen rndm, rmg_rndm;
493 474
494INTERFACE_CLASS (attachable) 475INTERFACE_CLASS (attachable)
495struct refcnt_base 476struct refcnt_base
496{ 477{
497 typedef int refcnt_t; 478 typedef int refcnt_t;
… …
512 // p if not null 493 // p if not null
513 refcnt_base::refcnt_t *refcnt_ref () { return p ? &p->refcnt : &refcnt_dummy; } 494 refcnt_base::refcnt_t *refcnt_ref () { return p ? &p->refcnt : &refcnt_dummy; }
514 495
515 void refcnt_dec () 496 void refcnt_dec ()
516 { 497 {
517 if (!is_constant (p)) 498 if (!ecb_is_constant (p))
518 --*refcnt_ref (); 499 --*refcnt_ref ();
519 else if (p) 500 else if (p)
520 --p->refcnt; 501 --p->refcnt;
521 } 502 }
522 503
523 void refcnt_inc () 504 void refcnt_inc ()
524 { 505 {
525 if (!is_constant (p)) 506 if (!ecb_is_constant (p))
526 ++*refcnt_ref (); 507 ++*refcnt_ref ();
527 else if (p) 508 else if (p)
528 ++p->refcnt; 509 ++p->refcnt;
529 } 510 }
530 511
… …
559typedef refptr<maptile> maptile_ptr; 540typedef refptr<maptile> maptile_ptr;
560typedef refptr<object> object_ptr; 541typedef refptr<object> object_ptr;
561typedef refptr<archetype> arch_ptr; 542typedef refptr<archetype> arch_ptr;
562typedef refptr<client> client_ptr; 543typedef refptr<client> client_ptr;
563typedef refptr<player> player_ptr; 544typedef refptr<player> player_ptr;
545typedef refptr<region> region_ptr;
564 546
565#define STRHSH_NULL 2166136261 547#define STRHSH_NULL 2166136261
566 548
567static inline uint32_t 549static inline uint32_t
568strhsh (const char *s) 550strhsh (const char *s)
… …
570 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/) 552 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
571 // it is about twice as fast as the one-at-a-time one, 553 // it is about twice as fast as the one-at-a-time one,
572 // with good distribution. 554 // with good distribution.
573 // FNV-1a is faster on many cpus because the multiplication 555 // FNV-1a is faster on many cpus because the multiplication
574 // runs concurrently with the looping logic. 556 // runs concurrently with the looping logic.
557 // we modify the hash a bit to improve its distribution
575 uint32_t hash = STRHSH_NULL; 558 uint32_t hash = STRHSH_NULL;
576 559
577 while (*s) 560 while (*s)
578 hash = (hash ^ *s++) * 16777619; 561 hash = (hash ^ *s++) * 16777619U;
579 562
580 return hash; 563 return hash ^ (hash >> 16);
581} 564}
582 565
583static inline uint32_t 566static inline uint32_t
584memhsh (const char *s, size_t len) 567memhsh (const char *s, size_t len)
585{ 568{
586 uint32_t hash = STRHSH_NULL; 569 uint32_t hash = STRHSH_NULL;
587 570
588 while (len--) 571 while (len--)
589 hash = (hash ^ *s++) * 16777619; 572 hash = (hash ^ *s++) * 16777619U;
590 573
591 return hash; 574 return hash;
592} 575}
593 576
594struct str_hash 577struct str_hash
… …
600 583
601 std::size_t operator ()(const shstr &s) const 584 std::size_t operator ()(const shstr &s) const
602 { 585 {
603 return strhsh (s); 586 return strhsh (s);
604 } 587 }
588
589 typedef ska::power_of_two_hash_policy hash_policy;
605}; 590};
606 591
607struct str_equal 592struct str_equal
608{ 593{
609 bool operator ()(const char *a, const char *b) const 594 bool operator ()(const char *a, const char *b) const
… …
635 } 620 }
636}; 621};
637 622
638// This container blends advantages of linked lists 623// This container blends advantages of linked lists
639// (efficiency) with vectors (random access) by 624// (efficiency) with vectors (random access) by
640// by using an unordered vector and storing the vector 625// using an unordered vector and storing the vector
641// index inside the object. 626// index inside the object.
642// 627//
643// + memory-efficient on most 64 bit archs 628// + memory-efficient on most 64 bit archs
644// + O(1) insert/remove 629// + O(1) insert/remove
645// + free unique (but varying) id for inserted objects 630// + free unique (but varying) id for inserted objects
… …
682 insert (&obj); 667 insert (&obj);
683 } 668 }
684 669
685 void erase (T *obj) 670 void erase (T *obj)
686 { 671 {
687 unsigned int pos = obj->*indexmember; 672 object_vector_index pos = obj->*indexmember;
688 obj->*indexmember = 0; 673 obj->*indexmember = 0;
689 674
690 if (pos < this->size ()) 675 if (pos < this->size ())
691 { 676 {
692 (*this)[pos - 1] = (*this)[this->size () - 1]; 677 (*this)[pos - 1] = (*this)[this->size () - 1];
… …
700 { 685 {
701 erase (&obj); 686 erase (&obj);
702 } 687 }
703}; 688};
704 689
690/////////////////////////////////////////////////////////////////////////////
691
692// something like a vector or stack, but without
693// out of bounds checking
694template<typename T>
695struct fixed_stack
696{
697 T *data;
698 int size;
699 int max;
700
701 fixed_stack ()
702 : size (0), data (0)
703 {
704 }
705
706 fixed_stack (int max)
707 : size (0), max (max)
708 {
709 data = salloc<T> (max);
710 }
711
712 void reset (int new_max)
713 {
714 sfree (data, max);
715 size = 0;
716 max = new_max;
717 data = salloc<T> (max);
718 }
719
720 void free ()
721 {
722 sfree (data, max);
723 data = 0;
724 }
725
726 ~fixed_stack ()
727 {
728 sfree (data, max);
729 }
730
731 T &operator[](int idx)
732 {
733 return data [idx];
734 }
735
736 void push (T v)
737 {
738 data [size++] = v;
739 }
740
741 T &pop ()
742 {
743 return data [--size];
744 }
745
746 T remove (int idx)
747 {
748 T v = data [idx];
749
750 data [idx] = data [--size];
751
752 return v;
753 }
754};
755
756/////////////////////////////////////////////////////////////////////////////
757
705// basically does what strncpy should do, but appends "..." to strings exceeding length 758// basically does what strncpy should do, but appends "..." to strings exceeding length
706// returns the number of bytes actually used (including \0) 759// returns the number of bytes actually used (including \0)
707int assign (char *dst, const char *src, int maxsize); 760int assign (char *dst, const char *src, int maxsize);
708 761
709// type-safe version of assign 762// type-safe version of assign
… …
720 773
721int similar_direction (int a, int b); 774int similar_direction (int a, int b);
722 775
723// like v?sprintf, but returns a "static" buffer 776// like v?sprintf, but returns a "static" buffer
724char *vformat (const char *format, va_list ap); 777char *vformat (const char *format, va_list ap);
725char *format (const char *format, ...) attribute ((format (printf, 1, 2))); 778char *format (const char *format, ...) ecb_attribute ((format (printf, 1, 2)));
726 779
727// safety-check player input which will become object->msg 780// safety-check player input which will become object->msg
728bool msg_is_safe (const char *msg); 781bool msg_is_safe (const char *msg);
729 782
730///////////////////////////////////////////////////////////////////////////// 783/////////////////////////////////////////////////////////////////////////////

Diff Legend

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