--- deliantra/server/common/shstr.C 2007/07/10 05:51:37 1.25
+++ deliantra/server/common/shstr.C 2008/04/11 21:09:52 1.29
@@ -1,9 +1,9 @@
/*
- * 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,2008 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.
@@ -16,7 +16,7 @@
* 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
*/
/*
@@ -30,15 +30,19 @@
#include "global.h"
+size_t shstr_alloc;
+
typedef std::tr1::unordered_set , true> HT;
static HT ht;
+static int next_gc;
static const char *
makevec (const char *s)
{
int len = strlen (s);
+ shstr_alloc += sizeof (int) * 2 + len + 1;
const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
shstr::length (v) = len;
@@ -82,6 +86,7 @@
return found;
}
+ --next_gc;
s = makevec (s);
ht.insert (s);
return s;
@@ -92,6 +97,9 @@
void
shstr::gc ()
{
+ if (expect_true (next_gc > 0))
+ return;
+
static const char *curpos;
auto (i, curpos ? ht.find (curpos) : ht.begin ());
@@ -99,8 +107,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 (;;)
{
@@ -119,6 +127,7 @@
ht.erase (o);
//printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
+ shstr_alloc -= sizeof (int) * 2 + length (s) + 1;
g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
}
else
@@ -147,8 +156,10 @@
if (buf1)
len1 = strlen (buf1);
+
if (buf2)
len2 = strlen (buf2);
+
if ((len1 + len2) >= bufsize)
return 1;