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

Comparing deliantra/server/include/util.h (file contents):
Revision 1.55 by root, Thu Aug 16 06:36:56 2007 UTC vs.
Revision 1.73 by root, Sat May 3 11:14:50 2008 UTC

 /*
- * 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.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * 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)
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 # define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
 // 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 <pthread.h>
 #include <cstddef>
 #include <cmath>
 #include <new>
 #include <vector>
 #include <glib.h>
 #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)
 // very ugly macro that basicaly declares and initialises a variable
 // in range excluding end
 #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,
 // 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, 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)
 {
 absdir (int d)
 {
   return ((d - 1) & 7) + 1;
 }
-// makes dynamically allocated objects zero-initialised
+extern ssize_t slice_alloc; // statistics
-struct zero_initialised
-{
-  void *operator new (size_t s, void *p)
-  {
-    memset (p, 0, s);
-    return p;
-  }
-  void *operator new (size_t s)
-  {
-    return g_slice_alloc0 (s);
-  }
-  void *operator new[] (size_t s)
-  {
-    return g_slice_alloc0 (s);
-  }
-  void operator delete (void *p, size_t s)
-  {
-    g_slice_free1 (s, p);
-  }
-  void operator delete[] (void *p, size_t s)
-  {
-    g_slice_free1 (s, p);
-  }
-};
 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
 // for symmetry
 template<typename T>
 inline void sfree (T *ptr, int n = 1) throw ()
 {
-#ifdef PREFER_MALLOC
+  if (expect_true (ptr))
-  free (ptr);
+    {
-#else
+      slice_alloc -= n * sizeof (T);
+      if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
-  g_slice_free1 (n * sizeof (T), (void *)ptr);
+      g_slice_free1 (n * sizeof (T), (void *)ptr);
-#endif
+      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
+{
+  void *operator new (size_t s, void *p)
+  {
+    memset (p, 0, s);
+    return p;
+  }
+  void *operator new (size_t s)
+  {
+    return salloc0<char> (s);
+  }
+  void *operator new[] (size_t s)
+  {
+    return salloc0<char> (s);
+  }
+  void operator delete (void *p, size_t s)
+  {
+    sfree ((char *)p, s);
+  }
+  void operator delete[] (void *p, size_t s)
+  {
+    sfree ((char *)p, s);
+  }
+};
+// makes dynamically allocated objects zero-initialised
+struct slice_allocated
+{
+  void *operator new (size_t s, void *p)
+  {
+    return p;
+  }
+  void *operator new (size_t s)
+  {
+    return salloc<char> (s);
+  }
+  void *operator new[] (size_t s)
+  {
+    return salloc<char> (s);
+  }
+  void operator delete (void *p, size_t s)
+  {
+    sfree ((char *)p, s);
+  }
+  void operator delete[] (void *p, size_t s)
+  {
+    sfree ((char *)p, s);
+  }
+};
 // a STL-compatible allocator that uses g_slice
 // boy, this is verbose
 template<typename Tp>
 struct slice_allocator
   {
     typedef slice_allocator<U> other;
   };
   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 () { }
   ~slice_allocator () { }
   void deallocate (pointer p, size_type n)
   {
     sfree<Tp> (p, n);
   }
-  size_type max_size ()const throw ()
+  size_type max_size () const throw ()
   {
     return size_t (-1) / sizeof (Tp);
   }
   void construct (pointer p, const Tp &val)
   MTH void refcnt_dec () const { --refcnt; }
   refcnt_base () : refcnt (0) { }
 };
+// to avoid branches with more advanced compilers
 extern refcnt_base::refcnt_t refcnt_dummy;
 template<class T>
 struct refptr
 {
   assign ((char *)&dst, src, N);
 }
 typedef double tstamp;
-// return current time as timestampe
+// return current time as timestamp
 tstamp now ();
 int similar_direction (int a, int b);
 // 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

Diff Legend

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

Comparing deliantra/server/include/util.h (file contents): Revision 1.55 by root, Thu Aug 16 06:36:56 2007 UTC vs. Revision 1.73 by root, Sat May 3 11:14:50 2008 UTC

Diff Legend

Comparing deliantra/server/include/util.h (file contents):
Revision 1.55 by root, Thu Aug 16 06:36:56 2007 UTC vs.
Revision 1.73 by root, Sat May 3 11:14:50 2008 UTC