--- deliantra/server/include/util.h	2007/01/15 01:39:42	1.29
+++ deliantra/server/include/util.h	2007/06/02 03:48:29	1.47
@@ -1,12 +1,50 @@
+/*
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * 
+ * Crossfire TRT 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 2 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 GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ */
+
 #ifndef UTIL_H__
 #define UTIL_H__
 
+//#define PREFER_MALLOC
+
 #if __GNUC__ >= 3
-# define is_constant(c) __builtin_constant_p (c)
+# define is_constant(c)             __builtin_constant_p (c)
+# define expect(expr,value)         __builtin_expect ((expr),(value))
+# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
 #else
-# define is_constant(c) 0
+# define is_constant(c)             0
+# define expect(expr,value)         (expr)
+# define prefetch(addr,rw,locality)
 #endif
 
+#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4)
+# define decltype(x) typeof(x)
+#endif
+
+// put into ifs if you are very sure that the expression
+// is mostly true or mosty false. note that these return
+// booleans, not the expression.
+#define expect_false(expr) expect ((expr) != 0, 0)
+#define expect_true(expr)  expect ((expr) != 0, 1)
+
 #include <cstddef>
 #include <cmath>
 #include <new>
@@ -18,7 +56,7 @@
 #include <traits.h>
 
 // use a gcc extension for auto declarations until ISO C++ sanctifies them
-#define AUTODECL(var,expr) typeof(expr) var = (expr)
+#define auto(var,expr) decltype(expr) var = (expr)
 
 // very ugly macro that basicaly declares and initialises a variable
 // that is in scope for the next statement only
@@ -35,6 +73,68 @@
 #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; }
+
+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;
+}
+
+// lots of stuff taken from FXT
+
+/* Rotate right. This is used in various places for checksumming */
+//TODO: that sucks, use a better checksum algo
+static inline uint32_t
+rotate_right (uint32_t c, uint32_t count = 1)
+{
+  return (c << (32 - count)) | (c >> count);
+}
+
+static inline uint32_t
+rotate_left (uint32_t c, uint32_t count = 1)
+{
+  return (c >> (32 - count)) | (c << count);
+}
+
+// Return abs(a-b)
+// Both a and b must not have the most significant bit set
+static inline uint32_t
+upos_abs_diff (uint32_t a, uint32_t b)
+{
+  long d1 = b - a;
+  long d2 = (d1 & (d1 >> 31)) << 1;
+
+  return d1 - d2;               // == (b - d) - (a + d);
+}
+
+// Both a and b must not have the most significant bit set
+static inline uint32_t
+upos_min (uint32_t a, uint32_t b)
+{
+  int32_t d = b - a;
+  d &= d >> 31;
+  return a + d;
+}
+
+// Both a and b must not have the most significant bit set
+static inline uint32_t
+upos_max (uint32_t a, uint32_t b)
+{
+  int32_t d = b - a;
+  d &= d >> 31;
+  return b - d;
+}
+
 // this is much faster than crossfires original algorithm
 // on modern cpus
 inline int
@@ -60,7 +160,7 @@
       ? (dx_ * 61685 + dy_ * 26870) >> 16
       : (dy_ * 61685 + dx_ * 26870) >> 16;
 #else
-  return dx + dy - min (dx, dy) * 5 / 8;
+  return dx_ + dy_ - min (dx_, dy_) * 5 / 8;
 #endif
 }
 
@@ -125,7 +225,11 @@
 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
 }
 
 // a STL-compatible allocator that uses g_slice
@@ -183,6 +287,55 @@
   }
 };
 
+// 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
+{
+  // 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 num)
+  {
+    return is_constant (num)
+             ? (next () * (uint64_t)num) >> 32U
+             : get_range (num);
+  }
+
+  // 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 <= r_max
+              ? r_min + operator ()(r_max - r_min + 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
 {
@@ -291,7 +444,7 @@
   void erase (T *obj)
   {
     assert (obj->*index);
-    int pos = obj->*index;
+    unsigned int pos = obj->*index;
     obj->*index = 0;
 
     if (pos < this->size ())
@@ -309,12 +462,6 @@
   }
 };
 
-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<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
-
 // basically does what strncpy should do, but appends "..." to strings exceeding length
 void assign (char *dst, const char *src, int maxlen);
 
@@ -332,5 +479,8 @@
 
 int similar_direction (int a, int b);
 
+// like printf, but returns a std::string
+const std::string format (const char *format, ...);
+
 #endif