--- deliantra/server/common/shstr.C	2007/11/08 19:43:23	1.28
+++ deliantra/server/common/shstr.C	2010/04/15 00:36:51	1.44
@@ -1,20 +1,21 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * 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 GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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 GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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>
  */
@@ -32,35 +33,33 @@
 
 size_t shstr_alloc;
 
-typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
+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;
 
-  shstr_alloc += sizeof (int) * 2 + 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)
@@ -77,7 +76,7 @@
 shstr::intern (const char *s)
 {
   if (!s)
-    return null;
+    return null ();
 
   if (const char *found = find (s))
     {
@@ -85,6 +84,7 @@
       return found;
     }
 
+  --next_gc;
   s = makevec (s);
   ht.insert (s);
   return s;
@@ -95,6 +95,9 @@
 void
 shstr::gc ()
 {
+  if (expect_true (next_gc > 0))
+    return;
+
   static const char *curpos;
 
   auto (i, curpos ? ht.find (curpos) : ht.begin ());
@@ -103,6 +106,7 @@
     i = ht.begin ();
 
   int n = ht.size () / 256 + 16;
+  next_gc += n >> 1;
 
   for (;;)
     {
@@ -121,8 +125,9 @@
           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);
+          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;
@@ -132,30 +137,11 @@
 }
 
 // declare these here to get correct initialisation order
-#define def(str) const shstr shstr_ ## str (# str);
+#define def2(id,str) const shstr id (str);
+#define def(id)      def2(shstr_ ## id, # id)
 # include "shstrinc.h"
 #undef def
+#undef def2
 
-shstr skill_names[NUM_SKILLS];
-
-//TODO: this should of course not be here
+materialtype_t material_null;
 
-/* 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;
-}