--- deliantra/server/include/util.h 2009/11/11 03:52:44 1.96 +++ deliantra/server/include/util.h 2011/04/22 02:03:11 1.113 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the @@ -57,6 +57,17 @@ // use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever) #define auto(var,expr) decltype(expr) var = (expr) +#if cplusplus_does_not_suck +// does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) +template +static inline int array_length (const T (&arr)[N]) +{ + return N; +} +#else +#define array_length(name) (sizeof (name) / sizeof (name [0])) +#endif + // very ugly macro that basically declares and initialises a variable // that is in scope for the next statement only // works only for stuff that can be assigned 0 and converts to false @@ -95,18 +106,30 @@ static inline T sign (T v) { return v < 0 ? -1 : +1; } // relies on 2c representation template<> -inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); } +inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); } +template<> +inline sint16 sign (sint16 v) { return 1 - (sint16 (uint16 (v) >> 15) * 2); } +template<> +inline sint32 sign (sint32 v) { return 1 - (sint32 (uint32 (v) >> 31) * 2); } // sign0 returns -1, 0 or +1 template static inline T sign0 (T v) { return v ? sign (v) : 0; } +//clashes with C++0x +template +static inline T copysign (T a, U b) { return a > 0 ? b : -b; } + // div* only work correctly for div > 0 // div, with correct rounding (< 0.5 downwards, >=0.5 upwards) template static inline T div (T val, T div) { return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div; } + +template<> inline float div (float val, float div) { return val / div; } +template<> inline double div (double val, double div) { return val / div; } + // div, round-up template static inline T div_ru (T val, T div) { @@ -409,88 +432,6 @@ } }; -// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213. -// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps -// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps -struct tausworthe_random_generator -{ - uint32_t state [4]; - - void operator =(const tausworthe_random_generator &src) - { - state [0] = src.state [0]; - state [1] = src.state [1]; - state [2] = src.state [2]; - state [3] = src.state [3]; - } - - void seed (uint32_t seed); - uint32_t next (); -}; - -// Xorshift RNGs, George Marsaglia -// http://www.jstatsoft.org/v08/i14/paper -// this one is about 40% faster than the tausworthe one above (i.e. not much), -// despite the inlining, and has the issue of only creating 2**32-1 numbers. -// see also http://www.iro.umontreal.ca/~lecuyer/myftp/papers/xorshift.pdf -struct xorshift_random_generator -{ - uint32_t x, y; - - void operator =(const xorshift_random_generator &src) - { - x = src.x; - y = src.y; - } - - void seed (uint32_t seed) - { - x = seed; - y = seed * 69069U; - } - - uint32_t next () - { - uint32_t t = x ^ (x << 10); - x = y; - y = y ^ (y >> 13) ^ t ^ (t >> 10); - return y; - } -}; - -template -struct random_number_generator : generator -{ - // uniform distribution, 0 .. max (0, num - 1) - uint32_t operator ()(uint32_t num) - { - return !is_constant (num) ? get_range (num) // non-constant - : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two - : this->next () & (num - 1); // constant, power-of-two - } - - // return a number within (min .. max) - int operator () (int r_min, int r_max) - { - return is_constant (r_min) && is_constant (r_max) && r_min <= r_max - ? r_min + operator ()(r_max - r_min + 1) - : get_range (r_min, r_max); - } - - double operator ()() - { - return this->next () / (double)0xFFFFFFFFU; - } - -protected: - uint32_t get_range (uint32_t r_max); - int get_range (int r_min, int r_max); -}; - -typedef random_number_generator rand_gen; - -extern rand_gen rndm, rmg_rndm; - INTERFACE_CLASS (attachable) struct refcnt_base { @@ -561,6 +502,7 @@ typedef refptr arch_ptr; typedef refptr client_ptr; typedef refptr player_ptr; +typedef refptr region_ptr; #define STRHSH_NULL 2166136261 @@ -572,12 +514,13 @@ // with good distribution. // FNV-1a is faster on many cpus because the multiplication // runs concurrently with the looping logic. + // we modify the hash a bit to improve its distribution uint32_t hash = STRHSH_NULL; while (*s) - hash = (hash ^ *s++) * 16777619; + hash = (hash ^ *s++) * 16777619U; - return hash; + return hash ^ (hash >> 16); } static inline uint32_t @@ -586,7 +529,7 @@ uint32_t hash = STRHSH_NULL; while (len--) - hash = (hash ^ *s++) * 16777619; + hash = (hash ^ *s++) * 16777619U; return hash; } @@ -702,6 +645,74 @@ } }; +///////////////////////////////////////////////////////////////////////////// + +// something like a vector or stack, but without +// out of bounds checking +template +struct fixed_stack +{ + T *data; + int size; + int max; + + fixed_stack () + : size (0), data (0) + { + } + + fixed_stack (int max) + : size (0), max (max) + { + data = salloc (max); + } + + void reset (int new_max) + { + sfree (data, max); + size = 0; + max = new_max; + data = salloc (max); + } + + void free () + { + sfree (data, max); + data = 0; + } + + ~fixed_stack () + { + sfree (data, max); + } + + T &operator[](int idx) + { + return data [idx]; + } + + void push (T v) + { + data [size++] = v; + } + + T &pop () + { + return data [--size]; + } + + T remove (int idx) + { + T v = data [idx]; + + data [idx] = data [--size]; + + return v; + } +}; + +///////////////////////////////////////////////////////////////////////////// + // basically does what strncpy should do, but appends "..." to strings exceeding length // returns the number of bytes actually used (including \0) int assign (char *dst, const char *src, int maxsize);