--- deliantra/server/common/shstr.C 2006/09/10 16:00:23 1.13
+++ deliantra/server/common/shstr.C 2009/01/01 16:05:12 1.37
@@ -1,3 +1,23 @@
+/*
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007,2008 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
@@ -5,31 +25,25 @@
#include
#include
-
#include
-
#include
-#include "shstr.h"
-#include "util.h"
+#include "global.h"
-typedef
-std::tr1::unordered_set < const char *,
- str_hash,
- str_equal >
- HT;
+size_t shstr_alloc;
-static HT
- ht;
+typedef std::tr1::unordered_set > HT;
+
+static HT ht;
+static int next_gc;
static const char *
makevec (const char *s)
{
- int
- len = strlen (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;
@@ -39,11 +53,7 @@
return v;
}
-const char *
- shstr::null = makevec ("");
-
-// what weird misoptimisation is this again?
-const shstr undead_name ("undead");
+shstr_vec shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
const char *
shstr::find (const char *s)
@@ -51,7 +61,7 @@
if (!s)
return s;
- HT::iterator i = ht.find (s);
+ auto (i, ht.find (s));
return i != ht.end ()? *i : 0;
}
@@ -60,7 +70,7 @@
shstr::intern (const char *s)
{
if (!s)
- return null;
+ return null ();
if (const char *found = find (s))
{
@@ -68,6 +78,7 @@
return found;
}
+ --next_gc;
s = makevec (s);
ht.insert (s);
return s;
@@ -78,15 +89,18 @@
void
shstr::gc ()
{
+ if (expect_true (next_gc > 0))
+ return;
+
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;
+ next_gc += n >> 1;
for (;;)
{
@@ -99,13 +113,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));
- 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;
@@ -114,12 +129,20 @@
curpos = *i;
}
+// declare these here to get correct initialisation order
+#define def2(id,str) const shstr id (str);
+#define def(id) def2(shstr_ ## id, # id)
+# include "shstrinc.h"
+#undef def
+#undef def2
+
+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
buf_overflow (const char *buf1, const char *buf2, int bufsize)
{
@@ -127,9 +150,12 @@
if (buf1)
len1 = strlen (buf1);
+
if (buf2)
len2 = strlen (buf2);
+
if ((len1 + len2) >= bufsize)
return 1;
+
return 0;
}