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.23 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.56 by root, Wed Dec 5 19:03:26 2018 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / 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 * Crossfire TRT is free software; you can redistribute it and/or modify it 7 * Deliantra is free software: you can redistribute it and/or modify it under
7 * under the terms of the GNU General Public License as published by the Free 8 * the terms of the Affero GNU General Public License as published by the
8 * Software Foundation; either version 2 of the License, or (at your option) 9 * Free Software Foundation, either version 3 of the License, or (at your
9 * any later version. 10 * option) any later version.
10 * 11 *
11 * This program is distributed in the hope that it will be useful, but 12 * This program is distributed in the hope that it will be useful,
12 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * 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 along 17 * You should have received a copy of the Affero GNU General Public License
17 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 18 * and the GNU General Public License along with this program. If not, see
18 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * <http://www.gnu.org/licenses/>.
19 * 20 *
20 * The authors can be reached via e-mail to <crossfire@schmorp.de> 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 "global.h" 32#include <flat_hash_map.hpp>
33 33
34#include <global.h>
35
36size_t shstr_alloc;
37
34typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT; 38typedef ska::flat_hash_set<const char *, str_hash, str_equal, slice_allocator<const char *>> HT;
35 39
36static HT ht; 40static HT ht;
41static int next_gc;
42
43#define NUM_INT 3
37 44
38static const char * 45static const char *
39makevec (const char *s) 46makevec (const char *s)
40{ 47{
41 int len = strlen (s); 48 int len = strlen (s);
49 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
42 50
43 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); 51 shstr_alloc += alloc;
52 char *v = (char *)g_slice_alloc (alloc);
53 v += sizeof (uint32_t) * NUM_INT;
44 54
55 shstr::hash (v) = strhsh (s);
45 shstr::length (v) = len; 56 shstr::length (v) = len;
46 shstr::refcnt (v) = 1; 57 shstr::refcnt (v) = 1;
47 58
48 memcpy ((char *) v, s, len + 1); 59 memcpy (v, s, len + 1);
49 60
50 return v; 61 return v;
51} 62}
52 63
53static const char * 64shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
54makenull () 65
66bool
67shstr_tmp::contains (const char *substring) const
55{ 68{
56 const char *s = makevec ("(null)"); 69 //TODO: this is supposed to check for comma-seperation...
57 shstr::length (s) = 0; 70 return s != null ()
58 return s; 71 && substring
72 && strstr (s, substring);
59} 73}
60
61const char *shstr::null = makenull ();
62 74
63const char * 75const char *
64shstr::find (const char *s) 76shstr::find (const char *s)
65{ 77{
66 if (!s) 78 if (!s)
67 return s; 79 return s;
68 80
69 auto (i, ht.find (s)); 81 auto i = ht.find (s);
70 82
71 return i != ht.end ()? *i : 0; 83 return i != ht.end ()? *i : 0;
72} 84}
73 85
74const char * 86const char *
75shstr::intern (const char *s) 87shstr::intern (const char *s)
76{ 88{
77 if (!s) 89 if (!s)
78 return null; 90 return null ();
79 91
80 if (const char *found = find (s)) 92 if (const char *found = find (s))
81 { 93 {
82 ++refcnt (found); 94 ++refcnt (found);
83 return found; 95 return found;
84 } 96 }
85 97
98 --next_gc;
86 s = makevec (s); 99 s = makevec (s);
87 ht.insert (s); 100 ht.insert (s);
88 return s; 101 return s;
89} 102}
90 103
91// periodically test refcounts == 0 for a few strings 104// periodically test refcounts == 0 for a few strings
92// 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.
93void 106void
94shstr::gc () 107shstr::gc ()
95{ 108{
109 if (ecb_expect_true (next_gc > 0))
110 return;
111
96 static const char *curpos; 112 static const char *curpos;
97 113
98 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 114 auto i = curpos ? ht.find (curpos) : ht.begin ();
99 115
100 if (i == ht.end ()) 116 if (i == ht.end ())
101 i = ht.begin (); 117 i = ht.begin ();
102 118
103 // go through all strings roughly once every 4 minutes
104 int n = ht.size () / 256 + 16; 119 int n = ht.size () / 256 + 16;
120 next_gc += n >> 1;
105 121
106 for (;;) 122 for (;;)
107 { 123 {
108 if (i == ht.end ()) 124 if (i == ht.end ())
109 { 125 {
… …
112 } 128 }
113 else if (!--n) 129 else if (!--n)
114 break; 130 break;
115 else if (!refcnt (*i)) 131 else if (!refcnt (*i))
116 { 132 {
117 auto (o, i++);
118 const char *s = *o; 133 const char *s = *i;
119 134
120 ht.erase (o); 135 i = ht.erase (i);
121 136
122 //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));
123 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s); 138 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
139 shstr_alloc -= alloc;
140 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
124 } 141 }
125 else 142 else
126 ++i; 143 ++i;
127 } 144 }
128 145
129 curpos = *i; 146 curpos = *i;
130} 147}
131 148
132shstr skill_names[NUM_SKILLS]; 149// declare these here to get correct initialisation order
150#define def2(id,str) const shstr id (str);
151#define def(id) def2(shstr_ ## id, # id)
152# include "shstrinc.h"
153#undef def
154#undef def2
133 155
134// what weird misoptimisation is this again? 156materialtype_t material_null;
135const shstr undead_name ("undead");
136 157
137//TODO: this should of course not be here 158struct freed_map freed_map;
138
139/* buf_overflow() - we don't want to exceed the buffer size of
140 * buf1 by adding on buf2! Returns true if overflow will occur.
141 */
142int
143buf_overflow (const char *buf1, const char *buf2, int bufsize)
144{
145 int len1 = 0, len2 = 0;
146
147 if (buf1)
148 len1 = strlen (buf1);
149 if (buf2)
150 len2 = strlen (buf2);
151 if ((len1 + len2) >= bufsize)
152 return 1;
153
154 return 0;
155}

Diff Legend

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