--- deliantra/server/include/util.h 2007/06/02 03:48:29 1.47
+++ deliantra/server/include/util.h 2007/10/16 05:34:24 1.57
@@ -1,21 +1,20 @@
/*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
*
* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
*
- * Crossfire TRT 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 2 of the License, or (at your option)
- * any later version.
+ * Crossfire TRT 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, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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
*/
@@ -55,7 +54,7 @@
#include
#include
-// use a gcc extension for auto declarations until ISO C++ sanctifies them
+// 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
@@ -63,7 +62,7 @@
// works only for stuff that can be assigned 0 and converts to false
// (note: works great for pointers)
// most ugly macro I ever wrote
-#define declvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
+#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
// in range including end
#define IN_RANGE_INC(val,beg,end) \
@@ -175,6 +174,8 @@
return ((d - 1) & 7) + 1;
}
+extern size_t slice_alloc; // statistics
+
// makes dynamically allocated objects zero-initialised
struct zero_initialised
{
@@ -186,21 +187,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);
}
};
@@ -228,6 +233,7 @@
#ifdef PREFER_MALLOC
free (ptr);
#else
+ slice_alloc -= n * sizeof (T);
g_slice_free1 (n * sizeof (T), (void *)ptr);
#endif
}
@@ -336,33 +342,67 @@
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
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 &p) : p(p.p) { if (p) p->refcnt_inc (); }
- refptr (T *p) : p(p) { if (p) p->refcnt_inc (); }
- ~refptr () { if (p) p->refcnt_dec (); }
+ refptr (const refptr &p) : p(p.p) { refcnt_inc (); }
+ refptr (T *p) : p(p) { refcnt_inc (); }
+ ~refptr () { refcnt_dec (); }
const refptr &operator =(T *o)
{
- if (p) p->refcnt_dec ();
+ // if decrementing ever destroys we need to reverse the order here
+ refcnt_dec ();
p = o;
- if (p) p->refcnt_inc ();
-
+ refcnt_inc ();
return *this;
}
- const refptr &operator =(const refptr o)
+ const refptr &operator =(const refptr &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; }
};
@@ -407,6 +447,10 @@
}
};
+// Mostly the same as std::vector, but insert/erase can reorder
+// the elements, making append(=insert)/remove O(1) instead of O(n).
+//
+// NOTE: only some forms of erase are available
template
struct unordered_vector : std::vector >
{
@@ -426,14 +470,46 @@
}
};
-template
+// This container blends advantages of linked lists
+// (efficiency) with vectors (random access) by
+// by using an unordered vector and storing the vector
+// index inside the object.
+//
+// + memory-efficient on most 64 bit archs
+// + O(1) insert/remove
+// + free unique (but varying) id for inserted objects
+// + cache-friendly iteration
+// - only works for pointers to structs
+//
+// NOTE: only some forms of erase/insert are available
+typedef int object_vector_index;
+
+template
struct object_vector : std::vector >
{
+ typedef typename object_vector::iterator iterator;
+
+ bool contains (const T *obj) const
+ {
+ return obj->*indexmember;
+ }
+
+ iterator find (const T *obj)
+ {
+ return obj->*indexmember
+ ? this->begin () + obj->*indexmember - 1
+ : this->end ();
+ }
+
+ void push_back (T *obj)
+ {
+ std::vector >::push_back (obj);
+ obj->*indexmember = this->size ();
+ }
+
void insert (T *obj)
{
- assert (!(obj->*index));
push_back (obj);
- obj->*index = this->size ();
}
void insert (T &obj)
@@ -443,14 +519,13 @@
void erase (T *obj)
{
- assert (obj->*index);
- unsigned int pos = obj->*index;
- obj->*index = 0;
+ unsigned int pos = obj->*indexmember;
+ obj->*indexmember = 0;
if (pos < this->size ())
{
(*this)[pos - 1] = (*this)[this->size () - 1];
- (*this)[pos - 1]->*index = pos;
+ (*this)[pos - 1]->*indexmember = pos;
}
this->pop_back ();
@@ -458,7 +533,7 @@
void erase (T &obj)
{
- errase (&obj);
+ erase (&obj);
}
};
@@ -479,8 +554,8 @@
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