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.38 by root, Thu Jan 1 21:15:12 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
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation, either version 3 of the License, or
9 * (at your 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 GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 *
19 * The authors can be reached via e-mail to <support@deliantra.net>
20 */
21
1/* 22/*
2 * shstr.C 23 * shstr.C
3 */ 24 */
4 25
5#include <cstring> 26#include <cstring>
6#include <cstdlib> 27#include <cstdlib>
7 28#include <glib.h>
8#include <tr1/unordered_set> 29#include <tr1/unordered_set>
9 30
10#include "shstr.h" 31#include "global.h"
11 32
12struct hash 33size_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 34
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; 35typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
48 36
49static HT ht; 37static HT ht;
38static int next_gc;
50 39
51static const char *makevec (const char *s) 40static const char *
41makevec (const char *s)
52{ 42{
53 int len = strlen (s); 43 int len = strlen (s);
44 int alloc = sizeof (uint32_t) * 2 + len + 1;
54 45
55 const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1)); 46 shstr_alloc += alloc;
47 char *v = (char *)g_slice_alloc (alloc);
48 v += sizeof (uint32_t) * 2;
56 49
57 shstr::length (v) = len; 50 shstr::length (v) = len;
58 shstr::refcnt (v) = 1; 51 shstr::refcnt (v) = 1;
59 52
60 memcpy ((char *)v, s, len + 1); 53 memcpy (v, s, len + 1);
61 54
62 return v; 55 return v;
63} 56}
64 57
65const char *shstr::null = makevec ("<nil>"); 58shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
66
67// what weird misoptimisation is this again?
68const shstr undead_name ("undead");
69 59
70const char * 60const char *
71shstr::find (const char *s) 61shstr::find (const char *s)
72{ 62{
73 if (!s) 63 if (!s)
74 return s; 64 return s;
75 65
76 HT::iterator i = ht.find (s); 66 auto (i, ht.find (s));
77 67
78 return i != ht.end () 68 return i != ht.end ()? *i : 0;
79 ? *i
80 : 0;
81} 69}
82 70
83const char * 71const char *
84shstr::intern (const char *s) 72shstr::intern (const char *s)
85{ 73{
86 if (!s) 74 if (!s)
87 return null; 75 return null ();
88 76
89 if (const char *found = find (s)) 77 if (const char *found = find (s))
90 { 78 {
91 ++refcnt (found); 79 ++refcnt (found);
92 return found; 80 return found;
93 } 81 }
94 82
83 --next_gc;
95 s = makevec (s); 84 s = makevec (s);
96 ht.insert (s); 85 ht.insert (s);
97 return s; 86 return s;
98} 87}
99 88
100// periodically test refcounts == 0 for a few strings 89// periodically test refcounts == 0 for a few strings
101// this is the ONLY thing that erases stuff from ht. keep it that way. 90// this is the ONLY thing that erases stuff from ht. keep it that way.
102void 91void
103shstr::gc () 92shstr::gc ()
104{ 93{
94 if (expect_true (next_gc > 0))
95 return;
96
105 static const char *curpos; 97 static const char *curpos;
106 98
107 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 99 auto (i, curpos ? ht.find (curpos) : ht.begin ());
108 100
109 if (i == ht.end ()) 101 if (i == ht.end ())
110 i = ht.begin (); 102 i = ht.begin ();
111 103
112 // go through all strings roughly once every 4 minutes
113 int n = ht.size () / 256 + 16; 104 int n = ht.size () / 256 + 16;
105 next_gc += n >> 1;
114 106
115 for (;;) 107 for (;;)
116 { 108 {
117 if (i == ht.end ()) 109 if (i == ht.end ())
118 { 110 {
… …
121 } 113 }
122 else if (!--n) 114 else if (!--n)
123 break; 115 break;
124 else if (!refcnt (*i)) 116 else if (!refcnt (*i))
125 { 117 {
126 HT::iterator o = i++; 118 auto (o, i++);
127 const char *s = *o; 119 const char *s = *o;
120
128 ht.erase (o); 121 ht.erase (o);
129 122
130 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 123 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
131 free (-2 + (int *)s); 124 int alloc = sizeof (uint32_t) * 2 + length (s) + 1;
125 shstr_alloc -= alloc;
126 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2));
132 } 127 }
133 else 128 else
134 ++i; 129 ++i;
135 } 130 }
136 131
137 curpos = *i; 132 curpos = *i;
138} 133}
139 134
135// declare these here to get correct initialisation order
136#define def2(id,str) const shstr id (str);
137#define def(id) def2(shstr_ ## id, # id)
138# include "shstrinc.h"
139#undef def
140#undef def2
141
142shstr skill_names[NUM_SKILLS];
143
140//TODO: this should of course not be here 144//TODO: this should of course not be here
145
141/* buf_overflow() - we don't want to exceed the buffer size of 146/* buf_overflow() - we don't want to exceed the buffer size of
142 * buf1 by adding on buf2! Returns true if overflow will occur. 147 * buf1 by adding on buf2! Returns true if overflow will occur.
143 */ 148 */
144
145int 149int
146buf_overflow (const char *buf1, const char *buf2, int bufsize) 150buf_overflow (const char *buf1, const char *buf2, int bufsize)
147{ 151{
148 int len1 = 0, len2 = 0; 152 int len1 = 0, len2 = 0;
149 153
150 if (buf1) 154 if (buf1)
151 len1 = strlen (buf1); 155 len1 = strlen (buf1);
156
152 if (buf2) 157 if (buf2)
153 len2 = strlen (buf2); 158 len2 = strlen (buf2);
159
154 if ((len1 + len2) >= bufsize) 160 if ((len1 + len2) >= bufsize)
155 return 1;
156 return 0; 161 return 1;
162
163 return 0;
157} 164}
158

Diff Legend

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