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

Diff Legend

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