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.44 by root, Thu Apr 15 00:36:51 2010 UTC vs.
Revision 1.54 by root, Sun Nov 25 02:17:31 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,2009,2010 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;
40 42
41#define NUM_INT 3 43#define NUM_INT 3
… …
58 60
59 return v; 61 return v;
60} 62}
61 63
62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 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}
63 74
64const char * 75const char *
65shstr::find (const char *s) 76shstr::find (const char *s)
66{ 77{
67 if (!s) 78 if (!s)
… …
98 if (expect_true (next_gc > 0)) 109 if (expect_true (next_gc > 0))
99 return; 110 return;
100 111
101 static const char *curpos; 112 static const char *curpos;
102 113
103 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 114 auto i = curpos ? ht.find (curpos) : ht.begin ();
104 115
105 if (i == ht.end ()) 116 if (i == ht.end ())
106 i = ht.begin (); 117 i = ht.begin ();
107 118
108 int n = ht.size () / 256 + 16; 119 int n = ht.size () / 256 + 16;
… …
117 } 128 }
118 else if (!--n) 129 else if (!--n)
119 break; 130 break;
120 else if (!refcnt (*i)) 131 else if (!refcnt (*i))
121 { 132 {
122 auto (o, i++);
123 const char *s = *o; 133 const char *s = *i;
124 134
125 ht.erase (o); 135 i = ht.erase (i);
126 136
127 //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));
128 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1; 138 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
129 shstr_alloc -= alloc; 139 shstr_alloc -= alloc;
130 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT)); 140 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
… …
143#undef def 153#undef def
144#undef def2 154#undef def2
145 155
146materialtype_t material_null; 156materialtype_t material_null;
147 157
158struct freed_map freed_map;

Diff Legend

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