--- deliantra/server/include/util.h	2008/04/02 11:13:55	1.66
+++ deliantra/server/include/util.h	2008/12/30 07:24:16	1.83
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 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 GNU General Public License as published by
@@ -22,8 +22,9 @@
 #ifndef UTIL_H__
 #define UTIL_H__
 
-#define DEBUG_SALLOC 0
-#define PREFER_MALLOC 0
+#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0
+#define DEBUG_SALLOC  0   // add a debug wrapper around all sallocs
+#define PREFER_MALLOC 0   // use malloc and not the slice allocator
 
 #if __GNUC__ >= 3
 # define is_constant(c)             __builtin_constant_p (c)
@@ -64,12 +65,16 @@
 void *g_slice_alloc (unsigned long size);
 void *g_slice_alloc0 (unsigned long size);
 void g_slice_free1 (unsigned long size, void *ptr);
+#elif PREFER_MALLOC
+# define g_slice_alloc0(s) calloc (1, (s))
+# define g_slice_alloc(s) malloc ((s))
+# 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)
 
-// very ugly macro that basicaly declares and initialises a variable
+// 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
 // (note: works great for pointers)
@@ -93,16 +98,54 @@
 template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; }
 template<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; }
 
+template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); }
+template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); }
+template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); }
+
 template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
 
 template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }
 template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }
 
+// sign returns -1 or +1
+template<typename T>
+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); }
+
+// sign0 returns -1, 0 or +1
+template<typename T>
+static inline T sign0 (T v) { return v ? sign (v) : 0; }
+
+// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
+template<typename T> static inline T div    (T val, T div) { return (val + div / 2) / div; }
+// div, round-up
+template<typename T> static inline T div_ru (T val, T div) { return (val + div - 1) / div; }
+// div, round-down
+template<typename T> static inline T div_rd (T val, T div) { return (val          ) / div; }
+
 template<typename T>
 static inline T
 lerp (T val, T min_in, T max_in, T min_out, T max_out)
 {
-  return (val - min_in) * (max_out - min_out) / (max_in - min_in) + min_out;
+  return min_out + div   <T> ((val - min_in) * (max_out - min_out), max_in  - min_in);
+}
+
+// lerp, round-down
+template<typename T>
+static inline T
+lerp_rd (T val, T min_in, T max_in, T min_out, T max_out)
+{
+  return min_out + div_rd<T> ((val - min_in) * (max_out - min_out), max_in  - min_in);
+}
+
+// lerp, round-up
+template<typename T>
+static inline T
+lerp_ru (T val, T min_in, T max_in, T min_out, T max_out)
+{
+  return min_out + div_ru<T> ((val - min_in) * (max_out - min_out), max_in  - min_in);
 }
 
 // lots of stuff taken from FXT
@@ -190,7 +233,44 @@
   return ((d - 1) & 7) + 1;
 }
 
-extern size_t slice_alloc; // statistics
+extern ssize_t slice_alloc; // statistics
+
+void *salloc_ (int n)            throw (std::bad_alloc);
+void *salloc_ (int n, void *src) throw (std::bad_alloc);
+
+// strictly the same as g_slice_alloc, but never returns 0
+template<typename T>
+inline T *salloc (int n = 1)     throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T));              }
+
+// also copies src into the new area, like "memdup"
+// if src is 0, clears the memory
+template<typename T>
+inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
+
+// clears the memory
+template<typename T>
+inline T *salloc0(int n = 1)     throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0);           }
+
+// for symmetry
+template<typename T>
+inline void sfree (T *ptr, int n = 1) throw ()
+{
+  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<typename T>
+inline void sfree0 (T *&ptr, int n = 1) throw ()
+{
+  sfree<T> (ptr, n);
+  ptr = 0;
+}
 
 // makes dynamically allocated objects zero-initialised
 struct zero_initialised
@@ -203,56 +283,53 @@
 
   void *operator new (size_t s)
   {
-    slice_alloc += s;
-    return g_slice_alloc0 (s);
+    return salloc0<char> (s);
   }
 
   void *operator new[] (size_t s)
   {
-    slice_alloc += s;
-    return g_slice_alloc0 (s);
+    return salloc0<char> (s);
   }
 
   void operator delete (void *p, size_t s)
   {
-    slice_alloc -= s;
-    g_slice_free1 (s, p);
+    sfree ((char *)p, s);
   }
 
   void operator delete[] (void *p, size_t s)
   {
-    slice_alloc -= s;
-    g_slice_free1 (s, p);
+    sfree ((char *)p, s);
   }
 };
 
-void *salloc_ (int n)            throw (std::bad_alloc);
-void *salloc_ (int n, void *src) throw (std::bad_alloc);
+// makes dynamically allocated objects zero-initialised
+struct slice_allocated
+{
+  void *operator new (size_t s, void *p)
+  {
+    return p;
+  }
 
-// strictly the same as g_slice_alloc, but never returns 0
-template<typename T>
-inline T *salloc (int n = 1)     throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T));              }
+  void *operator new (size_t s)
+  {
+    return salloc<char> (s);
+  }
 
-// also copies src into the new area, like "memdup"
-// if src is 0, clears the memory
-template<typename T>
-inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
+  void *operator new[] (size_t s)
+  {
+    return salloc<char> (s);
+  }
 
-// clears the memory
-template<typename T>
-inline T *salloc0(int n = 1)     throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0);           }
+  void operator delete (void *p, size_t s)
+  {
+    sfree ((char *)p, s);
+  }
 
-// for symmetry
-template<typename T>
-inline void sfree (T *ptr, int n = 1) throw ()
-{
-#if PREFER_MALLOC
-  free (ptr);
-#else
-  slice_alloc -= n * sizeof (T);
-  g_slice_free1 (n * sizeof (T), (void *)ptr);
-#endif
-}
+  void operator delete[] (void *p, size_t s)
+  {
+    sfree ((char *)p, s);
+  }
+};
 
 // a STL-compatible allocator that uses g_slice
 // boy, this is verbose
@@ -314,7 +391,6 @@
 // http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
 struct tausworthe_random_generator
 {
-  // generator
   uint32_t state [4];
 
   void operator =(const tausworthe_random_generator &src)
@@ -327,13 +403,46 @@
 
   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.
+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;
+  }
+};
 
-  // uniform distribution
+template<class generator>
+struct random_number_generator : generator
+{
+  // uniform distribution, 0 .. max (0, num - 1)
   uint32_t operator ()(uint32_t num)
   {
-    return is_constant (num)
-             ? (next () * (uint64_t)num) >> 32U
-             : get_range (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)
@@ -354,9 +463,9 @@
   int get_range (int r_min, int r_max);
 };
 
-typedef tausworthe_random_generator rand_gen;
+typedef random_number_generator<tausworthe_random_generator> rand_gen;
 
-extern rand_gen rndm;
+extern rand_gen rndm, rmg_rndm;
 
 INTERFACE_CLASS (attachable)
 struct refcnt_base
@@ -608,8 +717,15 @@
 #endif
 
 #define SMUTEX(name) smutex name = SMUTEX_INITIALISER
-#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))
+#define SMUTEX_LOCK(name)   pthread_mutex_lock   (&(name))
 #define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))
 
+typedef pthread_cond_t scond;
+
+#define SCOND(name) scond name = PTHREAD_COND_INITIALIZER
+#define SCOND_SIGNAL(name)     pthread_cond_signal    (&(name))
+#define SCOND_BROADCAST(name)  pthread_cond_broadcast (&(name))
+#define SCOND_WAIT(name,mutex) pthread_cond_wait      (&(name), &(mutex))
+
 #endif