--- deliantra/server/common/shstr.C	2006/09/03 09:00:05	1.5
+++ deliantra/server/common/shstr.C	2007/04/16 15:41:26	1.21
@@ -5,51 +5,40 @@
 #include <cstring>
 #include <cstdlib>
 
+#include <glib.h>
+
 #include <tr1/unordered_set>
 
-#include "shstr.h"
+#include "global.h"
+
+typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
 
-// NOTE: even with lots of stuff loaded, we do not usually have >>20000 strings.
-// maybe refcounting is just overhead?
+static HT ht;
 
-struct hash
+static const char *
+makevec (const char *s)
 {
-  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);
-  }
-};
+  int len = strlen (s);
 
-typedef std::tr1::unordered_set<const char *, hash, equal> HT;
+  const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
 
-static HT ht;
+  shstr::length (v) = len;
+  shstr::refcnt (v) = 1;
+
+  memcpy ((char *) v, s, len + 1);
+
+  return v;
+}
+
+static const char *
+makenull ()
+{
+  const char *s = makevec ("(null)");
+  shstr::length (s) = 0;
+  return s;
+}
+
+const char *shstr::null = makenull ();
 
 const char *
 shstr::find (const char *s)
@@ -57,18 +46,16 @@
   if (!s)
     return s;
 
-  HT::iterator i = ht.find (s);
+  auto (i, ht.find (s));
 
-  return i != ht.end ()
-    ? *i
-    : 0;
+  return i != ht.end ()? *i : 0;
 }
 
 const char *
 shstr::intern (const char *s)
 {
   if (!s)
-    return s;
+    return null;
 
   if (const char *found = find (s))
     {
@@ -76,18 +63,9 @@
       return found;
     }
 
-  int len = strlen (s);
-
-  const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1));
-
-  length (v) = len;
-  refcnt (v) = 1;
-
-  memcpy ((char *)v, s, len + 1);
-
-  ht.insert (v);
-
-  return v;
+  s = makevec (s);
+  ht.insert (s);
+  return s;
 }
 
 // periodically test refcounts == 0 for a few strings
@@ -97,28 +75,32 @@
 {
   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
-  for (int n = ht.size () / 256 + 16; --n; )
+  int n = ht.size () / 256 + 16;
+
+  for (;;)
     {
       if (i == ht.end ())
         {
           curpos = 0;
           return;
         }
-
-      if (!refcnt (*i))
+      else if (!--n)
+        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));
-          free (-2 + (int *)s);
+          g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
         }
       else
         ++i;
@@ -127,22 +109,27 @@
   curpos = *i;
 }
 
+shstr skill_names[NUM_SKILLS];
+
+// what weird misoptimisation is this again?
+const shstr undead_name ("undead");
+
 //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 
+int
 buf_overflow (const char *buf1, const char *buf2, int bufsize)
 {
-    int len1 = 0, len2 = 0;
+  int len1 = 0, len2 = 0;
 
-    if (buf1)
-        len1 = strlen (buf1);
-    if (buf2)
-        len2 = strlen (buf2);
-    if ((len1 + len2) >= bufsize)
-        return 1;
-    return 0;
+  if (buf1)
+    len1 = strlen (buf1);
+  if (buf2)
+    len2 = strlen (buf2);
+  if ((len1 + len2) >= bufsize)
+    return 1;
+  return 0;
 }
-