--- deliantra/server/include/util.h 2007/08/06 10:54:12 1.54
+++ deliantra/server/include/util.h 2008/04/11 21:09:53 1.67
@@ -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 .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
#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)
@@ -44,6 +45,8 @@
#define expect_false(expr) expect ((expr) != 0, 0)
#define expect_true(expr) expect ((expr) != 0, 1)
+#include
+
#include
#include
#include
@@ -54,6 +57,19 @@
#include
#include
+#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 ((s))
+#endif
+
// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
#define auto(var,expr) decltype(expr) var = (expr)
@@ -72,6 +88,7 @@
#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,
@@ -82,6 +99,9 @@
template static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
+template static inline T min (T a, U b, V c) { return min (a, min (b, c)); }
+template static inline T max (T a, U b, V c) { return max (a, max (b, c)); }
+
template
static inline T
lerp (T val, T min_in, T max_in, T min_out, T max_out)
@@ -174,6 +194,36 @@
return ((d - 1) & 7) + 1;
}
+extern ssize_t slice_alloc; // statistics
+
+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
+template
+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
+inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
+
+// clears the memory
+template
+inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
+
+// for symmetry
+template
+inline void sfree (T *ptr, int n = 1) throw ()
+{
+ if (expect_true (ptr))
+ {
+ slice_alloc -= n * sizeof (T);
+ g_slice_free1 (n * sizeof (T), (void *)ptr);
+ assert (slice_alloc >= 0);//D
+ }
+}
+
// makes dynamically allocated objects zero-initialised
struct zero_initialised
{
@@ -185,52 +235,25 @@
void *operator new (size_t s)
{
- return g_slice_alloc0 (s);
+ return salloc0 (s);
}
void *operator new[] (size_t s)
{
- return g_slice_alloc0 (s);
+ return salloc0 (s);
}
void operator delete (void *p, size_t s)
{
- g_slice_free1 (s, p);
+ sfree ((char *)p, s);
}
void operator delete[] (void *p, size_t s)
{
- g_slice_free1 (s, p);
+ sfree ((char *)p, s);
}
};
-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
-template
-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
-inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
-
-// clears the memory
-template
-inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); }
-
-// for symmetry
-template
-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
// boy, this is verbose
template
@@ -251,7 +274,7 @@
};
slice_allocator () throw () { }
- slice_allocator (const slice_allocator &o) throw () { }
+ slice_allocator (const slice_allocator &) throw () { }
template
slice_allocator (const slice_allocator &) throw () { }
@@ -270,7 +293,7 @@
sfree (p, n);
}
- size_type max_size ()const throw ()
+ size_type max_size () const throw ()
{
return size_t (-1) / sizeof (Tp);
}
@@ -347,6 +370,7 @@
refcnt_base () : refcnt (0) { }
};
+// to avoid branches with more advanced compilers
extern refcnt_base::refcnt_t refcnt_dummy;
template
@@ -541,13 +565,51 @@
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, ...);
+
+/////////////////////////////////////////////////////////////////////////////
+// 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))
#endif