--- deliantra/server/include/util.h	2007/08/06 10:54:12	1.54
+++ deliantra/server/include/util.h	2008/04/01 19:50:38	1.65
@@ -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 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,14 @@
  * 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_SALLOC 0
+#define PREFER_MALLOC 0
 
 #if __GNUC__ >= 3
 # define is_constant(c)             __builtin_constant_p (c)
@@ -54,6 +55,15 @@
 #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);
+#endif
+
 // use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
 #define auto(var,expr) decltype(expr) var = (expr)
 
@@ -82,6 +92,9 @@
 
 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)); }
+
 template<typename T>
 static inline T
 lerp (T val, T min_in, T max_in, T min_out, T max_out)
@@ -174,6 +187,8 @@
   return ((d - 1) & 7) + 1;
 }
 
+extern size_t slice_alloc; // statistics
+
 // makes dynamically allocated objects zero-initialised
 struct zero_initialised
 {
@@ -185,21 +200,25 @@
 
   void *operator new (size_t s)
   {
+    slice_alloc += s;
     return g_slice_alloc0 (s);
   }
 
   void *operator new[] (size_t s)
   {
+    slice_alloc += s;
     return g_slice_alloc0 (s);
   }
 
   void operator delete (void *p, size_t s)
   {
+    slice_alloc -= s;
     g_slice_free1 (s, p);
   }
 
   void operator delete[] (void *p, size_t s)
   {
+    slice_alloc -= s;
     g_slice_free1 (s, p);
   }
 };
@@ -224,9 +243,10 @@
 template<typename T>
 inline void sfree (T *ptr, int n = 1) throw ()
 {
-#ifdef PREFER_MALLOC
+#if PREFER_MALLOC
   free (ptr);
 #else
+  slice_alloc -= n * sizeof (T);
   g_slice_free1 (n * sizeof (T), (void *)ptr);
 #endif
 }
@@ -251,7 +271,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 +290,7 @@
     sfree<Tp> (p, n);
   }
 
-  size_type max_size ()const throw ()
+  size_type max_size () const throw ()
   {
     return size_t (-1) / sizeof (Tp);
   }
@@ -347,6 +367,7 @@
   refcnt_base () : refcnt (0) { }
 };
 
+// to avoid branches with more advanced compilers
 extern refcnt_base::refcnt_t refcnt_dummy;
 
 template<class T>
@@ -541,13 +562,13 @@
 
 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, ...);
 
 #endif