--- deliantra/server/common/shstr.C 2006/09/03 11:37:25 1.6
+++ deliantra/server/common/shstr.C 2007/11/08 19:43:23 1.28
@@ -1,55 +1,66 @@
/*
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
+ * 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,
+ * 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 this program. If not, see .
+ *
+ * The authors can be reached via e-mail to
+ */
+
+/*
* shstr.C
*/
#include
#include
-
+#include
#include
-#include "shstr.h"
+#include "global.h"
+
+size_t shstr_alloc;
-// NOTE: even with lots of stuff loaded, we do not usually have >>20000 strings.
-// maybe refcounting is just overhead?
+typedef std::tr1::unordered_set , true> HT;
-struct hash
+static HT ht;
+
+static const char *
+makevec (const char *s)
{
- std::size_t operator ()(const char *s) const
- {
- unsigned long hash = 0;
- unsigned int i = 0;
-
- /* use the one-at-a-time hash function, which supposedly is
- * better than the djb2-like one used by perl5.005, but
- * certainly is better then the bug used here before.
- * see http://burtleburtle.net/bob/hash/doobs.html
- */
- while (*s)
- {
- hash += *s++;
- hash += hash << 10;
- hash ^= hash >> 6;
- }
-
- hash += hash << 3;
- hash ^= hash >> 11;
- hash += hash << 15;
-
- return hash;
- }
-};
-
-struct equal
-{
- bool operator ()(const char *a, const char *b) const
- {
- return !strcmp (a, b);
- }
-};
+ int len = strlen (s);
-typedef std::tr1::unordered_set HT;
+ shstr_alloc += sizeof (int) * 2 + len + 1;
+ const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
-static HT ht;
+ shstr::length (v) = len;
+ shstr::refcnt (v) = 1;
+
+ memcpy ((char *) v, s, len + 1);
+
+ return v;
+}
+
+static const char *
+makenull ()
+{
+ const char *s = makevec ("(null)");
+ shstr::length (s) = 0;
+ return s;
+}
+
+const char *shstr::null = makenull ();
const char *
shstr::find (const char *s)
@@ -57,18 +68,16 @@
if (!s)
return s;
- HT::iterator i = ht.find (s);
+ auto (i, ht.find (s));
- return i != ht.end ()
- ? *i
- : 0;
+ return i != ht.end ()? *i : 0;
}
const char *
shstr::intern (const char *s)
{
if (!s)
- return s;
+ return null;
if (const char *found = find (s))
{
@@ -76,18 +85,9 @@
return found;
}
- int len = strlen (s);
-
- const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1));
-
- length (v) = len;
- refcnt (v) = 1;
-
- memcpy ((char *)v, s, len + 1);
-
- ht.insert (v);
-
- return v;
+ s = makevec (s);
+ ht.insert (s);
+ return s;
}
// periodically test refcounts == 0 for a few strings
@@ -97,12 +97,11 @@
{
static const char *curpos;
- HT::iterator i = curpos ? ht.find (curpos) : ht.begin ();
+ auto (i, curpos ? ht.find (curpos) : ht.begin ());
if (i == ht.end ())
i = ht.begin ();
- // go through all strings roughly once every 4 minutes
int n = ht.size () / 256 + 16;
for (;;)
@@ -116,12 +115,14 @@
break;
else if (!refcnt (*i))
{
- HT::iterator o = i++;
+ auto (o, i++);
const char *s = *o;
+
ht.erase (o);
//printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
- free (-2 + (int *)s);
+ shstr_alloc -= sizeof (int) * 2 + length (s) + 1;
+ g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
}
else
++i;
@@ -130,22 +131,31 @@
curpos = *i;
}
+// declare these here to get correct initialisation order
+#define def(str) const shstr shstr_ ## str (# str);
+# include "shstrinc.h"
+#undef def
+
+shstr skill_names[NUM_SKILLS];
+
//TODO: this should of course not be here
+
/* buf_overflow() - we don't want to exceed the buffer size of
* buf1 by adding on buf2! Returns true if overflow will occur.
*/
-
-int
+int
buf_overflow (const char *buf1, const char *buf2, int bufsize)
{
- int len1 = 0, len2 = 0;
+ int len1 = 0, len2 = 0;
- if (buf1)
- len1 = strlen (buf1);
- if (buf2)
- len2 = strlen (buf2);
- if ((len1 + len2) >= bufsize)
- return 1;
- return 0;
-}
+ if (buf1)
+ len1 = strlen (buf1);
+
+ if (buf2)
+ len2 = strlen (buf2);
+ if ((len1 + len2) >= bufsize)
+ return 1;
+
+ return 0;
+}