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

Comparing deliantra/server/include/util.h (file contents):
Revision 1.51 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.60 by root, Tue Jan 22 15:53:01 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_SALLOC
 #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)
 #include <glib.h>
 #include <shstr.h>
 #include <traits.h>
+#ifdef 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)
 // very ugly macro that basicaly declares and initialises a variable
 // that is in scope for the next statement only
 absdir (int d)
 {
   return ((d - 1) & 7) + 1;
 }
+extern size_t slice_alloc; // statistics
 // makes dynamically allocated objects zero-initialised
 struct zero_initialised
 {
   void *operator new (size_t s, void *p)
   {
     return p;
   }
   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);
   }
 };
 void *salloc_ (int n)            throw (std::bad_alloc);
 inline void sfree (T *ptr, int n = 1) throw ()
 {
 #ifdef PREFER_MALLOC
   free (ptr);
 #else
+  slice_alloc -= n * sizeof (T);
   g_slice_free1 (n * sizeof (T), (void *)ptr);
 #endif
 }
 // a STL-compatible allocator that uses g_slice
 typedef tausworthe_random_generator rand_gen;
 extern rand_gen rndm;
+INTERFACE_CLASS (attachable)
+struct refcnt_base
+{
+  typedef int refcnt_t;
+  mutable refcnt_t ACC (RW, refcnt);
+  MTH void refcnt_inc () const { ++refcnt; }
+  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
 {
+  // p if not null
+  refcnt_base::refcnt_t *refcnt_ref () { return p ? &p->refcnt : &refcnt_dummy; }
+  void refcnt_dec ()
+  {
+    if (!is_constant (p))
+      --*refcnt_ref ();
+    else if (p)
+      --p->refcnt;
+  }
+  void refcnt_inc ()
+  {
+    if (!is_constant (p))
+      ++*refcnt_ref ();
+    else if (p)
+      ++p->refcnt;
+  }
   T *p;
   refptr () : p(0) { }
-  refptr (const refptr<T> &p) : p(p.p) { if (p) p->refcnt_inc (); }
+  refptr (const refptr<T> &p) : p(p.p) { refcnt_inc (); }
-  refptr (T *p) : p(p) { if (p) p->refcnt_inc (); }
+  refptr (T *p) : p(p) { refcnt_inc (); }
-  ~refptr () { if (p) p->refcnt_dec (); }
+  ~refptr () { refcnt_dec (); }
   const refptr<T> &operator =(T *o)
   {
+    // if decrementing ever destroys we need to reverse the order here
-    if (p) p->refcnt_dec ();
+    refcnt_dec ();
     p = o;
-    if (p) p->refcnt_inc ();
+    refcnt_inc ();
     return *this;
   }
-  const refptr<T> &operator =(const refptr<T> o)
+  const refptr<T> &operator =(const refptr<T> &o)
   {
     *this = o.p;
     return *this;
   }
   T &operator * () const { return *p; }
-  T *operator ->() const { return p; }
+  T *operator ->() const { return  p; }
   operator T *() const { return p; }
 };
 typedef refptr<maptile>   maptile_ptr;
     return !strcmp (a, b);
   }
 };
 // Mostly the same as std::vector, but insert/erase can reorder
-// the elements, making insret/remove O(1) instead of O(n).
+// the elements, making append(=insert)/remove O(1) instead of O(n).
 //
-// NOTE: only some forms of erase/insert are available
+// NOTE: only some forms of erase are available
 template<class T>
 struct unordered_vector : std::vector<T, slice_allocator<T> >
 {
   typedef typename unordered_vector::iterator iterator;
     return obj->*indexmember
       ? this->begin () + obj->*indexmember - 1
       : this->end ();
   }
+  void push_back (T *obj)
+  {
+    std::vector<T *, slice_allocator<T *> >::push_back (obj);
+    obj->*indexmember = this->size ();
+  }
   void insert (T *obj)
   {
     push_back (obj);
-    obj->*indexmember = this->size ();
   }
   void insert (T &obj)
   {
     insert (&obj);
   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 printf, but returns a std::string
+// like sprintf, but returns a "static" buffer
-const std::string format (const char *format, ...);
+const char *format (const char *format, ...);
 #endif

Diff Legend

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

Comparing deliantra/server/include/util.h (file contents): Revision 1.51 by root, Sun Jul 1 05:00:18 2007 UTC vs. Revision 1.60 by root, Tue Jan 22 15:53:01 2008 UTC

Diff Legend

Comparing deliantra/server/include/util.h (file contents):
Revision 1.51 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.60 by root, Tue Jan 22 15:53:01 2008 UTC