--- deliantra/server/common/shstr.C	2006/09/04 17:16:19	1.9
+++ deliantra/server/common/shstr.C	2006/09/05 19:18:04	1.10
@@ -5,6 +5,8 @@
 #include <cstring>
 #include <cstdlib>
 
+#include <glib.h>
+
 #include <tr1/unordered_set>
 
 #include "shstr.h"
@@ -18,7 +20,7 @@
 {
   int len = strlen (s);
 
-  const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1));
+  const char *v = (const char *)(2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
 
   shstr::length (v) = len;
   shstr::refcnt (v) = 1;
@@ -76,7 +78,7 @@
     i = ht.begin ();
 
   // go through all strings roughly once every 4 minutes
-  int n = ht.size () / 256 + 16;
+  int n = ht.size () / 256 + 16000;
 
   for (;;)
     {
@@ -93,8 +95,10 @@
           const char *s = *o;
           ht.erase (o);
 
+          int len = length (s);
+
           //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
-          free (-2 + (int *)s);
+          g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *)s);
         }
       else
         ++i;