--- deliantra/server/common/shstr.C	2006/09/12 19:20:06	1.17
+++ deliantra/server/common/shstr.C	2010/04/15 00:36:51	1.44
@@ -1,3 +1,24 @@
+/*
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ * 
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * 
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <support@deliantra.net>
+ */
 
 /*
  * shstr.C
@@ -5,41 +26,40 @@
 
 #include <cstring>
 #include <cstdlib>
-
 #include <glib.h>
-
 #include <tr1/unordered_set>
 
 #include "global.h"
 
-typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT;
+size_t shstr_alloc;
+
+typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
 
 static HT ht;
+static int next_gc;
+
+#define NUM_INT 3
 
 static const char *
 makevec (const char *s)
 {
   int len = strlen (s);
+  int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
 
-  const char *v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + len + 1));
+  shstr_alloc += alloc;
+  char *v = (char *)g_slice_alloc (alloc);
+  v += sizeof (uint32_t) * NUM_INT;
 
+  shstr::hash   (v) = strhsh (s);
   shstr::length (v) = len;
   shstr::refcnt (v) = 1;
 
-  memcpy ((char *) v, s, len + 1);
+  memcpy (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 ();
+shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
 
 const char *
 shstr::find (const char *s)
@@ -47,7 +67,7 @@
   if (!s)
     return s;
 
-  HT::iterator i = ht.find (s);
+  auto (i, ht.find (s));
 
   return i != ht.end ()? *i : 0;
 }
@@ -56,7 +76,7 @@
 shstr::intern (const char *s)
 {
   if (!s)
-    return null;
+    return null ();
 
   if (const char *found = find (s))
     {
@@ -64,6 +84,7 @@
       return found;
     }
 
+  --next_gc;
   s = makevec (s);
   ht.insert (s);
   return s;
@@ -74,18 +95,18 @@
 void
 shstr::gc ()
 {
-return; //D
-//D currently disabled: some datastructures might still store them
-//D but their pointers will become invalidated
+  if (expect_true (next_gc > 0))
+    return;
+
   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
   int n = ht.size () / 256 + 16;
+  next_gc += n >> 1;
 
   for (;;)
     {
@@ -98,13 +119,15 @@
         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));
-          g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
+          int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
+          shstr_alloc -= alloc;
+          g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
         }
       else
         ++i;
@@ -113,27 +136,12 @@
   curpos = *i;
 }
 
-shstr skill_names[NUM_SKILLS];
+// declare these here to get correct initialisation order
+#define def2(id,str) const shstr id (str);
+#define def(id)      def2(shstr_ ## id, # id)
+# include "shstrinc.h"
+#undef def
+#undef def2
 
-// what weird misoptimisation is this again?
-const shstr undead_name ("undead");
+materialtype_t material_null;
 
-//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
-buf_overflow (const char *buf1, const char *buf2, int bufsize)
-{
-  int len1 = 0, len2 = 0;
-
-  if (buf1)
-    len1 = strlen (buf1);
-  if (buf2)
-    len2 = strlen (buf2);
-  if ((len1 + len2) >= bufsize)
-    return 1;
-  return 0;
-}