--- deliantra/server/include/util.h	2007/08/06 10:54:12	1.54
+++ deliantra/server/include/util.h	2008/12/19 22:47:29	1.79
@@ -1,9 +1,9 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -16,13 +16,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 #ifndef UTIL_H__
 #define UTIL_H__
 
-//#define PREFER_MALLOC
+#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)
@@ -44,6 +46,8 @@
 #define expect_false(expr) expect ((expr) != 0, 0)
 #define expect_true(expr)  expect ((expr) != 0, 1)
 
+#include <pthread.h>
+
 #include <cstddef>
 #include <cmath>
 #include <new>
@@ -54,6 +58,19 @@
 #include <shstr.h>
 #include <traits.h>
 
+#if DEBUG_SALLOC
+# define g_slice_alloc0(s) debug_slice_alloc0(s)
+# define g_slice_alloc(s) debug_slice_alloc(s)
+# define g_slice_free1(s,p) debug_slice_free1(s,p)
+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)
 
@@ -72,6 +89,7 @@
 #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);
 
 // rationale for using (U) not (T) is to reduce signed/unsigned issues,
@@ -80,13 +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> static inline void min_it (T &v, T m) { v = min (v, m); }
+template<typename T> static inline void max_it (T &v, T m) { v = max (v, m); }
+template<typename T> static inline void clamp_it (T &v, T a, T b) { v = clamp (v, a, 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
@@ -174,6 +233,45 @@
   return ((d - 1) & 7) + 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);
+
+// 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
 {
@@ -185,51 +283,53 @@
 
   void *operator new (size_t s)
   {
-    return g_slice_alloc0 (s);
+    return salloc0<char> (s);
   }
 
   void *operator new[] (size_t s)
   {
-    return g_slice_alloc0 (s);
+    return salloc0<char> (s);
   }
 
   void operator delete (void *p, size_t s)
   {
-    g_slice_free1 (s, p);
+    sfree ((char *)p, s);
   }
 
   void operator delete[] (void *p, size_t 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 ()
-{
-#ifdef PREFER_MALLOC
-  free (ptr);
-#else
-  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
@@ -251,7 +351,7 @@
   };
 
   slice_allocator () throw () { }
-  slice_allocator (const slice_allocator &o) throw () { }
+  slice_allocator (const slice_allocator &) throw () { }
   template<typename Tp2>
   slice_allocator (const slice_allocator<Tp2> &) throw () { }
 
@@ -270,7 +370,7 @@
     sfree<Tp> (p, n);
   }
 
-  size_type max_size ()const throw ()
+  size_type max_size () const throw ()
   {
     return size_t (-1) / sizeof (Tp);
   }
@@ -305,7 +405,7 @@
   void seed (uint32_t seed);
   uint32_t next ();
 
-  // uniform distribution
+  // uniform distribution, 0 .. max (0, num - 1)
   uint32_t operator ()(uint32_t num)
   {
     return is_constant (num)
@@ -333,7 +433,7 @@
 
 typedef tausworthe_random_generator rand_gen;
 
-extern rand_gen rndm;
+extern rand_gen rndm, rmg_rndm;
 
 INTERFACE_CLASS (attachable)
 struct refcnt_base
@@ -347,6 +447,7 @@
   refcnt_base () : refcnt (0) { }
 };
 
+// to avoid branches with more advanced compilers
 extern refcnt_base::refcnt_t refcnt_dummy;
 
 template<class T>
@@ -541,13 +642,58 @@
 
 typedef double tstamp;
 
-// return current time as timestampe
+// return current time as timestamp
 tstamp now ();
 
 int similar_direction (int a, int b);
 
-// like printf, but returns a std::string
-const std::string format (const char *format, ...);
+// like sprintf, but returns a "static" buffer
+const char *format (const char *format, ...);
+
+/////////////////////////////////////////////////////////////////////////////
+// threads, very very thin wrappers around pthreads
+
+struct thread
+{
+  pthread_t id;
+
+  void start (void *(*start_routine)(void *), void *arg = 0);
+
+  void cancel ()
+  {
+    pthread_cancel (id);
+  }
+
+  void *join ()
+  {
+    void *ret;
+
+    if (pthread_join (id, &ret))
+      cleanup ("pthread_join failed", 1);
+
+    return ret;
+  }
+};
+
+// note that mutexes are not classes
+typedef pthread_mutex_t smutex;
+
+#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
+ #define SMUTEX_INITIALISER PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+#else
+ #define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER
+#endif
+
+#define SMUTEX(name) smutex name = SMUTEX_INITIALISER
+#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