--- deliantra/server/include/util.h	2006/09/12 18:15:34	1.9
+++ deliantra/server/include/util.h	2006/12/25 11:25:49	1.24
@@ -7,23 +7,119 @@
 # define is_constant(c) 0
 #endif
 
+#include <cstddef>
+
+#include <glib.h>
+
+// use a gcc extension for auto declarations until ISO C++ sanctifies them
+#define AUTODECL(var,expr) typeof(expr) var = (expr)
+
 // makes dynamically allocated objects zero-initialised
 struct zero_initialised
 {
-  void *operator new (size_t s, void *);
-  void *operator new (size_t s);
-  void *operator new [] (size_t s);
-  void operator delete (void *p, size_t s);
-  void operator delete [] (void *p, size_t s);
+  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);
+  }
 };
 
-struct refcounted
-{
-  mutable int refcnt;
-  refcounted () : refcnt (0) { }
-  void refcnt_inc () { ++refcnt; }
-  void refcnt_dec () { --refcnt;
-  if (refcnt < 0)abort();}//D
+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<typename T>
+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<typename T>
+inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
+
+// clears the memory
+template<typename T>
+inline T *salloc0(int n = 1)     throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0);           }
+
+// for symmetry
+template<typename T>
+inline void sfree (T *ptr, int n = 1) throw ()
+{
+  g_slice_free1 (n * sizeof (T), (void *)ptr);
+}
+
+// a STL-compatible allocator that uses g_slice
+// boy, this is verbose
+template<typename Tp>
+struct slice_allocator
+{
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  typedef Tp *pointer;
+  typedef const Tp *const_pointer;
+  typedef Tp &reference;
+  typedef const Tp &const_reference;
+  typedef Tp value_type;
+
+  template <class U> 
+  struct rebind
+  {
+    typedef slice_allocator<U> other;
+  };
+
+  slice_allocator () throw () { }
+  slice_allocator (const slice_allocator &o) throw () { }
+  template<typename Tp2>
+  slice_allocator (const slice_allocator<Tp2> &) throw () { }
+
+  ~slice_allocator () { }
+
+  pointer address (reference x) const { return &x; }
+  const_pointer address (const_reference x) const { return &x; }
+
+  pointer allocate (size_type n, const_pointer = 0)
+  {
+    return salloc<Tp> (n);
+  }
+
+  void deallocate (pointer p, size_type n)
+  {
+    sfree<Tp> (p, n);
+  }
+
+  size_type max_size ()const throw ()
+  {
+    return size_t (-1) / sizeof (Tp);
+  }
+
+  void construct (pointer p, const Tp &val)
+  {
+    ::new (p) Tp (val);
+  }
+
+  void destroy (pointer p)
+  {
+    p->~Tp ();
+  }
 };
 
 template<class T>
@@ -57,6 +153,12 @@
   operator T *() const { return p; }
 };
 
+typedef refptr<maptile>   maptile_ptr;
+typedef refptr<object>    object_ptr;
+typedef refptr<archetype> arch_ptr;
+typedef refptr<client>    client_ptr;
+typedef refptr<player>    player_ptr;
+
 struct str_hash
 {
   std::size_t operator ()(const char *s) const
@@ -94,9 +196,9 @@
 #include <vector>
 
 template<class obj>
-struct unordered_vector : std::vector<obj>
+struct unordered_vector : std::vector<obj, slice_allocator<obj> >
 {
-  typedef typename std::vector<obj>::iterator iterator;
+  typedef typename unordered_vector::iterator iterator;
 
   void erase (unsigned int pos)
   {
@@ -118,14 +220,20 @@
 
 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
+// basically does what strncpy should do, but appends "..." to strings exceeding length
+void assign (char *dst, const char *src, int maxlen);
+
+// type-safe version of assign
 template<int N>
 inline void assign (char (&dst)[N], const char *src)
 {
-  // should be optimised at some point, maybe should also add "..."
-  // when buffer is too small.
-  snprintf (dst, N, "%s", src);
+  assign ((char *)&dst, src, N);
 }
 
+typedef double tstamp;
+
+// return current time as timestampe
+tstamp now ();
+
 #endif