--- deliantra/server/include/util.h 2012/01/03 11:23:41 1.117
+++ deliantra/server/include/util.h 2018/12/05 19:03:27 1.130
@@ -1,22 +1,23 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- *
+ *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 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
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the Affero GNU General Public License
* and the GNU General Public License along with this program. If not, see
* .
- *
+ *
* The authors can be reached via e-mail to
*/
@@ -38,6 +39,8 @@
#include
+#include
+
#include
#include
@@ -54,20 +57,6 @@
# define g_slice_free1(s,p) free ((p))
#endif
-// 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
@@ -83,8 +72,8 @@
#define IN_RANGE_EXC(val,beg,end) \
((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))
-void cleanup (const char *cause, bool make_core = false);
-void fork_abort (const char *msg);
+ecb_cold void cleanup (const char *cause, bool make_core = false);
+ecb_cold void fork_abort (const char *msg);
// rationale for using (U) not (T) is to reduce signed/unsigned issues,
// as a is often a constant while b is the variable. it is still a bug, though.
@@ -124,7 +113,7 @@
// 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;
+ return ecb_expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div;
}
template<> inline float div (float val, float div) { return val / div; }
@@ -133,12 +122,12 @@
// div, round-up
template static inline T div_ru (T val, T div)
{
- return expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div;
+ return ecb_expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div;
}
// div, round-down
template static inline T div_rd (T val, T div)
{
- return expect_false (val < 0) ? - ((-val + (div - 1) ) / div) : (val ) / div;
+ return ecb_expect_false (val < 0) ? - ((-val + (div - 1) ) / div) : (val ) / div;
}
// lerp* only work correctly for min_in < max_in
@@ -239,9 +228,9 @@
#else
// and has a max. error of 9 in the range -100..+100.
#endif
-inline int
+inline int
idistance (int dx, int dy)
-{
+{
unsigned int dx_ = abs (dx);
unsigned int dy_ = abs (dy);
@@ -285,43 +274,33 @@
return ((d - 1) & 7) + 1;
}
-// avoid ctz name because netbsd or freebsd spams it's namespace with it
-#if GCC_VERSION(3,4)
-static inline int least_significant_bit (uint32_t x)
-{
- return __builtin_ctz (x);
-}
-#else
-int least_significant_bit (uint32_t x);
-#endif
-
#define for_all_bits_sparse_32(mask, idxvar) \
for (uint32_t idxvar, mask_ = mask; \
- mask_ && ((idxvar = least_significant_bit (mask_)), mask_ &= ~(1 << idxvar), 1);)
+ mask_ && ((idxvar = ecb_ctz32 (mask_)), mask_ &= ~(1 << idxvar), 1);)
extern ssize_t slice_alloc; // statistics
-void *salloc_ (int n) throw (std::bad_alloc);
-void *salloc_ (int n, void *src) throw (std::bad_alloc);
+void *salloc_ (int n);
+void *salloc_ (int n, void *src);
// strictly the same as g_slice_alloc, but never returns 0
template
-inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
+inline T *salloc (int n = 1) { return (T *)salloc_ (n * sizeof (T)); }
// also copies src into the new area, like "memdup"
// if src is 0, clears the memory
template
-inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
+inline T *salloc (int n, T *src) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
// clears the memory
template
-inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
+inline T *salloc0(int n = 1) { return (T *)salloc_ (n * sizeof (T), 0); }
// for symmetry
template
-inline void sfree (T *ptr, int n = 1) throw ()
+inline void sfree (T *ptr, int n = 1) noexcept
{
- if (expect_true (ptr))
+ if (ecb_expect_true (ptr))
{
slice_alloc -= n * sizeof (T);
if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
@@ -331,7 +310,7 @@
// nulls the pointer
template
-inline void sfree0 (T *&ptr, int n = 1) throw ()
+inline void sfree0 (T *&ptr, int n = 1) noexcept
{
sfree (ptr, n);
ptr = 0;
@@ -409,16 +388,16 @@
typedef const Tp &const_reference;
typedef Tp value_type;
- template
+ template
struct rebind
{
typedef slice_allocator other;
};
- slice_allocator () throw () { }
- slice_allocator (const slice_allocator &) throw () { }
+ slice_allocator () noexcept { }
+ slice_allocator (const slice_allocator &) noexcept { }
template
- slice_allocator (const slice_allocator &) throw () { }
+ slice_allocator (const slice_allocator &) noexcept { }
~slice_allocator () { }
@@ -435,7 +414,7 @@
sfree (p, n);
}
- size_type max_size () const throw ()
+ size_type max_size () const noexcept
{
return size_t (-1) / sizeof (Tp);
}
@@ -462,7 +441,7 @@
refcnt_buf (const refcnt_buf &src)
{
data = src.data;
- ++_refcnt ();
+ inc ();
}
~refcnt_buf ();
@@ -481,30 +460,37 @@
protected:
enum {
- overhead = sizeof (unsigned int) * 2
+ overhead = sizeof (uint32_t) * 2
};
- unsigned int &_size () const
+ uint32_t &_size () const
{
return ((unsigned int *)data)[-2];
}
- unsigned int &_refcnt () const
+ uint32_t &_refcnt () const
{
return ((unsigned int *)data)[-1];
}
- void _alloc (unsigned int size)
+ void _alloc (uint32_t size)
{
data = ((char *)salloc (size + overhead)) + overhead;
_size () = size;
_refcnt () = 1;
}
+ void _dealloc ();
+
+ void inc ()
+ {
+ ++_refcnt ();
+ }
+
void dec ()
{
if (!--_refcnt ())
- sfree (data - overhead, size () + overhead);
+ _dealloc ();
}
};
@@ -531,7 +517,7 @@
void refcnt_dec ()
{
- if (!is_constant (p))
+ if (!ecb_is_constant (p))
--*refcnt_ref ();
else if (p)
--p->refcnt;
@@ -539,7 +525,7 @@
void refcnt_inc ()
{
- if (!is_constant (p))
+ if (!ecb_is_constant (p))
++*refcnt_ref ();
else if (p)
++p->refcnt;
@@ -592,7 +578,7 @@
// 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++) * 16777619U;
@@ -603,7 +589,7 @@
memhsh (const char *s, size_t len)
{
uint32_t hash = STRHSH_NULL;
-
+
while (len--)
hash = (hash ^ *s++) * 16777619U;
@@ -621,6 +607,8 @@
{
return strhsh (s);
}
+
+ typedef ska::power_of_two_hash_policy hash_policy;
};
struct str_equal
@@ -656,7 +644,7 @@
// This container blends advantages of linked lists
// (efficiency) with vectors (random access) by
-// by using an unordered vector and storing the vector
+// using an unordered vector and storing the vector
// index inside the object.
//
// + memory-efficient on most 64 bit archs
@@ -703,7 +691,7 @@
void erase (T *obj)
{
- unsigned int pos = obj->*indexmember;
+ object_vector_index pos = obj->*indexmember;
obj->*indexmember = 0;
if (pos < this->size ())
@@ -809,7 +797,7 @@
// like v?sprintf, but returns a "static" buffer
char *vformat (const char *format, va_list ap);
-char *format (const char *format, ...) attribute ((format (printf, 1, 2)));
+char *format (const char *format, ...) ecb_attribute ((format (printf, 1, 2)));
// safety-check player input which will become object->msg
bool msg_is_safe (const char *msg);