--- deliantra/server/common/shstr.C 2007/07/10 05:51:37 1.25 +++ deliantra/server/common/shstr.C 2007/10/22 05:46:44 1.27 @@ -30,6 +30,8 @@ #include "global.h" +size_t shstr_alloc; + typedef std::tr1::unordered_set , true> HT; static HT ht; @@ -39,6 +41,7 @@ { 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; @@ -99,7 +102,6 @@ if (i == ht.end ()) i = ht.begin (); - // go through all strings roughly once every 4 minutes int n = ht.size () / 256 + 16; for (;;) @@ -119,6 +121,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 +150,10 @@ if (buf1) len1 = strlen (buf1); + if (buf2) len2 = strlen (buf2); + if ((len1 + len2) >= bufsize) return 1;