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.3 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.52 by root, Sat Nov 17 23:33:17 2018 UTC

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

Diff Legend

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