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.39 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.56 by root, Wed Dec 5 19:03:26 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 it under 7 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 8 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 9 * Free Software Foundation, either version 3 of the License, or (at your
9 * 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 Affero GNU General Public License 17 * You should have received a copy of the Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see 18 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>. 19 * <http://www.gnu.org/licenses/>.
19 * 20 *
20 * 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>
21 */ 22 */
22 23
23/* 24/*
24 * shstr.C 25 * shstr.C
25 */ 26 */
26 27
27#include <cstring> 28#include <cstring>
28#include <cstdlib> 29#include <cstdlib>
29#include <glib.h> 30#include <glib.h>
30#include <tr1/unordered_set>
31 31
32#include <flat_hash_map.hpp>
33
32#include "global.h" 34#include <global.h>
33 35
34size_t shstr_alloc; 36size_t shstr_alloc;
35 37
36typedef 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;
37 39
38static HT ht; 40static HT ht;
39static int next_gc; 41static int next_gc;
42
43#define NUM_INT 3
40 44
41static const char * 45static const char *
42makevec (const char *s) 46makevec (const char *s)
43{ 47{
44 int len = strlen (s); 48 int len = strlen (s);
45 int alloc = sizeof (uint32_t) * 2 + len + 1; 49 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
46 50
47 shstr_alloc += alloc; 51 shstr_alloc += alloc;
48 char *v = (char *)g_slice_alloc (alloc); 52 char *v = (char *)g_slice_alloc (alloc);
49 v += sizeof (uint32_t) * 2; 53 v += sizeof (uint32_t) * NUM_INT;
50 54
55 shstr::hash (v) = strhsh (s);
51 shstr::length (v) = len; 56 shstr::length (v) = len;
52 shstr::refcnt (v) = 1; 57 shstr::refcnt (v) = 1;
53 58
54 memcpy (v, s, len + 1); 59 memcpy (v, s, len + 1);
55 60
56 return v; 61 return v;
57} 62}
58 63
59shstr_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}
60 74
61const char * 75const char *
62shstr::find (const char *s) 76shstr::find (const char *s)
63{ 77{
64 if (!s) 78 if (!s)
65 return s; 79 return s;
66 80
67 auto (i, ht.find (s)); 81 auto i = ht.find (s);
68 82
69 return i != ht.end ()? *i : 0; 83 return i != ht.end ()? *i : 0;
70} 84}
71 85
72const char * 86const char *
… …
90// periodically test refcounts == 0 for a few strings 104// periodically test refcounts == 0 for a few strings
91// this is the ONLY thing that erases stuff from ht. keep it that way. 105// this is the ONLY thing that erases stuff from ht. keep it that way.
92void 106void
93shstr::gc () 107shstr::gc ()
94{ 108{
95 if (expect_true (next_gc > 0)) 109 if (ecb_expect_true (next_gc > 0))
96 return; 110 return;
97 111
98 static const char *curpos; 112 static const char *curpos;
99 113
100 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 114 auto i = curpos ? ht.find (curpos) : ht.begin ();
101 115
102 if (i == ht.end ()) 116 if (i == ht.end ())
103 i = ht.begin (); 117 i = ht.begin ();
104 118
105 int n = ht.size () / 256 + 16; 119 int n = ht.size () / 256 + 16;
… …
114 } 128 }
115 else if (!--n) 129 else if (!--n)
116 break; 130 break;
117 else if (!refcnt (*i)) 131 else if (!refcnt (*i))
118 { 132 {
119 auto (o, i++);
120 const char *s = *o; 133 const char *s = *i;
121 134
122 ht.erase (o); 135 i = ht.erase (i);
123 136
124 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 137 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
125 int alloc = sizeof (uint32_t) * 2 + length (s) + 1; 138 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
126 shstr_alloc -= alloc; 139 shstr_alloc -= alloc;
127 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2)); 140 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
128 } 141 }
129 else 142 else
130 ++i; 143 ++i;
131 } 144 }
132 145
… …
138#define def(id) def2(shstr_ ## id, # id) 151#define def(id) def2(shstr_ ## id, # id)
139# include "shstrinc.h" 152# include "shstrinc.h"
140#undef def 153#undef def
141#undef def2 154#undef def2
142 155
143shstr skill_names[NUM_SKILLS]; 156materialtype_t material_null;
144 157
145//TODO: this should of course not be here 158struct freed_map freed_map;
146
147/* buf_overflow() - we don't want to exceed the buffer size of
148 * buf1 by adding on buf2! Returns true if overflow will occur.
149 */
150int
151buf_overflow (const char *buf1, const char *buf2, int bufsize)
152{
153 int len1 = 0, len2 = 0;
154
155 if (buf1)
156 len1 = strlen (buf1);
157
158 if (buf2)
159 len2 = strlen (buf2);
160
161 if ((len1 + len2) >= bufsize)
162 return 1;
163
164 return 0;
165}

Diff Legend

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