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.53 by root, Sat Nov 17 23:40:00 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 6 *
6 * Deliantra is free software: you can redistribute it and/or modify 7 * 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 8 * 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 9 * Free Software Foundation, either version 3 of the License, or (at your
9 * (at your option) any later version. 10 * option) any later version.
10 * 11 *
11 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 15 * GNU General Public License for more details.
15 * 16 *
16 * You should have received a copy of the GNU General Public License 17 * 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/>. 18 * and the GNU General Public License along with this program. If not, see
19 * <http://www.gnu.org/licenses/>.
18 * 20 *
19 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
20 */ 22 */
21 23
22/* 24/*
23 * shstr.C 25 * shstr.C
24 */ 26 */
25 27
26#include <cstring> 28#include <cstring>
27#include <cstdlib> 29#include <cstdlib>
28#include <glib.h> 30#include <glib.h>
29#include <tr1/unordered_set>
30 31
32#include <flat_hash_map.hpp>
33
31#include "global.h" 34#include <global.h>
32 35
33size_t shstr_alloc; 36size_t shstr_alloc;
34 37
35typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT; 38typedef ska::flat_hash_set<const char *, str_hash, str_equal, slice_allocator<const char *>> HT;
36 39
37static HT ht; 40static HT ht;
38static int next_gc; 41static int next_gc;
42
43#define NUM_INT 3
39 44
40static const char * 45static const char *
41makevec (const char *s) 46makevec (const char *s)
42{ 47{
43 int len = strlen (s); 48 int len = strlen (s);
49 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
44 50
45 shstr_alloc += sizeof (uint32_t) * 2 + len + 1; 51 shstr_alloc += alloc;
46 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (uint32_t) * 2 + len + 1)); 52 char *v = (char *)g_slice_alloc (alloc);
53 v += sizeof (uint32_t) * NUM_INT;
47 54
55 shstr::hash (v) = strhsh (s);
48 shstr::length (v) = len; 56 shstr::length (v) = len;
49 shstr::refcnt (v) = 1; 57 shstr::refcnt (v) = 1;
50 58
51 memcpy ((char *) v, s, len + 1); 59 memcpy (v, s, len + 1);
52 60
53 return v; 61 return v;
54} 62}
55 63
56shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" }; 64shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
65
66bool
67shstr_tmp::contains (const char *substring) const
68{
69 //TODO: this is supposed to check for comma-seperation...
70 return s != null ()
71 && substring
72 && strstr (s, substring);
73}
57 74
58const char * 75const char *
59shstr::find (const char *s) 76shstr::find (const char *s)
60{ 77{
61 if (!s) 78 if (!s)
… …
117 const char *s = *o; 134 const char *s = *o;
118 135
119 ht.erase (o); 136 ht.erase (o);
120 137
121 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 138 //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; 139 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
123 g_slice_free1 (sizeof (uint32_t) * 2 + length (s) + 1, -2 + (int *) s); 140 shstr_alloc -= alloc;
141 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
124 } 142 }
125 else 143 else
126 ++i; 144 ++i;
127 } 145 }
128 146
… …
134#define def(id) def2(shstr_ ## id, # id) 152#define def(id) def2(shstr_ ## id, # id)
135# include "shstrinc.h" 153# include "shstrinc.h"
136#undef def 154#undef def
137#undef def2 155#undef def2
138 156
139shstr skill_names[NUM_SKILLS]; 157materialtype_t material_null;
140 158
141//TODO: this should of course not be here 159struct 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