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.7 by root, Sun Sep 3 23:33:00 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>
30#include <glib.h>
7 31
8#include <tr1/unordered_set> 32#include <flat_hash_map.hpp>
9 33
10#include "shstr.h" 34#include <global.h>
11 35
12struct hash 36size_t shstr_alloc;
13{
14 std::size_t operator ()(const char *s) const
15 {
16 unsigned long hash = 0;
17 unsigned int i = 0;
18 37
19 /* use the one-at-a-time hash function, which supposedly is 38typedef ska::flat_hash_set<const char *, str_hash, str_equal, slice_allocator<const char *>> HT;
20 * better than the djb2-like one used by perl5.005, but
21 * certainly is better then the bug used here before.
22 * see http://burtleburtle.net/bob/hash/doobs.html
23 */
24 while (*s)
25 {
26 hash += *s++;
27 hash += hash << 10;
28 hash ^= hash >> 6;
29 }
30
31 hash += hash << 3;
32 hash ^= hash >> 11;
33 hash += hash << 15;
34
35 return hash;
36 }
37};
38
39struct equal
40{
41 bool operator ()(const char *a, const char *b) const
42 {
43 return !strcmp (a, b);
44 }
45};
46
47typedef std::tr1::unordered_set<const char *, hash, equal> HT;
48 39
49static HT ht; 40static HT ht;
41static int next_gc;
50 42
51static const char *makevec (const char *s) 43#define NUM_INT 3
44
45static const char *
46makevec (const char *s)
52{ 47{
53 int len = strlen (s); 48 int len = strlen (s);
49 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
54 50
55 const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1)); 51 shstr_alloc += alloc;
52 char *v = (char *)g_slice_alloc (alloc);
53 v += sizeof (uint32_t) * NUM_INT;
56 54
55 shstr::hash (v) = strhsh (s);
57 shstr::length (v) = len; 56 shstr::length (v) = len;
58 shstr::refcnt (v) = 1; 57 shstr::refcnt (v) = 1;
59 58
60 memcpy ((char *)v, s, len + 1); 59 memcpy (v, s, len + 1);
61 60
62 return s; 61 return v;
63} 62}
64 63
65const char *shstr::null = makevec ("<nil>"); 64shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
65
66bool
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}
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 HT::iterator i = ht.find (s); 81 auto (i, ht.find (s));
74 82
75 return i != ht.end () 83 return i != ht.end ()? *i : 0;
76 ? *i
77 : 0;
78} 84}
79 85
80const char * 86const char *
81shstr::intern (const char *s) 87shstr::intern (const char *s)
82{ 88{
83 if (!s) 89 if (!s)
84 return null; 90 return null ();
85 91
86 if (const char *found = find (s)) 92 if (const char *found = find (s))
87 { 93 {
88 ++refcnt (found); 94 ++refcnt (found);
89 return found; 95 return found;
90 } 96 }
91 97
98 --next_gc;
92 s = makevec (s); 99 s = makevec (s);
93 ht.insert (s); 100 ht.insert (s);
94 return s; 101 return s;
95} 102}
96 103
97// periodically test refcounts == 0 for a few strings 104// periodically test refcounts == 0 for a few strings
98// 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.
99void 106void
100shstr::gc () 107shstr::gc ()
101{ 108{
109 if (expect_true (next_gc > 0))
110 return;
111
102 static const char *curpos; 112 static const char *curpos;
103 113
104 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 114 auto (i, curpos ? ht.find (curpos) : ht.begin ());
105 115
106 if (i == ht.end ()) 116 if (i == ht.end ())
107 i = ht.begin (); 117 i = ht.begin ();
108 118
109 // go through all strings roughly once every 4 minutes
110 int n = ht.size () / 256 + 16; 119 int n = ht.size () / 256 + 16;
120 next_gc += n >> 1;
111 121
112 for (;;) 122 for (;;)
113 { 123 {
114 if (i == ht.end ()) 124 if (i == ht.end ())
115 { 125 {
… …
118 } 128 }
119 else if (!--n) 129 else if (!--n)
120 break; 130 break;
121 else if (!refcnt (*i)) 131 else if (!refcnt (*i))
122 { 132 {
123 HT::iterator o = i++; 133 auto (o, i++);
124 const char *s = *o; 134 const char *s = *o;
135
125 ht.erase (o); 136 ht.erase (o);
126 137
127 //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));
128 free (-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));
129 } 142 }
130 else 143 else
131 ++i; 144 ++i;
132 } 145 }
133 146
134 curpos = *i; 147 curpos = *i;
135} 148}
136 149
137//TODO: this should of course not be here 150// declare these here to get correct initialisation order
138/* buf_overflow() - we don't want to exceed the buffer size of 151#define def2(id,str) const shstr id (str);
139 * buf1 by adding on buf2! Returns true if overflow will occur. 152#define def(id) def2(shstr_ ## id, # id)
140 */ 153# include "shstrinc.h"
154#undef def
155#undef def2
141 156
142int 157materialtype_t material_null;
143buf_overflow (const char *buf1, const char *buf2, int bufsize)
144{
145 int len1 = 0, len2 = 0;
146 158
147 if (buf1) 159struct freed_map freed_map;
148 len1 = strlen (buf1);
149 if (buf2)
150 len2 = strlen (buf2);
151 if ((len1 + len2) >= bufsize)
152 return 1;
153 return 0;
154}
155

Diff Legend

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