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

Diff Legend

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