[ViewVC] Diff of: cvs/deliantra/server/include/util.h

Comparing deliantra/server/include/util.h (file contents):
Revision 1.82 by root, Sat Dec 27 02:33:32 2008 UTC vs.
Revision 1.91 by root, Thu Oct 15 21:09:32 2009 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
  * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * and 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 <support@deliantra.net>
  */
 #ifndef UTIL_H__
 #if __GNUC__ >= 3
 # 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)
+# define noinline                   __attribute__((__noinline__))
 #else
 # define is_constant(c)             0
 # define expect(expr,value)         (expr)
 # define prefetch(addr,rw,locality)
+# define noinline
 #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_false(expr) expect ((expr) ? 1 : 0, 0)
-#define expect_true(expr)  expect ((expr) != 0, 1)
+#define expect_true(expr)  expect ((expr) ? 1 : 0, 1)
 #include <pthread.h>
 #include <cstddef>
 #include <cmath>
 // sign0 returns -1, 0 or +1
 template<typename T>
 static inline T sign0 (T v) { return v ? sign (v) : 0; }
+// div* only work correctly for div > 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; }
+template<typename T> static inline T div    (T val, T div)
+{
+  return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div;
+}
 // div, round-up
-template<typename T> static inline T div_ru (T val, T div) { return (val + div - 1) / div; }
+template<typename T> static inline T div_ru (T val, T div)
+{
+  return expect_false (val < 0) ? - ((-val                ) / div) : (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 div_rd (T val, T div)
+{
+  return expect_false (val < 0) ? - ((-val + (div - 1)    ) / div) : (val          ) / div;
+}
+// lerp* only work correctly for min_in < max_in
+// Linear intERPolate, scales val from min_in..max_in to min_out..max_out
 template<typename T>
 static inline T
 lerp (T val, T min_in, T max_in, T min_out, T max_out)
 {
   return min_out + div   <T> ((val - min_in) * (max_out - min_out), max_in  - min_in);
 // 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 [3] = src.state [3];
   }
   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.
+// see also http://www.iro.umontreal.ca/~lecuyer/myftp/papers/xorshift.pdf
+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;
+  }
+};
+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) ? get_range (num)                  // non-constant
+    return !is_constant (num) ? get_range (num)                        // non-constant
-         : num & (num - 1)    ? (next () * (uint64_t)num) >> 32U // constant, non-power-of-two
+         : num & (num - 1)    ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
-         :                      next () & (num - 1);             // constant, power-of-two
+         :                      this->next () & (num - 1);             // constant, power-of-two
   }
   // return a number within (min .. max)
   int operator () (int r_min, int r_max)
   {
 protected:
   uint32_t get_range (uint32_t r_max);
   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, rmg_rndm;
 INTERFACE_CLASS (attachable)
 struct refcnt_base
 struct str_hash
 {
   std::size_t operator ()(const char *s) const
   {
-    unsigned long hash = 0;
+#if 0
+    uint32_t hash = 0;
     /* use the one-at-a-time hash function, which supposedly is
      * better than the djb2-like one used by perl5.005, but
      * certainly is better then the bug used here before.
      * see http://burtleburtle.net/bob/hash/doobs.html
       }
     hash += hash <<  3;
     hash ^= hash >> 11;
     hash += hash << 15;
+#else
+    // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
+    // it is about twice as fast as the one-at-a-time one,
+    // with good distribution.
+    // FNV-1a is faster on many cpus because the multiplication
+    // runs concurrent with the looping logic.
+    uint32_t hash = 2166136261;
+    while (*s)
+      hash = (hash ^ *s++) * 16777619;
+#endif
     return hash;
   }
 };
     erase (&obj);
   }
 };
 // basically does what strncpy should do, but appends "..." to strings exceeding length
+// returns the number of bytes actually used (including \0)
-void assign (char *dst, const char *src, int maxlen);
+int assign (char *dst, const char *src, int maxsize);
 // type-safe version of assign
 template<int N>
-inline void assign (char (&dst)[N], const char *src)
+inline int assign (char (&dst)[N], const char *src)
 {
-  assign ((char *)&dst, src, N);
+  return assign ((char *)&dst, src, N);
 }
 typedef double tstamp;
 // return current time as timestamp
 tstamp now ();
 int similar_direction (int a, int b);
-// like sprintf, but returns a "static" buffer
+// like v?sprintf, but returns a "static" buffer
+char *vformat (const char *format, va_list ap);
-const char *format (const char *format, ...);
+char *format (const char *format, ...);
+// safety-check player input which will become object->msg
+bool msg_is_safe (const char *msg);
 /////////////////////////////////////////////////////////////////////////////
 // threads, very very thin wrappers around pthreads
 struct thread

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/include/util.h (file contents): Revision 1.82 by root, Sat Dec 27 02:33:32 2008 UTC vs. Revision 1.91 by root, Thu Oct 15 21:09:32 2009 UTC

Diff Legend

Comparing deliantra/server/include/util.h (file contents):
Revision 1.82 by root, Sat Dec 27 02:33:32 2008 UTC vs.
Revision 1.91 by root, Thu Oct 15 21:09:32 2009 UTC