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.12 by root, Thu Sep 7 07:52:58 2006 UTC vs.
Revision 1.54 by root, Sun Nov 25 02:17:31 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 "shstr.h" 34#include <global.h>
13#include "util.h"
14 35
15typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT; 36size_t shstr_alloc;
37
38typedef ska::flat_hash_set<const char *, str_hash, str_equal, slice_allocator<const char *>> HT;
16 39
17static HT ht; 40static HT ht;
41static int next_gc;
18 42
19static const char *makevec (const char *s) 43#define NUM_INT 3
44
45static const char *
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
33const char *shstr::null = makevec ("<nil>"); 64shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
34 65
35// what weird misoptimisation is this again? 66bool
36const shstr undead_name ("undead"); 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}
37 74
38const char * 75const char *
39shstr::find (const char *s) 76shstr::find (const char *s)
40{ 77{
41 if (!s) 78 if (!s)
42 return s; 79 return s;
43 80
44 HT::iterator i = ht.find (s); 81 auto (i, ht.find (s));
45 82
46 return i != ht.end () 83 return i != ht.end ()? *i : 0;
47 ? *i
48 : 0;
49} 84}
50 85
51const char * 86const char *
52shstr::intern (const char *s) 87shstr::intern (const char *s)
53{ 88{
54 if (!s) 89 if (!s)
55 return null; 90 return null ();
56 91
57 if (const char *found = find (s)) 92 if (const char *found = find (s))
58 { 93 {
59 ++refcnt (found); 94 ++refcnt (found);
60 return found; 95 return found;
61 } 96 }
62 97
98 --next_gc;
63 s = makevec (s); 99 s = makevec (s);
64 ht.insert (s); 100 ht.insert (s);
65 return s; 101 return s;
66} 102}
67 103
68// periodically test refcounts == 0 for a few strings 104// periodically test refcounts == 0 for a few strings
69// 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.
70void 106void
71shstr::gc () 107shstr::gc ()
72{ 108{
109 if (expect_true (next_gc > 0))
110 return;
111
73 static const char *curpos; 112 static const char *curpos;
74 113
75 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 114 auto i = curpos ? ht.find (curpos) : ht.begin ();
76 115
77 if (i == ht.end ()) 116 if (i == ht.end ())
78 i = ht.begin (); 117 i = ht.begin ();
79 118
80 // go through all strings roughly once every 4 minutes
81 int n = ht.size () / 256 + 16; 119 int n = ht.size () / 256 + 16;
120 next_gc += n >> 1;
82 121
83 for (;;) 122 for (;;)
84 { 123 {
85 if (i == ht.end ()) 124 if (i == ht.end ())
86 { 125 {
… …
89 } 128 }
90 else if (!--n) 129 else if (!--n)
91 break; 130 break;
92 else if (!refcnt (*i)) 131 else if (!refcnt (*i))
93 { 132 {
94 HT::iterator o = i++;
95 const char *s = *o; 133 const char *s = *i;
134
96 ht.erase (o); 135 i = ht.erase (i);
97 136
98 //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));
99 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));
100 } 141 }
101 else 142 else
102 ++i; 143 ++i;
103 } 144 }
104 145
105 curpos = *i; 146 curpos = *i;
106} 147}
107 148
108//TODO: this should of course not be here 149// declare these here to get correct initialisation order
109/* buf_overflow() - we don't want to exceed the buffer size of 150#define def2(id,str) const shstr id (str);
110 * buf1 by adding on buf2! Returns true if overflow will occur. 151#define def(id) def2(shstr_ ## id, # id)
111 */ 152# include "shstrinc.h"
153#undef def
154#undef def2
112 155
113int 156materialtype_t material_null;
114buf_overflow (const char *buf1, const char *buf2, int bufsize)
115{
116 int len1 = 0, len2 = 0;
117 157
118 if (buf1) 158struct freed_map freed_map;
119 len1 = strlen (buf1);
120 if (buf2)
121 len2 = strlen (buf2);
122 if ((len1 + len2) >= bufsize)
123 return 1;
124 return 0;
125}
126

Diff Legend

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