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.40 by root, Wed Nov 4 00:02:48 2009 UTC

1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007,2008 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) 41static const char *
42makevec (const char *s)
52{ 43{
53 int len = strlen (s); 44 int len = strlen (s);
45 int alloc = sizeof (uint32_t) * 2 + len + 1;
54 46
55 const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1)); 47 shstr_alloc += alloc;
48 char *v = (char *)g_slice_alloc (alloc);
49 v += sizeof (uint32_t) * 2;
56 50
57 shstr::length (v) = len; 51 shstr::length (v) = len;
58 shstr::refcnt (v) = 1; 52 shstr::refcnt (v) = 1;
59 53
60 memcpy ((char *)v, s, len + 1); 54 memcpy (v, s, len + 1);
61 55
62 return v; 56 return v;
63} 57}
64 58
65const char *shstr::null = makevec ("<nil>"); 59shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
66
67// what weird misoptimisation is this again?
68const shstr undead_name ("undead");
69 60
70const char * 61const char *
71shstr::find (const char *s) 62shstr::find (const char *s)
72{ 63{
73 if (!s) 64 if (!s)
74 return s; 65 return s;
75 66
76 HT::iterator i = ht.find (s); 67 auto (i, ht.find (s));
77 68
78 return i != ht.end () 69 return i != ht.end ()? *i : 0;
79 ? *i
80 : 0;
81} 70}
82 71
83const char * 72const char *
84shstr::intern (const char *s) 73shstr::intern (const char *s)
85{ 74{
86 if (!s) 75 if (!s)
87 return null; 76 return null ();
88 77
89 if (const char *found = find (s)) 78 if (const char *found = find (s))
90 { 79 {
91 ++refcnt (found); 80 ++refcnt (found);
92 return found; 81 return found;
93 } 82 }
94 83
84 --next_gc;
95 s = makevec (s); 85 s = makevec (s);
96 ht.insert (s); 86 ht.insert (s);
97 return s; 87 return s;
98} 88}
99 89
100// periodically test refcounts == 0 for a few strings 90// periodically test refcounts == 0 for a few strings
101// this is the ONLY thing that erases stuff from ht. keep it that way. 91// this is the ONLY thing that erases stuff from ht. keep it that way.
102void 92void
103shstr::gc () 93shstr::gc ()
104{ 94{
95 if (expect_true (next_gc > 0))
96 return;
97
105 static const char *curpos; 98 static const char *curpos;
106 99
107 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 100 auto (i, curpos ? ht.find (curpos) : ht.begin ());
108 101
109 if (i == ht.end ()) 102 if (i == ht.end ())
110 i = ht.begin (); 103 i = ht.begin ();
111 104
112 // go through all strings roughly once every 4 minutes
113 int n = ht.size () / 256 + 16; 105 int n = ht.size () / 256 + 16;
106 next_gc += n >> 1;
114 107
115 for (;;) 108 for (;;)
116 { 109 {
117 if (i == ht.end ()) 110 if (i == ht.end ())
118 { 111 {
… …
121 } 114 }
122 else if (!--n) 115 else if (!--n)
123 break; 116 break;
124 else if (!refcnt (*i)) 117 else if (!refcnt (*i))
125 { 118 {
126 HT::iterator o = i++; 119 auto (o, i++);
127 const char *s = *o; 120 const char *s = *o;
121
128 ht.erase (o); 122 ht.erase (o);
129 123
130 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 124 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
131 free (-2 + (int *)s); 125 int alloc = sizeof (uint32_t) * 2 + length (s) + 1;
126 shstr_alloc -= alloc;
127 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2));
132 } 128 }
133 else 129 else
134 ++i; 130 ++i;
135 } 131 }
136 132
137 curpos = *i; 133 curpos = *i;
138} 134}
139 135
140//TODO: this should of course not be here 136// declare these here to get correct initialisation order
141/* buf_overflow() - we don't want to exceed the buffer size of 137#define def2(id,str) const shstr id (str);
142 * buf1 by adding on buf2! Returns true if overflow will occur. 138#define def(id) def2(shstr_ ## id, # id)
143 */ 139# include "shstrinc.h"
140#undef def
141#undef def2
144 142
145int 143shstr skill_names[NUM_SKILLS];
146buf_overflow (const char *buf1, const char *buf2, int bufsize)
147{
148 int len1 = 0, len2 = 0;
149 144
150 if (buf1)
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