ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/shstr.C
(Generate patch)

Comparing deliantra/server/common/shstr.C (file contents):
Revision 1.29 by root, Fri Apr 11 21:09:52 2008 UTC vs.
Revision 1.39 by root, Mon Oct 12 14:00:57 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
8 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * (at your option) any later version. 9 * option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
18 * 19 *
19 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
20 */ 21 */
21 22
22/* 23/*
… …
30 31
31#include "global.h" 32#include "global.h"
32 33
33size_t shstr_alloc; 34size_t shstr_alloc;
34 35
35typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT; 36typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
36 37
37static HT ht; 38static HT ht;
38static int next_gc; 39static int next_gc;
39 40
40static const char * 41static const char *
41makevec (const char *s) 42makevec (const char *s)
42{ 43{
43 int len = strlen (s); 44 int len = strlen (s);
45 int alloc = sizeof (uint32_t) * 2 + len + 1;
44 46
45 shstr_alloc += sizeof (int) * 2 + len + 1; 47 shstr_alloc += alloc;
46 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); 48 char *v = (char *)g_slice_alloc (alloc);
49 v += sizeof (uint32_t) * 2;
47 50
48 shstr::length (v) = len; 51 shstr::length (v) = len;
49 shstr::refcnt (v) = 1; 52 shstr::refcnt (v) = 1;
50 53
51 memcpy ((char *) v, s, len + 1); 54 memcpy (v, s, len + 1);
52 55
53 return v; 56 return v;
54} 57}
55 58
56static const char * 59shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
57makenull ()
58{
59 const char *s = makevec ("(null)");
60 shstr::length (s) = 0;
61 return s;
62}
63
64const char *shstr::null = makenull ();
65 60
66const char * 61const char *
67shstr::find (const char *s) 62shstr::find (const char *s)
68{ 63{
69 if (!s) 64 if (!s)
… …
76 71
77const char * 72const char *
78shstr::intern (const char *s) 73shstr::intern (const char *s)
79{ 74{
80 if (!s) 75 if (!s)
81 return null; 76 return null ();
82 77
83 if (const char *found = find (s)) 78 if (const char *found = find (s))
84 { 79 {
85 ++refcnt (found); 80 ++refcnt (found);
86 return found; 81 return found;
… …
125 const char *s = *o; 120 const char *s = *o;
126 121
127 ht.erase (o); 122 ht.erase (o);
128 123
129 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 124 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
130 shstr_alloc -= sizeof (int) * 2 + length (s) + 1; 125 int alloc = sizeof (uint32_t) * 2 + length (s) + 1;
131 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s); 126 shstr_alloc -= alloc;
127 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2));
132 } 128 }
133 else 129 else
134 ++i; 130 ++i;
135 } 131 }
136 132
137 curpos = *i; 133 curpos = *i;
138} 134}
139 135
140// declare these here to get correct initialisation order 136// declare these here to get correct initialisation order
141#define def(str) const shstr shstr_ ## str (# str); 137#define def2(id,str) const shstr id (str);
138#define def(id) def2(shstr_ ## id, # id)
142# include "shstrinc.h" 139# include "shstrinc.h"
143#undef def 140#undef def
141#undef def2
144 142
145shstr skill_names[NUM_SKILLS]; 143shstr skill_names[NUM_SKILLS];
146 144
147//TODO: this should of course not be here 145//TODO: this should of course not be here
148 146

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines