--- deliantra/server/common/shstr.C	2006/09/03 23:33:00	1.7
+++ deliantra/server/common/shstr.C	2006/09/05 19:20:16	1.11
@@ -5,46 +5,14 @@
 #include <cstring>
 #include <cstdlib>
 
+#include <glib.h>
+
 #include <tr1/unordered_set>
 
 #include "shstr.h"
+#include "util.h"
 
-struct hash
-{
-  std::size_t operator ()(const char *s) const
-  {
-    unsigned long hash = 0;
-    unsigned int i = 0;
-
-    /* use the one-at-a-time hash function, which supposedly is
-     * better than the djb2-like one used by perl5.005, but
-     * certainly is better then the bug used here before.
-     * see http://burtleburtle.net/bob/hash/doobs.html
-     */
-    while (*s)
-      {
-        hash += *s++;
-        hash += hash << 10;
-        hash ^= hash >>  6;
-      }
-
-    hash += hash <<  3;
-    hash ^= hash >> 11;
-    hash += hash << 15;
-
-    return hash;
-  }
-};
-
-struct equal
-{
-  bool operator ()(const char *a, const char *b) const
-  {
-    return !strcmp (a, b);
-  }
-};
-
-typedef std::tr1::unordered_set<const char *, hash, equal> HT;
+typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT;
 
 static HT ht;
 
@@ -52,18 +20,21 @@
 {
   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;
 
   memcpy ((char *)v, s, len + 1);
 
-  return s;
+  return v;
 }
 
 const char *shstr::null = makevec ("<nil>");
 
+// what weird misoptimisation is this again?
+const shstr undead_name ("undead");
+
 const char *
 shstr::find (const char *s)
 {
@@ -124,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;