--- deliantra/server/include/util.h 2010/07/02 02:00:47 1.110
+++ deliantra/server/include/util.h 2018/11/14 22:52:13 1.125
@@ -1,22 +1,22 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / 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
*/
@@ -57,7 +57,7 @@
// 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
+#if cplusplus_does_not_suck /* still sucks in codesize with gcc 6, although local types work now */
// 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])
@@ -88,8 +88,8 @@
// 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.
-template static inline T min (T a, U b) { return (U)a < b ? (U)a : b; }
-template static inline T max (T a, U b) { return (U)a > b ? (U)a : b; }
+template static inline T min (T a, U b) { return a < (T)b ? a : (T)b; }
+template static inline T max (T a, U b) { return a > (T)b ? a : (T)b; }
template static inline T clamp (T v, U a, V b) { return v < (T)a ? (T)a : v >(T)b ? (T)b : v; }
template static inline void min_it (T &v, U m) { v = min (v, (T)m); }
@@ -116,6 +116,7 @@
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; }
@@ -238,9 +239,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);
@@ -253,6 +254,26 @@
#endif
}
+// can be substantially faster than floor, if your value range allows for it
+template
+inline T
+fastfloor (T x)
+{
+ return std::floor (x);
+}
+
+inline float
+fastfloor (float x)
+{
+ return sint32(x) - (x < 0);
+}
+
+inline double
+fastfloor (double x)
+{
+ return sint64(x) - (x < 0);
+}
+
/*
* absdir(int): Returns a number between 1 and 8, which represent
* the "absolute" direction of a number (it actually takes care of
@@ -280,38 +301,37 @@
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))
{
slice_alloc -= n * sizeof (T);
if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
g_slice_free1 (n * sizeof (T), (void *)ptr);
- assert (slice_alloc >= 0);//D
}
}
// 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;
@@ -389,16 +409,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 () { }
@@ -415,7 +435,7 @@
sfree (p, n);
}
- size_type max_size () const throw ()
+ size_type max_size () const noexcept
{
return size_t (-1) / sizeof (Tp);
}
@@ -431,6 +451,70 @@
}
};
+// basically a memory area, but refcounted
+struct refcnt_buf
+{
+ char *data;
+
+ refcnt_buf (size_t size = 0);
+ refcnt_buf (void *data, size_t size);
+
+ refcnt_buf (const refcnt_buf &src)
+ {
+ data = src.data;
+ inc ();
+ }
+
+ ~refcnt_buf ();
+
+ refcnt_buf &operator =(const refcnt_buf &src);
+
+ operator char *()
+ {
+ return data;
+ }
+
+ size_t size () const
+ {
+ return _size ();
+ }
+
+protected:
+ enum {
+ overhead = sizeof (uint32_t) * 2
+ };
+
+ uint32_t &_size () const
+ {
+ return ((unsigned int *)data)[-2];
+ }
+
+ uint32_t &_refcnt () const
+ {
+ return ((unsigned int *)data)[-1];
+ }
+
+ void _alloc (uint32_t size)
+ {
+ data = ((char *)salloc (size + overhead)) + overhead;
+ _size () = size;
+ _refcnt () = 1;
+ }
+
+ void _dealloc ();
+
+ void inc ()
+ {
+ ++_refcnt ();
+ }
+
+ void dec ()
+ {
+ if (!--_refcnt ())
+ _dealloc ();
+ }
+};
+
INTERFACE_CLASS (attachable)
struct refcnt_base
{
@@ -513,19 +597,20 @@
// 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++) * 16777619U;
- return hash;
+ return hash ^ (hash >> 16);
}
static inline uint32_t
memhsh (const char *s, size_t len)
{
uint32_t hash = STRHSH_NULL;
-
+
while (len--)
hash = (hash ^ *s++) * 16777619U;
@@ -578,7 +663,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
@@ -625,7 +710,7 @@
void erase (T *obj)
{
- unsigned int pos = obj->*indexmember;
+ object_vector_index pos = obj->*indexmember;
obj->*indexmember = 0;
if (pos < this->size ())
@@ -643,6 +728,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);