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.22 by root, Thu May 17 21:32:08 2007 UTC vs.
Revision 1.39 by root, Mon Oct 12 14:00:57 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * This program 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 2 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, write to the Free Software 17 * and the GNU General Public License along with this program. If not, see
18 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 18 * <http://www.gnu.org/licenses/>.
19 * 19 *
20 * The authors can be reached via e-mail at <crossfire@schmorp.de> 20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 21 */
22 22
23/* 23/*
24 * shstr.C 24 * shstr.C
25 */ 25 */
… …
29#include <glib.h> 29#include <glib.h>
30#include <tr1/unordered_set> 30#include <tr1/unordered_set>
31 31
32#include "global.h" 32#include "global.h"
33 33
34size_t shstr_alloc;
35
34typedef 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;
35 37
36static HT ht; 38static HT ht;
39static int next_gc;
37 40
38static const char * 41static const char *
39makevec (const char *s) 42makevec (const char *s)
40{ 43{
41 int len = strlen (s); 44 int len = strlen (s);
45 int alloc = sizeof (uint32_t) * 2 + len + 1;
42 46
43 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;
44 50
45 shstr::length (v) = len; 51 shstr::length (v) = len;
46 shstr::refcnt (v) = 1; 52 shstr::refcnt (v) = 1;
47 53
48 memcpy ((char *) v, s, len + 1); 54 memcpy (v, s, len + 1);
49 55
50 return v; 56 return v;
51} 57}
52 58
53static const char * 59shstr_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 60
63const char * 61const char *
64shstr::find (const char *s) 62shstr::find (const char *s)
65{ 63{
66 if (!s) 64 if (!s)
… …
73 71
74const char * 72const char *
75shstr::intern (const char *s) 73shstr::intern (const char *s)
76{ 74{
77 if (!s) 75 if (!s)
78 return null; 76 return null ();
79 77
80 if (const char *found = find (s)) 78 if (const char *found = find (s))
81 { 79 {
82 ++refcnt (found); 80 ++refcnt (found);
83 return found; 81 return found;
84 } 82 }
85 83
84 --next_gc;
86 s = makevec (s); 85 s = makevec (s);
87 ht.insert (s); 86 ht.insert (s);
88 return s; 87 return s;
89} 88}
90 89
91// periodically test refcounts == 0 for a few strings 90// periodically test refcounts == 0 for a few strings
92// 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.
93void 92void
94shstr::gc () 93shstr::gc ()
95{ 94{
95 if (expect_true (next_gc > 0))
96 return;
97
96 static const char *curpos; 98 static const char *curpos;
97 99
98 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 100 auto (i, curpos ? ht.find (curpos) : ht.begin ());
99 101
100 if (i == ht.end ()) 102 if (i == ht.end ())
101 i = ht.begin (); 103 i = ht.begin ();
102 104
103 // go through all strings roughly once every 4 minutes
104 int n = ht.size () / 256 + 16; 105 int n = ht.size () / 256 + 16;
106 next_gc += n >> 1;
105 107
106 for (;;) 108 for (;;)
107 { 109 {
108 if (i == ht.end ()) 110 if (i == ht.end ())
109 { 111 {
… …
118 const char *s = *o; 120 const char *s = *o;
119 121
120 ht.erase (o); 122 ht.erase (o);
121 123
122 //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));
123 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));
124 } 128 }
125 else 129 else
126 ++i; 130 ++i;
127 } 131 }
128 132
129 curpos = *i; 133 curpos = *i;
130} 134}
131 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
132shstr skill_names[NUM_SKILLS]; 143shstr skill_names[NUM_SKILLS];
133
134// what weird misoptimisation is this again?
135const shstr undead_name ("undead");
136 144
137//TODO: this should of course not be here 145//TODO: this should of course not be here
138 146
139/* 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
140 * buf1 by adding on buf2! Returns true if overflow will occur. 148 * buf1 by adding on buf2! Returns true if overflow will occur.
… …
144{ 152{
145 int len1 = 0, len2 = 0; 153 int len1 = 0, len2 = 0;
146 154
147 if (buf1) 155 if (buf1)
148 len1 = strlen (buf1); 156 len1 = strlen (buf1);
157
149 if (buf2) 158 if (buf2)
150 len2 = strlen (buf2); 159 len2 = strlen (buf2);
160
151 if ((len1 + len2) >= bufsize) 161 if ((len1 + len2) >= bufsize)
152 return 1; 162 return 1;
153 163
154 return 0; 164 return 0;
155} 165}

Diff Legend

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