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.27 by root, Mon Oct 22 05:46:44 2007 UTC vs.
Revision 1.39 by root, Mon Oct 12 14:00:57 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Crossfire TRT 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 <crossfire@schmorp.de> 20 * The authors can be reached via e-mail to <support@deliantra.net>
20 */ 21 */
21 22
22/* 23/*
23 * shstr.C 24 * shstr.C
24 */ 25 */
… …
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;
39static int next_gc;
38 40
39static const char * 41static const char *
40makevec (const char *s) 42makevec (const char *s)
41{ 43{
42 int len = strlen (s); 44 int len = strlen (s);
45 int alloc = sizeof (uint32_t) * 2 + len + 1;
43 46
44 shstr_alloc += sizeof (int) * 2 + len + 1; 47 shstr_alloc += alloc;
45 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;
46 50
47 shstr::length (v) = len; 51 shstr::length (v) = len;
48 shstr::refcnt (v) = 1; 52 shstr::refcnt (v) = 1;
49 53
50 memcpy ((char *) v, s, len + 1); 54 memcpy (v, s, len + 1);
51 55
52 return v; 56 return v;
53} 57}
54 58
55static const char * 59shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
56makenull ()
57{
58 const char *s = makevec ("(null)");
59 shstr::length (s) = 0;
60 return s;
61}
62
63const char *shstr::null = makenull ();
64 60
65const char * 61const char *
66shstr::find (const char *s) 62shstr::find (const char *s)
67{ 63{
68 if (!s) 64 if (!s)
… …
75 71
76const char * 72const char *
77shstr::intern (const char *s) 73shstr::intern (const char *s)
78{ 74{
79 if (!s) 75 if (!s)
80 return null; 76 return null ();
81 77
82 if (const char *found = find (s)) 78 if (const char *found = find (s))
83 { 79 {
84 ++refcnt (found); 80 ++refcnt (found);
85 return found; 81 return found;
86 } 82 }
87 83
84 --next_gc;
88 s = makevec (s); 85 s = makevec (s);
89 ht.insert (s); 86 ht.insert (s);
90 return s; 87 return s;
91} 88}
92 89
93// periodically test refcounts == 0 for a few strings 90// periodically test refcounts == 0 for a few strings
94// this is the ONLY thing that erases stuff from ht. keep it that way. 91// this is the ONLY thing that erases stuff from ht. keep it that way.
95void 92void
96shstr::gc () 93shstr::gc ()
97{ 94{
95 if (expect_true (next_gc > 0))
96 return;
97
98 static const char *curpos; 98 static const char *curpos;
99 99
100 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 100 auto (i, curpos ? ht.find (curpos) : ht.begin ());
101 101
102 if (i == ht.end ()) 102 if (i == ht.end ())
103 i = ht.begin (); 103 i = ht.begin ();
104 104
105 int n = ht.size () / 256 + 16; 105 int n = ht.size () / 256 + 16;
106 next_gc += n >> 1;
106 107
107 for (;;) 108 for (;;)
108 { 109 {
109 if (i == ht.end ()) 110 if (i == ht.end ())
110 { 111 {
… …
119 const char *s = *o; 120 const char *s = *o;
120 121
121 ht.erase (o); 122 ht.erase (o);
122 123
123 //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));
124 shstr_alloc -= sizeof (int) * 2 + length (s) + 1; 125 int alloc = sizeof (uint32_t) * 2 + length (s) + 1;
125 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));
126 } 128 }
127 else 129 else
128 ++i; 130 ++i;
129 } 131 }
130 132
131 curpos = *i; 133 curpos = *i;
132} 134}
133 135
134// declare these here to get correct initialisation order 136// declare these here to get correct initialisation order
135#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)
136# include "shstrinc.h" 139# include "shstrinc.h"
137#undef def 140#undef def
141#undef def2
138 142
139shstr skill_names[NUM_SKILLS]; 143shstr skill_names[NUM_SKILLS];
140 144
141//TODO: this should of course not be here 145//TODO: this should of course not be here
142 146

Diff Legend

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