--- deliantra/server/include/util.h	2006/11/17 19:40:54	1.16
+++ deliantra/server/include/util.h	2007/01/25 03:54:45	1.36
@@ -1,6 +1,8 @@
 #ifndef UTIL_H__
 #define UTIL_H__
 
+//#define PREFER_MALLOC
+
 #if __GNUC__ >= 3
 # define is_constant(c) __builtin_constant_p (c)
 #else
@@ -8,12 +10,83 @@
 #endif
 
 #include <cstddef>
+#include <cmath>
+#include <new>
+#include <vector>
 
 #include <glib.h>
 
+#include <shstr.h>
+#include <traits.h>
+
 // use a gcc extension for auto declarations until ISO C++ sanctifies them
 #define AUTODECL(var,expr) typeof(expr) var = (expr)
 
+// very ugly macro that basicaly 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)
+// most ugly macro I ever wrote
+#define declvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
+
+// in range including end
+#define IN_RANGE_INC(val,beg,end) \
+  ((unsigned int)(val) - (unsigned int)(beg) <= (unsigned int)(end) - (unsigned int)(beg))
+
+// in range excluding end
+#define IN_RANGE_EXC(val,beg,end) \
+  ((unsigned int)(val) - (unsigned int)(beg) <  (unsigned int)(end) - (unsigned int)(beg))
+
+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.
+template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; }
+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 swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
+
+// this is much faster than crossfires original algorithm
+// on modern cpus
+inline int
+isqrt (int n)
+{
+  return (int)sqrtf ((float)n);
+}
+
+// this is only twice as fast as naive sqrtf (dx*dy+dy*dy)
+#if 0
+// and has a max. error of 6 in the range -100..+100.
+#else
+// and has a max. error of 9 in the range -100..+100.
+#endif
+inline int 
+idistance (int dx, int dy)
+{ 
+  unsigned int dx_ = abs (dx);
+  unsigned int dy_ = abs (dy);
+
+#if 0
+  return dx_ > dy_
+      ? (dx_ * 61685 + dy_ * 26870) >> 16
+      : (dy_ * 61685 + dx_ * 26870) >> 16;
+#else
+  return dx_ + dy_ - min (dx_, dy_) * 5 / 8;
+#endif
+}
+
+/*
+ * absdir(int): Returns a number between 1 and 8, which represent
+ * the "absolute" direction of a number (it actually takes care of
+ * "overflow" in previous calculations of a direction).
+ */
+inline int
+absdir (int d)
+{
+  return ((d - 1) & 7) + 1;
+}
+
 // makes dynamically allocated objects zero-initialised
 struct zero_initialised
 {
@@ -44,12 +117,31 @@
   }
 };
 
+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
-void *alloc (int s) throw (std::bad_alloc);
+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
-inline void dealloc (void *p, int s) throw ()
+template<typename T>
+inline void sfree (T *ptr, int n = 1) throw ()
 {
-  g_slice_free1 (s, p);
+#ifdef PREFER_MALLOC
+  free (ptr);
+#else
+  g_slice_free1 (n * sizeof (T), (void *)ptr);
+#endif
 }
 
 // a STL-compatible allocator that uses g_slice
@@ -83,12 +175,12 @@
 
   pointer allocate (size_type n, const_pointer = 0)
   {
-    return static_cast<pointer>(alloc (n * sizeof (Tp)));
+    return salloc<Tp> (n);
   }
 
   void deallocate (pointer p, size_type n)
   {
-    dealloc (static_cast<void *>(p), n * sizeof (Tp));
+    sfree<Tp> (p, n);
   }
 
   size_type max_size ()const throw ()
@@ -107,21 +199,55 @@
   }
 };
 
-struct refcounted
+// 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
 {
-  refcounted () : refcnt (0) { }
-//  virtual ~refcounted ();
-  void refcnt_inc () { ++refcnt; }
-  void refcnt_dec () { --refcnt; }
-  bool dead () { return refcnt == 0; }
-  mutable int refcnt;
-#if 0
-private:
-  static refcounted *rc_first;
-  refcounted *rc_next;
-#endif
+  // 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 ();
+
+  // uniform distribution
+  uint32_t operator ()(uint32_t r_max)
+  {
+    return is_constant (r_max)
+             ? this->next () % r_max
+             : get_range (r_max);
+  }
+
+  // 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 + (*this) (max (r_max - r_min + 1, 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 tausworthe_random_generator rand_gen;
+
+extern rand_gen rndm;
+
 template<class T>
 struct refptr
 {
@@ -153,6 +279,12 @@
   operator T *() const { return p; }
 };
 
+typedef refptr<maptile>   maptile_ptr;
+typedef refptr<object>    object_ptr;
+typedef refptr<archetype> arch_ptr;
+typedef refptr<client>    client_ptr;
+typedef refptr<player>    player_ptr;
+
 struct str_hash
 {
   std::size_t operator ()(const char *s) const
@@ -187,10 +319,8 @@
   }
 };
 
-#include <vector>
-
-template<class obj>
-struct unordered_vector : std::vector<obj, slice_allocator<obj> >
+template<class T>
+struct unordered_vector : std::vector<T, slice_allocator<T> >
 {
   typedef typename unordered_vector::iterator iterator;
 
@@ -208,11 +338,41 @@
   }
 };
 
-template<typename T, typename U> static inline T min (T a, U b) { return a < (T)b ? a : (T)b; }
-template<typename T, typename U> static inline T max (T a, U b) { return a > (T)b ? a : (T)b; }
-template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? a : v >(T)b ? b : v; }
+template<class T, int T::* index>
+struct object_vector : std::vector<T *, slice_allocator<T *> >
+{
+  void insert (T *obj)
+  {
+    assert (!(obj->*index));
+    push_back (obj);
+    obj->*index = this->size ();
+  }
 
-template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
+  void insert (T &obj)
+  {
+    insert (&obj);
+  }
+
+  void erase (T *obj)
+  {
+    assert (obj->*index);
+    int pos = obj->*index;
+    obj->*index = 0;
+
+    if (pos < this->size ())
+      {
+        (*this)[pos - 1] = (*this)[this->size () - 1];
+        (*this)[pos - 1]->*index = pos;
+      }
+
+    this->pop_back ();
+  }
+
+  void erase (T &obj)
+  {
+    errase (&obj);
+  }
+};
 
 // basically does what strncpy should do, but appends "..." to strings exceeding length
 void assign (char *dst, const char *src, int maxlen);
@@ -224,5 +384,12 @@
   assign ((char *)&dst, src, N);
 }
 
+typedef double tstamp;
+
+// return current time as timestampe
+tstamp now ();
+
+int similar_direction (int a, int b);
+
 #endif