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.32 by root, Wed Dec 31 17:35:37 2008 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 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 (unsigned int) * 2 + len + 1; 51 shstr_alloc += alloc;
46 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (unsigned int) * 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
56static const char * 64shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
57makenull () 65
66bool
67shstr_tmp::contains (const char *substring) const
58{ 68{
59 const char *s = makevec ("(null)"); 69 //TODO: this is supposed to check for comma-seperation...
60 shstr_tmp::length (s) = 0; 70 return s != null ()
61 //shstr ::refcnt (s) = 0xffffffff; // useful for debugging 71 && substring
62 return s; 72 && strstr (s, substring);
63} 73}
64
65const char *shstr_tmp::null = makenull ();
66 74
67const char * 75const char *
68shstr::find (const char *s) 76shstr::find (const char *s)
69{ 77{
70 if (!s) 78 if (!s)
71 return s; 79 return s;
72 80
73 auto (i, ht.find (s)); 81 auto i = ht.find (s);
74 82
75 return i != ht.end ()? *i : 0; 83 return i != ht.end ()? *i : 0;
76} 84}
77 85
78const char * 86const char *
79shstr::intern (const char *s) 87shstr::intern (const char *s)
80{ 88{
81 if (!s) 89 if (!s)
82 return null; 90 return null ();
83 91
84 if (const char *found = find (s)) 92 if (const char *found = find (s))
85 { 93 {
86 ++refcnt (found); 94 ++refcnt (found);
87 return found; 95 return found;
… …
96// periodically test refcounts == 0 for a few strings 104// periodically test refcounts == 0 for a few strings
97// 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.
98void 106void
99shstr::gc () 107shstr::gc ()
100{ 108{
101 if (expect_true (next_gc > 0)) 109 if (ecb_expect_true (next_gc > 0))
102 return; 110 return;
103 111
104 static const char *curpos; 112 static const char *curpos;
105 113
106 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 114 auto i = curpos ? ht.find (curpos) : ht.begin ();
107 115
108 if (i == ht.end ()) 116 if (i == ht.end ())
109 i = ht.begin (); 117 i = ht.begin ();
110 118
111 int n = ht.size () / 256 + 16; 119 int n = ht.size () / 256 + 16;
… …
120 } 128 }
121 else if (!--n) 129 else if (!--n)
122 break; 130 break;
123 else if (!refcnt (*i)) 131 else if (!refcnt (*i))
124 { 132 {
125 auto (o, i++);
126 const char *s = *o; 133 const char *s = *i;
127 134
128 ht.erase (o); 135 i = ht.erase (i);
129 136
130 //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));
131 shstr_alloc -= sizeof (unsigned int) * 2 + length (s) + 1; 138 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
132 g_slice_free1 (sizeof (unsigned int) * 2 + length (s) + 1, -2 + (int *) s); 139 shstr_alloc -= alloc;
140 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
133 } 141 }
134 else 142 else
135 ++i; 143 ++i;
136 } 144 }
137 145
138 curpos = *i; 146 curpos = *i;
139} 147}
140 148
141const shstr shstr_null;
142
143// declare these here to get correct initialisation order 149// declare these here to get correct initialisation order
144#define def(str) const shstr shstr_ ## str (# str); 150#define def2(id,str) const shstr id (str);
151#define def(id) def2(shstr_ ## id, # id)
145# include "shstrinc.h" 152# include "shstrinc.h"
146#undef def 153#undef def
154#undef def2
147 155
148shstr skill_names[NUM_SKILLS]; 156materialtype_t material_null;
149 157
150//TODO: this should of course not be here 158struct freed_map freed_map;
151
152/* buf_overflow() - we don't want to exceed the buffer size of
153 * buf1 by adding on buf2! Returns true if overflow will occur.
154 */
155int
156buf_overflow (const char *buf1, const char *buf2, int bufsize)
157{
158 int len1 = 0, len2 = 0;
159
160 if (buf1)
161 len1 = strlen (buf1);
162
163 if (buf2)
164 len2 = strlen (buf2);
165
166 if ((len1 + len2) >= bufsize)
167 return 1;
168
169 return 0;
170}

Diff Legend

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