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.24 by root, Sun Jul 1 05:00:18 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 */
… …
28#include <glib.h> 29#include <glib.h>
29#include <tr1/unordered_set> 30#include <tr1/unordered_set>
30 31
31#include "global.h" 32#include "global.h"
32 33
34size_t shstr_alloc;
35
33typedef 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;
34 37
35static HT ht; 38static HT ht;
39static int next_gc;
36 40
37static const char * 41static const char *
38makevec (const char *s) 42makevec (const char *s)
39{ 43{
40 int len = strlen (s); 44 int len = strlen (s);
45 int alloc = sizeof (uint32_t) * 2 + len + 1;
41 46
42 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); 47 shstr_alloc += alloc;
48 char *v = (char *)g_slice_alloc (alloc);
49 v += sizeof (uint32_t) * 2;
43 50
44 shstr::length (v) = len; 51 shstr::length (v) = len;
45 shstr::refcnt (v) = 1; 52 shstr::refcnt (v) = 1;
46 53
47 memcpy ((char *) v, s, len + 1); 54 memcpy (v, s, len + 1);
48 55
49 return v; 56 return v;
50} 57}
51 58
52static const char * 59shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
53makenull ()
54{
55 const char *s = makevec ("(null)");
56 shstr::length (s) = 0;
57 return s;
58}
59
60const char *shstr::null = makenull ();
61 60
62const char * 61const char *
63shstr::find (const char *s) 62shstr::find (const char *s)
64{ 63{
65 if (!s) 64 if (!s)
… …
72 71
73const char * 72const char *
74shstr::intern (const char *s) 73shstr::intern (const char *s)
75{ 74{
76 if (!s) 75 if (!s)
77 return null; 76 return null ();
78 77
79 if (const char *found = find (s)) 78 if (const char *found = find (s))
80 { 79 {
81 ++refcnt (found); 80 ++refcnt (found);
82 return found; 81 return found;
83 } 82 }
84 83
84 --next_gc;
85 s = makevec (s); 85 s = makevec (s);
86 ht.insert (s); 86 ht.insert (s);
87 return s; 87 return s;
88} 88}
89 89
90// periodically test refcounts == 0 for a few strings 90// periodically test refcounts == 0 for a few strings
91// 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.
92void 92void
93shstr::gc () 93shstr::gc ()
94{ 94{
95 if (expect_true (next_gc > 0))
96 return;
97
95 static const char *curpos; 98 static const char *curpos;
96 99
97 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 100 auto (i, curpos ? ht.find (curpos) : ht.begin ());
98 101
99 if (i == ht.end ()) 102 if (i == ht.end ())
100 i = ht.begin (); 103 i = ht.begin ();
101 104
102 // go through all strings roughly once every 4 minutes
103 int n = ht.size () / 256 + 16; 105 int n = ht.size () / 256 + 16;
106 next_gc += n >> 1;
104 107
105 for (;;) 108 for (;;)
106 { 109 {
107 if (i == ht.end ()) 110 if (i == ht.end ())
108 { 111 {
… …
117 const char *s = *o; 120 const char *s = *o;
118 121
119 ht.erase (o); 122 ht.erase (o);
120 123
121 //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));
122 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s); 125 int alloc = sizeof (uint32_t) * 2 + length (s) + 1;
126 shstr_alloc -= alloc;
127 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2));
123 } 128 }
124 else 129 else
125 ++i; 130 ++i;
126 } 131 }
127 132
128 curpos = *i; 133 curpos = *i;
129} 134}
130 135
136// declare these here to get correct initialisation order
137#define def2(id,str) const shstr id (str);
138#define def(id) def2(shstr_ ## id, # id)
139# include "shstrinc.h"
140#undef def
141#undef def2
142
131shstr skill_names[NUM_SKILLS]; 143shstr skill_names[NUM_SKILLS];
132
133// what weird misoptimisation is this again?
134const shstr undead_name ("undead");
135 144
136//TODO: this should of course not be here 145//TODO: this should of course not be here
137 146
138/* buf_overflow() - we don't want to exceed the buffer size of 147/* buf_overflow() - we don't want to exceed the buffer size of
139 * buf1 by adding on buf2! Returns true if overflow will occur. 148 * buf1 by adding on buf2! Returns true if overflow will occur.
… …
143{ 152{
144 int len1 = 0, len2 = 0; 153 int len1 = 0, len2 = 0;
145 154
146 if (buf1) 155 if (buf1)
147 len1 = strlen (buf1); 156 len1 = strlen (buf1);
157
148 if (buf2) 158 if (buf2)
149 len2 = strlen (buf2); 159 len2 = strlen (buf2);
160
150 if ((len1 + len2) >= bufsize) 161 if ((len1 + len2) >= bufsize)
151 return 1; 162 return 1;
152 163
153 return 0; 164 return 0;
154} 165}

Diff Legend

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