--- deliantra/server/common/shstr.C 2007/05/28 21:21:40 1.23
+++ deliantra/server/common/shstr.C 2008/12/31 18:29:44 1.35
@@ -1,23 +1,22 @@
/*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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.
+ * 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.
+ * 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
+ * The authors can be reached via e-mail to
*/
/*
@@ -31,16 +30,20 @@
#include "global.h"
-typedef std::tr1::unordered_set , true> HT;
+size_t shstr_alloc;
+
+typedef std::tr1::unordered_set > HT;
static HT ht;
+static int next_gc;
static const char *
makevec (const char *s)
{
int len = strlen (s);
- const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
+ shstr_alloc += sizeof (uint32_t) * 2 + len + 1;
+ const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (uint32_t) * 2 + len + 1));
shstr::length (v) = len;
shstr::refcnt (v) = 1;
@@ -50,15 +53,7 @@
return v;
}
-static const char *
-makenull ()
-{
- const char *s = makevec ("(null)");
- shstr::length (s) = 0;
- return s;
-}
-
-const char *shstr::null = makenull ();
+shstr_vec shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
const char *
shstr::find (const char *s)
@@ -75,7 +70,7 @@
shstr::intern (const char *s)
{
if (!s)
- return null;
+ return null ();
if (const char *found = find (s))
{
@@ -83,6 +78,7 @@
return found;
}
+ --next_gc;
s = makevec (s);
ht.insert (s);
return s;
@@ -93,6 +89,9 @@
void
shstr::gc ()
{
+ if (expect_true (next_gc > 0))
+ return;
+
static const char *curpos;
auto (i, curpos ? ht.find (curpos) : ht.begin ());
@@ -100,8 +99,8 @@
if (i == ht.end ())
i = ht.begin ();
- // go through all strings roughly once every 4 minutes
int n = ht.size () / 256 + 16;
+ next_gc += n >> 1;
for (;;)
{
@@ -120,7 +119,8 @@
ht.erase (o);
//printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
- g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
+ shstr_alloc -= sizeof (uint32_t) * 2 + length (s) + 1;
+ g_slice_free1 (sizeof (uint32_t) * 2 + length (s) + 1, -2 + (int *) s);
}
else
++i;
@@ -129,10 +129,12 @@
curpos = *i;
}
-shstr skill_names[NUM_SKILLS];
+// declare these here to get correct initialisation order
+#define def(str) const shstr shstr_ ## str (# str);
+# include "shstrinc.h"
+#undef def
-// what weird misoptimisation is this again?
-const shstr undead_name ("undead");
+shstr skill_names[NUM_SKILLS];
//TODO: this should of course not be here
@@ -146,8 +148,10 @@
if (buf1)
len1 = strlen (buf1);
+
if (buf2)
len2 = strlen (buf2);
+
if ((len1 + len2) >= bufsize)
return 1;