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.37 by root, Thu Jan 1 16:05:12 2009 UTC vs.
Revision 1.47 by elmex, Fri Jun 3 08:36:45 2011 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,2011 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/*
… …
35typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > 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;
39 40
41#define NUM_INT 3
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 (uint32_t) * 2 + len + 1; 49 shstr_alloc += alloc;
46 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (uint32_t) * 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
56shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" }; 62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
63
64bool
65shstr_tmp::contains (const char *substring) const
66{
67 //TODO: this is supposed to check for comma-seperation...
68 return s != null ()
69 && substring
70 && strstr (s, substring);
71}
57 72
58const char * 73const char *
59shstr::find (const char *s) 74shstr::find (const char *s)
60{ 75{
61 if (!s) 76 if (!s)
… …
117 const char *s = *o; 132 const char *s = *o;
118 133
119 ht.erase (o); 134 ht.erase (o);
120 135
121 //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));
122 shstr_alloc -= sizeof (uint32_t) * 2 + length (s) + 1; 137 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
123 g_slice_free1 (sizeof (uint32_t) * 2 + length (s) + 1, -2 + (int *) s); 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
… …
134#define def(id) def2(shstr_ ## id, # id) 150#define def(id) def2(shstr_ ## id, # id)
135# include "shstrinc.h" 151# include "shstrinc.h"
136#undef def 152#undef def
137#undef def2 153#undef def2
138 154
139shstr skill_names[NUM_SKILLS]; 155materialtype_t material_null;
140 156
141//TODO: this should of course not be here 157struct freed_map freed_map;
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