--- deliantra/server/common/shstr.C 2008/04/11 21:09:52 1.29
+++ deliantra/server/common/shstr.C 2009/10/12 14:00:57 1.39
@@ -3,18 +3,19 @@
*
* Copyright (©) 2005,2006,2007,2008 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 .
+ * 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
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -32,7 +33,7 @@
size_t shstr_alloc;
-typedef std::tr1::unordered_set , true> HT;
+typedef std::tr1::unordered_set > HT;
static HT ht;
static int next_gc;
@@ -41,27 +42,21 @@
makevec (const char *s)
{
int len = strlen (s);
+ int alloc = sizeof (uint32_t) * 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_alloc += alloc;
+ char *v = (char *)g_slice_alloc (alloc);
+ v += sizeof (uint32_t) * 2;
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 shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
const char *
shstr::find (const char *s)
@@ -78,7 +73,7 @@
shstr::intern (const char *s)
{
if (!s)
- return null;
+ return null ();
if (const char *found = find (s))
{
@@ -127,8 +122,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) * 2 + length (s) + 1;
+ shstr_alloc -= alloc;
+ g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2));
}
else
++i;
@@ -138,9 +134,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];