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.23 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.38 by root, Thu Jan 1 21:15:12 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 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 it 6 * Deliantra is free software: you can redistribute it and/or modify
7 * under the terms of the GNU General Public License as published by the Free 7 * it under the terms of the GNU General Public License as published by
8 * Software Foundation; either version 2 of the License, or (at your option) 8 * the Free Software Foundation, either version 3 of the License, or
9 * any later version. 9 * (at your option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, but 11 * This program is distributed in the hope that it will be useful,
12 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * 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 along 16 * You should have received a copy of the GNU General Public License
17 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 * 18 *
20 * The authors can be reached via e-mail to <crossfire@schmorp.de> 19 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 20 */
22 21
23/* 22/*
24 * shstr.C 23 * shstr.C
25 */ 24 */
… …
29#include <glib.h> 28#include <glib.h>
30#include <tr1/unordered_set> 29#include <tr1/unordered_set>
31 30
32#include "global.h" 31#include "global.h"
33 32
33size_t shstr_alloc;
34
34typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT; 35typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
35 36
36static HT ht; 37static HT ht;
38static int next_gc;
37 39
38static const char * 40static const char *
39makevec (const char *s) 41makevec (const char *s)
40{ 42{
41 int len = strlen (s); 43 int len = strlen (s);
44 int alloc = sizeof (uint32_t) * 2 + len + 1;
42 45
43 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); 46 shstr_alloc += alloc;
47 char *v = (char *)g_slice_alloc (alloc);
48 v += sizeof (uint32_t) * 2;
44 49
45 shstr::length (v) = len; 50 shstr::length (v) = len;
46 shstr::refcnt (v) = 1; 51 shstr::refcnt (v) = 1;
47 52
48 memcpy ((char *) v, s, len + 1); 53 memcpy (v, s, len + 1);
49 54
50 return v; 55 return v;
51} 56}
52 57
53static const char * 58shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
54makenull ()
55{
56 const char *s = makevec ("(null)");
57 shstr::length (s) = 0;
58 return s;
59}
60
61const char *shstr::null = makenull ();
62 59
63const char * 60const char *
64shstr::find (const char *s) 61shstr::find (const char *s)
65{ 62{
66 if (!s) 63 if (!s)
… …
73 70
74const char * 71const char *
75shstr::intern (const char *s) 72shstr::intern (const char *s)
76{ 73{
77 if (!s) 74 if (!s)
78 return null; 75 return null ();
79 76
80 if (const char *found = find (s)) 77 if (const char *found = find (s))
81 { 78 {
82 ++refcnt (found); 79 ++refcnt (found);
83 return found; 80 return found;
84 } 81 }
85 82
83 --next_gc;
86 s = makevec (s); 84 s = makevec (s);
87 ht.insert (s); 85 ht.insert (s);
88 return s; 86 return s;
89} 87}
90 88
91// periodically test refcounts == 0 for a few strings 89// periodically test refcounts == 0 for a few strings
92// this is the ONLY thing that erases stuff from ht. keep it that way. 90// this is the ONLY thing that erases stuff from ht. keep it that way.
93void 91void
94shstr::gc () 92shstr::gc ()
95{ 93{
94 if (expect_true (next_gc > 0))
95 return;
96
96 static const char *curpos; 97 static const char *curpos;
97 98
98 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 99 auto (i, curpos ? ht.find (curpos) : ht.begin ());
99 100
100 if (i == ht.end ()) 101 if (i == ht.end ())
101 i = ht.begin (); 102 i = ht.begin ();
102 103
103 // go through all strings roughly once every 4 minutes
104 int n = ht.size () / 256 + 16; 104 int n = ht.size () / 256 + 16;
105 next_gc += n >> 1;
105 106
106 for (;;) 107 for (;;)
107 { 108 {
108 if (i == ht.end ()) 109 if (i == ht.end ())
109 { 110 {
… …
118 const char *s = *o; 119 const char *s = *o;
119 120
120 ht.erase (o); 121 ht.erase (o);
121 122
122 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 123 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
123 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s); 124 int alloc = sizeof (uint32_t) * 2 + length (s) + 1;
125 shstr_alloc -= alloc;
126 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2));
124 } 127 }
125 else 128 else
126 ++i; 129 ++i;
127 } 130 }
128 131
129 curpos = *i; 132 curpos = *i;
130} 133}
131 134
135// declare these here to get correct initialisation order
136#define def2(id,str) const shstr id (str);
137#define def(id) def2(shstr_ ## id, # id)
138# include "shstrinc.h"
139#undef def
140#undef def2
141
132shstr skill_names[NUM_SKILLS]; 142shstr skill_names[NUM_SKILLS];
133
134// what weird misoptimisation is this again?
135const shstr undead_name ("undead");
136 143
137//TODO: this should of course not be here 144//TODO: this should of course not be here
138 145
139/* buf_overflow() - we don't want to exceed the buffer size of 146/* buf_overflow() - we don't want to exceed the buffer size of
140 * buf1 by adding on buf2! Returns true if overflow will occur. 147 * buf1 by adding on buf2! Returns true if overflow will occur.
… …
144{ 151{
145 int len1 = 0, len2 = 0; 152 int len1 = 0, len2 = 0;
146 153
147 if (buf1) 154 if (buf1)
148 len1 = strlen (buf1); 155 len1 = strlen (buf1);
156
149 if (buf2) 157 if (buf2)
150 len2 = strlen (buf2); 158 len2 = strlen (buf2);
159
151 if ((len1 + len2) >= bufsize) 160 if ((len1 + len2) >= bufsize)
152 return 1; 161 return 1;
153 162
154 return 0; 163 return 0;
155} 164}

Diff Legend

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