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.48 by root, Tue Jan 3 11:25:31 2012 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,2009,2010,2011,2012 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 it under
7 * under the terms of the GNU General Public License as published by the Free 7 * the terms of the Affero GNU General Public License as published by the
8 * Software Foundation; either version 2 of the License, or (at your option) 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * any later version. 9 * 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 Affero GNU General Public License
17 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 17 * and the GNU General Public License along with this program. If not, see
18 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 18 * <http://www.gnu.org/licenses/>.
19 * 19 *
20 * 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>
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;
40
41#define NUM_INT 3
37 42
38static const char * 43static const char *
39makevec (const char *s) 44makevec (const char *s)
40{ 45{
41 int len = strlen (s); 46 int len = strlen (s);
47 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
42 48
43 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;
44 52
53 shstr::hash (v) = strhsh (s);
45 shstr::length (v) = len; 54 shstr::length (v) = len;
46 shstr::refcnt (v) = 1; 55 shstr::refcnt (v) = 1;
47 56
48 memcpy ((char *) v, s, len + 1); 57 memcpy (v, s, len + 1);
49 58
50 return v; 59 return v;
51} 60}
52 61
53static const char * 62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
54makenull () 63
64bool
65shstr_tmp::contains (const char *substring) const
55{ 66{
56 const char *s = makevec ("(null)"); 67 //TODO: this is supposed to check for comma-seperation...
57 shstr::length (s) = 0; 68 return s != null ()
58 return s; 69 && substring
70 && strstr (s, substring);
59} 71}
60
61const char *shstr::null = makenull ();
62 72
63const char * 73const char *
64shstr::find (const char *s) 74shstr::find (const char *s)
65{ 75{
66 if (!s) 76 if (!s)
… …
73 83
74const char * 84const char *
75shstr::intern (const char *s) 85shstr::intern (const char *s)
76{ 86{
77 if (!s) 87 if (!s)
78 return null; 88 return null ();
79 89
80 if (const char *found = find (s)) 90 if (const char *found = find (s))
81 { 91 {
82 ++refcnt (found); 92 ++refcnt (found);
83 return found; 93 return found;
84 } 94 }
85 95
96 --next_gc;
86 s = makevec (s); 97 s = makevec (s);
87 ht.insert (s); 98 ht.insert (s);
88 return s; 99 return s;
89} 100}
90 101
91// periodically test refcounts == 0 for a few strings 102// periodically test refcounts == 0 for a few strings
92// this is the ONLY thing that erases stuff from ht. keep it that way. 103// this is the ONLY thing that erases stuff from ht. keep it that way.
93void 104void
94shstr::gc () 105shstr::gc ()
95{ 106{
107 if (expect_true (next_gc > 0))
108 return;
109
96 static const char *curpos; 110 static const char *curpos;
97 111
98 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 112 auto (i, curpos ? ht.find (curpos) : ht.begin ());
99 113
100 if (i == ht.end ()) 114 if (i == ht.end ())
101 i = ht.begin (); 115 i = ht.begin ();
102 116
103 // go through all strings roughly once every 4 minutes
104 int n = ht.size () / 256 + 16; 117 int n = ht.size () / 256 + 16;
118 next_gc += n >> 1;
105 119
106 for (;;) 120 for (;;)
107 { 121 {
108 if (i == ht.end ()) 122 if (i == ht.end ())
109 { 123 {
… …
118 const char *s = *o; 132 const char *s = *o;
119 133
120 ht.erase (o); 134 ht.erase (o);
121 135
122 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 136 //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); 137 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
138 shstr_alloc -= alloc;
139 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
124 } 140 }
125 else 141 else
126 ++i; 142 ++i;
127 } 143 }
128 144
129 curpos = *i; 145 curpos = *i;
130} 146}
131 147
132shstr skill_names[NUM_SKILLS]; 148// declare these here to get correct initialisation order
149#define def2(id,str) const shstr id (str);
150#define def(id) def2(shstr_ ## id, # id)
151# include "shstrinc.h"
152#undef def
153#undef def2
133 154
134// what weird misoptimisation is this again? 155materialtype_t material_null;
135const shstr undead_name ("undead");
136 156
137//TODO: this should of course not be here 157struct freed_map freed_map;
138
139/* buf_overflow() - we don't want to exceed the buffer size of
140 * buf1 by adding on buf2! Returns true if overflow will occur.
141 */
142int
143buf_overflow (const char *buf1, const char *buf2, int bufsize)
144{
145 int len1 = 0, len2 = 0;
146
147 if (buf1)
148 len1 = strlen (buf1);
149 if (buf2)
150 len2 = strlen (buf2);
151 if ((len1 + len2) >= bufsize)
152 return 1;
153
154 return 0;
155}

Diff Legend

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