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.20 by root, Thu Sep 14 18:13:01 2006 UTC vs.
Revision 1.53 by root, Sat Nov 17 23:40:00 2018 UTC

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

Diff Legend

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