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.29 by root, Fri Apr 11 21:09:52 2008 UTC vs.
Revision 1.44 by root, Thu Apr 15 00:36:51 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,2008 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;
38static int next_gc; 39static int next_gc;
40
41#define NUM_INT 3
39 42
40static const char * 43static const char *
41makevec (const char *s) 44makevec (const char *s)
42{ 45{
43 int len = strlen (s); 46 int len = strlen (s);
47 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
44 48
45 shstr_alloc += sizeof (int) * 2 + len + 1; 49 shstr_alloc += alloc;
46 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;
47 52
53 shstr::hash (v) = strhsh (s);
48 shstr::length (v) = len; 54 shstr::length (v) = len;
49 shstr::refcnt (v) = 1; 55 shstr::refcnt (v) = 1;
50 56
51 memcpy ((char *) v, s, len + 1); 57 memcpy (v, s, len + 1);
52 58
53 return v; 59 return v;
54} 60}
55 61
56static const char * 62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
57makenull ()
58{
59 const char *s = makevec ("(null)");
60 shstr::length (s) = 0;
61 return s;
62}
63
64const char *shstr::null = makenull ();
65 63
66const char * 64const char *
67shstr::find (const char *s) 65shstr::find (const char *s)
68{ 66{
69 if (!s) 67 if (!s)
… …
76 74
77const char * 75const char *
78shstr::intern (const char *s) 76shstr::intern (const char *s)
79{ 77{
80 if (!s) 78 if (!s)
81 return null; 79 return null ();
82 80
83 if (const char *found = find (s)) 81 if (const char *found = find (s))
84 { 82 {
85 ++refcnt (found); 83 ++refcnt (found);
86 return found; 84 return found;
… …
125 const char *s = *o; 123 const char *s = *o;
126 124
127 ht.erase (o); 125 ht.erase (o);
128 126
129 //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));
130 shstr_alloc -= sizeof (int) * 2 + length (s) + 1; 128 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
131 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));
132 } 131 }
133 else 132 else
134 ++i; 133 ++i;
135 } 134 }
136 135
137 curpos = *i; 136 curpos = *i;
138} 137}
139 138
140// declare these here to get correct initialisation order 139// declare these here to get correct initialisation order
141#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)
142# include "shstrinc.h" 142# include "shstrinc.h"
143#undef def 143#undef def
144#undef def2
144 145
145shstr skill_names[NUM_SKILLS]; 146materialtype_t material_null;
146 147
147//TODO: this should of course not be here
148
149/* buf_overflow() - we don't want to exceed the buffer size of
150 * buf1 by adding on buf2! Returns true if overflow will occur.
151 */
152int
153buf_overflow (const char *buf1, const char *buf2, int bufsize)
154{
155 int len1 = 0, len2 = 0;
156
157 if (buf1)
158 len1 = strlen (buf1);
159
160 if (buf2)
161 len2 = strlen (buf2);
162
163 if ((len1 + len2) >= bufsize)
164 return 1;
165
166 return 0;
167}

Diff Legend

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