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.6 by root, Sun Sep 3 11:37:25 2006 UTC vs.
Revision 1.23 by root, Mon May 28 21:21:40 2007 UTC

1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 *
6 * Crossfire TRT is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the Free
8 * Software Foundation; either version 2 of the License, or (at your option)
9 * any later version.
10 *
11 * This program is distributed in the hope that it will be useful, but
12 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
13 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14 * for more details.
15 *
16 * You should have received a copy of the GNU General Public License along
17 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
18 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 *
20 * The authors can be reached via e-mail to <crossfire@schmorp.de>
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
12// NOTE: even with lots of stuff loaded, we do not usually have >>20000 strings. 34typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
13// maybe refcounting is just overhead?
14
15struct hash
16{
17 std::size_t operator ()(const char *s) const
18 {
19 unsigned long hash = 0;
20 unsigned int i = 0;
21
22 /* use the one-at-a-time hash function, which supposedly is
23 * better than the djb2-like one used by perl5.005, but
24 * certainly is better then the bug used here before.
25 * see http://burtleburtle.net/bob/hash/doobs.html
26 */
27 while (*s)
28 {
29 hash += *s++;
30 hash += hash << 10;
31 hash ^= hash >> 6;
32 }
33
34 hash += hash << 3;
35 hash ^= hash >> 11;
36 hash += hash << 15;
37
38 return hash;
39 }
40};
41
42struct equal
43{
44 bool operator ()(const char *a, const char *b) const
45 {
46 return !strcmp (a, b);
47 }
48};
49
50typedef std::tr1::unordered_set<const char *, hash, equal> HT;
51 35
52static HT ht; 36static HT ht;
37
38static const char *
39makevec (const char *s)
40{
41 int len = strlen (s);
42
43 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
44
45 shstr::length (v) = len;
46 shstr::refcnt (v) = 1;
47
48 memcpy ((char *) v, s, len + 1);
49
50 return v;
51}
52
53static const char *
54makenull ()
55{
56 const char *s = makevec ("(null)");
57 shstr::length (s) = 0;
58 return s;
59}
60
61const char *shstr::null = makenull ();
53 62
54const char * 63const char *
55shstr::find (const char *s) 64shstr::find (const char *s)
56{ 65{
57 if (!s) 66 if (!s)
58 return s; 67 return s;
59 68
60 HT::iterator i = ht.find (s); 69 auto (i, ht.find (s));
61 70
62 return i != ht.end () 71 return i != ht.end ()? *i : 0;
63 ? *i
64 : 0;
65} 72}
66 73
67const char * 74const char *
68shstr::intern (const char *s) 75shstr::intern (const char *s)
69{ 76{
70 if (!s) 77 if (!s)
71 return s; 78 return null;
72 79
73 if (const char *found = find (s)) 80 if (const char *found = find (s))
74 { 81 {
75 ++refcnt (found); 82 ++refcnt (found);
76 return found; 83 return found;
77 } 84 }
78 85
79 int len = strlen (s); 86 s = makevec (s);
80
81 const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1));
82
83 length (v) = len;
84 refcnt (v) = 1;
85
86 memcpy ((char *)v, s, len + 1);
87
88 ht.insert (v); 87 ht.insert (s);
89
90 return v; 88 return s;
91} 89}
92 90
93// periodically test refcounts == 0 for a few strings 91// periodically test refcounts == 0 for a few strings
94// this is the ONLY thing that erases stuff from ht. keep it that way. 92// this is the ONLY thing that erases stuff from ht. keep it that way.
95void 93void
96shstr::gc () 94shstr::gc ()
97{ 95{
98 static const char *curpos; 96 static const char *curpos;
99 97
100 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 98 auto (i, curpos ? ht.find (curpos) : ht.begin ());
101 99
102 if (i == ht.end ()) 100 if (i == ht.end ())
103 i = ht.begin (); 101 i = ht.begin ();
104 102
105 // go through all strings roughly once every 4 minutes 103 // go through all strings roughly once every 4 minutes
… …
114 } 112 }
115 else if (!--n) 113 else if (!--n)
116 break; 114 break;
117 else if (!refcnt (*i)) 115 else if (!refcnt (*i))
118 { 116 {
119 HT::iterator o = i++; 117 auto (o, i++);
120 const char *s = *o; 118 const char *s = *o;
119
121 ht.erase (o); 120 ht.erase (o);
122 121
123 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 122 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
124 free (-2 + (int *)s); 123 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
125 } 124 }
126 else 125 else
127 ++i; 126 ++i;
128 } 127 }
129 128
130 curpos = *i; 129 curpos = *i;
131} 130}
132 131
132shstr skill_names[NUM_SKILLS];
133
134// what weird misoptimisation is this again?
135const shstr undead_name ("undead");
136
133//TODO: this should of course not be here 137//TODO: this should of course not be here
138
134/* buf_overflow() - we don't want to exceed the buffer size of 139/* buf_overflow() - we don't want to exceed the buffer size of
135 * buf1 by adding on buf2! Returns true if overflow will occur. 140 * buf1 by adding on buf2! Returns true if overflow will occur.
136 */ 141 */
137
138int 142int
139buf_overflow (const char *buf1, const char *buf2, int bufsize) 143buf_overflow (const char *buf1, const char *buf2, int bufsize)
140{ 144{
141 int len1 = 0, len2 = 0; 145 int len1 = 0, len2 = 0;
142 146
143 if (buf1) 147 if (buf1)
144 len1 = strlen (buf1); 148 len1 = strlen (buf1);
145 if (buf2) 149 if (buf2)
146 len2 = strlen (buf2); 150 len2 = strlen (buf2);
147 if ((len1 + len2) >= bufsize) 151 if ((len1 + len2) >= bufsize)
148 return 1;
149 return 0; 152 return 1;
153
154 return 0;
150} 155}
151

Diff Legend

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