--- deliantra/server/common/shstr.C	2006/09/12 19:20:06	1.17
+++ deliantra/server/common/shstr.C	2007/10/16 05:34:24	1.26
@@ -1,3 +1,23 @@
+/*
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * 
+ * Crossfire TRT 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.
+ * 
+ * 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/>.
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ */
 
 /*
  * shstr.C
@@ -5,14 +25,14 @@
 
 #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 *>, true> HT;
 
 static HT ht;
 
@@ -21,7 +41,8 @@
 {
   int len = strlen (s);
 
-  const char *v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + 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::length (v) = len;
   shstr::refcnt (v) = 1;
@@ -47,7 +68,7 @@
   if (!s)
     return s;
 
-  HT::iterator i = ht.find (s);
+  auto (i, ht.find (s));
 
   return i != ht.end ()? *i : 0;
 }
@@ -74,12 +95,9 @@
 void
 shstr::gc ()
 {
-return; //D
-//D currently disabled: some datastructures might still store them
-//D but their pointers will become invalidated
   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 ();
@@ -98,12 +116,13 @@
         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));
+          shstr_alloc -= sizeof (int) * 2 + length (s) + 1;
           g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
         }
       else
@@ -113,17 +132,18 @@
   curpos = *i;
 }
 
-shstr skill_names[NUM_SKILLS];
+// declare these here to get correct initialisation order
+#define def(str) const shstr shstr_ ## str (# str);
+# include "shstrinc.h"
+#undef def
 
-// what weird misoptimisation is this again?
-const shstr undead_name ("undead");
+shstr skill_names[NUM_SKILLS];
 
 //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)
 {
@@ -131,9 +151,12 @@
 
   if (buf1)
     len1 = strlen (buf1);
+
   if (buf2)
     len2 = strlen (buf2);
+
   if ((len1 + len2) >= bufsize)
     return 1;
+
   return 0;
 }