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.8 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.50 by root, Wed Nov 16 23:41:59 2016 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>
7 29#include <glib.h>
8#include <tr1/unordered_set> 30#include <tr1/unordered_set>
9 31
10#include "shstr.h" 32#include "global.h"
11 33
12struct hash 34size_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 35
19 /* use the one-at-a-time hash function, which supposedly is
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; 36typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
48 37
49static HT ht; 38static HT ht;
39static int next_gc;
50 40
51static const char *makevec (const char *s) 41#define NUM_INT 3
42
43static const char *
44makevec (const char *s)
52{ 45{
53 int len = strlen (s); 46 int len = strlen (s);
47 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
54 48
55 const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1)); 49 shstr_alloc += alloc;
50 char *v = (char *)g_slice_alloc (alloc);
51 v += sizeof (uint32_t) * NUM_INT;
56 52
53 shstr::hash (v) = strhsh (s);
57 shstr::length (v) = len; 54 shstr::length (v) = len;
58 shstr::refcnt (v) = 1; 55 shstr::refcnt (v) = 1;
59 56
60 memcpy ((char *)v, s, len + 1); 57 memcpy (v, s, len + 1);
61 58
62 return v; 59 return v;
63} 60}
64 61
65const char *shstr::null = makevec ("<nil>"); 62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
66 63
67// what weird misoptimisation is this again? 64bool
68const shstr undead_name ("undead"); 65shstr_tmp::contains (const char *substring) const
66{
67 //TODO: this is supposed to check for comma-seperation...
68 return s != null ()
69 && substring
70 && strstr (s, substring);
71}
69 72
70const char * 73const char *
71shstr::find (const char *s) 74shstr::find (const char *s)
72{ 75{
73 if (!s) 76 if (!s)
74 return s; 77 return s;
75 78
76 HT::iterator i = ht.find (s); 79 auto (i, ht.find (s));
77 80
78 return i != ht.end () 81 return i != ht.end ()? *i : 0;
79 ? *i
80 : 0;
81} 82}
82 83
83const char * 84const char *
84shstr::intern (const char *s) 85shstr::intern (const char *s)
85{ 86{
86 if (!s) 87 if (!s)
87 return null; 88 return null ();
88 89
89 if (const char *found = find (s)) 90 if (const char *found = find (s))
90 { 91 {
91 ++refcnt (found); 92 ++refcnt (found);
92 return found; 93 return found;
93 } 94 }
94 95
96 --next_gc;
95 s = makevec (s); 97 s = makevec (s);
96 ht.insert (s); 98 ht.insert (s);
97 return s; 99 return s;
98} 100}
99 101
100// periodically test refcounts == 0 for a few strings 102// periodically test refcounts == 0 for a few strings
101// this is the ONLY thing that erases stuff from ht. keep it that way. 103// this is the ONLY thing that erases stuff from ht. keep it that way.
102void 104void
103shstr::gc () 105shstr::gc ()
104{ 106{
107 if (expect_true (next_gc > 0))
108 return;
109
105 static const char *curpos; 110 static const char *curpos;
106 111
107 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 112 auto (i, curpos ? ht.find (curpos) : ht.begin ());
108 113
109 if (i == ht.end ()) 114 if (i == ht.end ())
110 i = ht.begin (); 115 i = ht.begin ();
111 116
112 // go through all strings roughly once every 4 minutes
113 int n = ht.size () / 256 + 16; 117 int n = ht.size () / 256 + 16;
118 next_gc += n >> 1;
114 119
115 for (;;) 120 for (;;)
116 { 121 {
117 if (i == ht.end ()) 122 if (i == ht.end ())
118 { 123 {
… …
121 } 126 }
122 else if (!--n) 127 else if (!--n)
123 break; 128 break;
124 else if (!refcnt (*i)) 129 else if (!refcnt (*i))
125 { 130 {
126 HT::iterator o = i++; 131 auto (o, i++);
127 const char *s = *o; 132 const char *s = *o;
133
128 ht.erase (o); 134 ht.erase (o);
129 135
130 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 136 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
131 free (-2 + (int *)s); 137 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
138 shstr_alloc -= alloc;
139 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
132 } 140 }
133 else 141 else
134 ++i; 142 ++i;
135 } 143 }
136 144
137 curpos = *i; 145 curpos = *i;
138} 146}
139 147
140//TODO: this should of course not be here 148// declare these here to get correct initialisation order
141/* buf_overflow() - we don't want to exceed the buffer size of 149#define def2(id,str) const shstr id (str);
142 * buf1 by adding on buf2! Returns true if overflow will occur. 150#define def(id) def2(shstr_ ## id, # id)
143 */ 151# include "shstrinc.h"
152#undef def
153#undef def2
144 154
145int 155materialtype_t material_null;
146buf_overflow (const char *buf1, const char *buf2, int bufsize)
147{
148 int len1 = 0, len2 = 0;
149 156
150 if (buf1) 157struct freed_map freed_map;
151 len1 = strlen (buf1);
152 if (buf2)
153 len2 = strlen (buf2);
154 if ((len1 + len2) >= bufsize)
155 return 1;
156 return 0;
157}
158

Diff Legend

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