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.28 by root, Thu Nov 8 19:43:23 2007 UTC vs.
Revision 1.43 by root, Fri Mar 26 01:04:44 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 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;
39static int next_gc;
40
41#define NUM_INT 3
38 42
39static const char * 43static const char *
40makevec (const char *s) 44makevec (const char *s)
41{ 45{
42 int len = strlen (s); 46 int len = strlen (s);
47 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
43 48
44 shstr_alloc += sizeof (int) * 2 + len + 1; 49 shstr_alloc += alloc;
45 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); 50 char *v = (char *)g_slice_alloc (alloc);
51 v += sizeof (uint32_t) * NUM_INT;
46 52
53 shstr::hash (v) = strhsh (s);
47 shstr::length (v) = len; 54 shstr::length (v) = len;
48 shstr::refcnt (v) = 1; 55 shstr::refcnt (v) = 1;
49 56
50 memcpy ((char *) v, s, len + 1); 57 memcpy (v, s, len + 1);
51 58
52 return v; 59 return v;
53} 60}
54 61
55static const char * 62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 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 63
65const char * 64const char *
66shstr::find (const char *s) 65shstr::find (const char *s)
67{ 66{
68 if (!s) 67 if (!s)
… …
75 74
76const char * 75const char *
77shstr::intern (const char *s) 76shstr::intern (const char *s)
78{ 77{
79 if (!s) 78 if (!s)
80 return null; 79 return null ();
81 80
82 if (const char *found = find (s)) 81 if (const char *found = find (s))
83 { 82 {
84 ++refcnt (found); 83 ++refcnt (found);
85 return found; 84 return found;
86 } 85 }
87 86
87 --next_gc;
88 s = makevec (s); 88 s = makevec (s);
89 ht.insert (s); 89 ht.insert (s);
90 return s; 90 return s;
91} 91}
92 92
93// periodically test refcounts == 0 for a few strings 93// periodically test refcounts == 0 for a few strings
94// this is the ONLY thing that erases stuff from ht. keep it that way. 94// this is the ONLY thing that erases stuff from ht. keep it that way.
95void 95void
96shstr::gc () 96shstr::gc ()
97{ 97{
98 if (expect_true (next_gc > 0))
99 return;
100
98 static const char *curpos; 101 static const char *curpos;
99 102
100 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 103 auto (i, curpos ? ht.find (curpos) : ht.begin ());
101 104
102 if (i == ht.end ()) 105 if (i == ht.end ())
103 i = ht.begin (); 106 i = ht.begin ();
104 107
105 int n = ht.size () / 256 + 16; 108 int n = ht.size () / 256 + 16;
109 next_gc += n >> 1;
106 110
107 for (;;) 111 for (;;)
108 { 112 {
109 if (i == ht.end ()) 113 if (i == ht.end ())
110 { 114 {
… …
119 const char *s = *o; 123 const char *s = *o;
120 124
121 ht.erase (o); 125 ht.erase (o);
122 126
123 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 127 //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; 128 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
125 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s); 129 shstr_alloc -= alloc;
130 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
126 } 131 }
127 else 132 else
128 ++i; 133 ++i;
129 } 134 }
130 135
131 curpos = *i; 136 curpos = *i;
132} 137}
133 138
134// declare these here to get correct initialisation order 139// declare these here to get correct initialisation order
135#define def(str) const shstr shstr_ ## str (# str); 140#define def2(id,str) const shstr id (str);
141#define def(id) def2(shstr_ ## id, # id)
136# include "shstrinc.h" 142# include "shstrinc.h"
137#undef def 143#undef def
144#undef def2
138 145
139shstr skill_names[NUM_SKILLS]; 146shstr skill_names[NUM_SKILLS];
147materialtype_t material_null;
140 148
141//TODO: this should of course not be here
142
143/* buf_overflow() - we don't want to exceed the buffer size of
144 * buf1 by adding on buf2! Returns true if overflow will occur.
145 */
146int
147buf_overflow (const char *buf1, const char *buf2, int bufsize)
148{
149 int len1 = 0, len2 = 0;
150
151 if (buf1)
152 len1 = strlen (buf1);
153
154 if (buf2)
155 len2 = strlen (buf2);
156
157 if ((len1 + len2) >= bufsize)
158 return 1;
159
160 return 0;
161}

Diff Legend

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