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.15 by root, Tue Sep 12 00:26:16 2006 UTC vs.
Revision 1.56 by root, Wed Dec 5 19:03:26 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 */
1 23
2/* 24/*
3 * shstr.C 25 * shstr.C
4 */ 26 */
5 27
6#include <cstring> 28#include <cstring>
7#include <cstdlib> 29#include <cstdlib>
8
9#include <glib.h> 30#include <glib.h>
10 31
11#include <tr1/unordered_set> 32#include <flat_hash_map.hpp>
12 33
13#include "shstr.h" 34#include <global.h>
14#include "util.h"
15 35
16typedef 36size_t shstr_alloc;
17std::tr1::unordered_set < const char *,
18 str_hash,
19 str_equal >
20 HT;
21 37
38typedef ska::flat_hash_set<const char *, str_hash, str_equal, slice_allocator<const char *>> HT;
39
22static HT 40static HT ht;
23 ht; 41static int next_gc;
42
43#define NUM_INT 3
24 44
25static const char * 45static const char *
26makevec (const char *s) 46makevec (const char *s)
27{ 47{
28 int
29 len = strlen (s); 48 int len = strlen (s);
49 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
30 50
31 const char * 51 shstr_alloc += alloc;
32 v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + len + 1)); 52 char *v = (char *)g_slice_alloc (alloc);
53 v += sizeof (uint32_t) * NUM_INT;
33 54
55 shstr::hash (v) = strhsh (s);
34 shstr::length (v) = len; 56 shstr::length (v) = len;
35 shstr::refcnt (v) = 1; 57 shstr::refcnt (v) = 1;
36 58
37 memcpy ((char *) v, s, len + 1); 59 memcpy (v, s, len + 1);
38 60
39 return v; 61 return v;
40} 62}
41 63
42const char * 64shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
43 shstr::null = makevec ("<nil>");
44 65
45// what weird misoptimisation is this again? 66bool
46const shstr undead_name ("undead"); 67shstr_tmp::contains (const char *substring) const
47 68{
48shstr skill_names[NUM_SKILLS]; 69 //TODO: this is supposed to check for comma-seperation...
70 return s != null ()
71 && substring
72 && strstr (s, substring);
73}
49 74
50const char * 75const char *
51shstr::find (const char *s) 76shstr::find (const char *s)
52{ 77{
53 if (!s) 78 if (!s)
54 return s; 79 return s;
55 80
56 HT::iterator i = ht.find (s); 81 auto i = ht.find (s);
57 82
58 return i != ht.end ()? *i : 0; 83 return i != ht.end ()? *i : 0;
59} 84}
60 85
61const char * 86const char *
62shstr::intern (const char *s) 87shstr::intern (const char *s)
63{ 88{
64 if (!s) 89 if (!s)
65 return null; 90 return null ();
66 91
67 if (const char *found = find (s)) 92 if (const char *found = find (s))
68 { 93 {
69 ++refcnt (found); 94 ++refcnt (found);
70 return found; 95 return found;
71 } 96 }
72 97
98 --next_gc;
73 s = makevec (s); 99 s = makevec (s);
74 ht.insert (s); 100 ht.insert (s);
75 return s; 101 return s;
76} 102}
77 103
78// periodically test refcounts == 0 for a few strings 104// periodically test refcounts == 0 for a few strings
79// 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.
80void 106void
81shstr::gc () 107shstr::gc ()
82{ 108{
83return; //D 109 if (ecb_expect_true (next_gc > 0))
84//D currently disabled: some datastructures might still store them 110 return;
85//D but their pointers will become invalidated 111
86 static const char *curpos; 112 static const char *curpos;
87 113
88 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 114 auto i = curpos ? ht.find (curpos) : ht.begin ();
89 115
90 if (i == ht.end ()) 116 if (i == ht.end ())
91 i = ht.begin (); 117 i = ht.begin ();
92 118
93 // go through all strings roughly once every 4 minutes
94 int n = ht.size () / 256 + 16; 119 int n = ht.size () / 256 + 16;
120 next_gc += n >> 1;
95 121
96 for (;;) 122 for (;;)
97 { 123 {
98 if (i == ht.end ()) 124 if (i == ht.end ())
99 { 125 {
… …
102 } 128 }
103 else if (!--n) 129 else if (!--n)
104 break; 130 break;
105 else if (!refcnt (*i)) 131 else if (!refcnt (*i))
106 { 132 {
107 HT::iterator o = i++;
108 const char *s = *o; 133 const char *s = *i;
109 134
110 ht.erase (o); 135 i = ht.erase (i);
111 136
112 //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));
113 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));
114 } 141 }
115 else 142 else
116 ++i; 143 ++i;
117 } 144 }
118 145
119 curpos = *i; 146 curpos = *i;
120} 147}
121 148
122//TODO: this should of course not be here 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
123 155
124/* buf_overflow() - we don't want to exceed the buffer size of 156materialtype_t material_null;
125 * buf1 by adding on buf2! Returns true if overflow will occur.
126 */
127 157
128int 158struct freed_map freed_map;
129buf_overflow (const char *buf1, const char *buf2, int bufsize)
130{
131 int len1 = 0, len2 = 0;
132
133 if (buf1)
134 len1 = strlen (buf1);
135 if (buf2)
136 len2 = strlen (buf2);
137 if ((len1 + len2) >= bufsize)
138 return 1;
139 return 0;
140}

Diff Legend

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