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.16 by root, Tue Sep 12 00:53:56 2006 UTC

1
1/* 2/*
2 * shstr.C 3 * shstr.C
3 */ 4 */
4 5
5#include <cstring> 6#include <cstring>
6#include <cstdlib> 7#include <cstdlib>
7 8
9#include <glib.h>
10
8#include <tr1/unordered_set> 11#include <tr1/unordered_set>
9 12
10#include "shstr.h" 13#include "global.h"
11 14
12// NOTE: even with lots of stuff loaded, we do not usually have >>20000 strings.
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; 15typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT;
51 16
52static HT ht; 17static HT ht;
18
19static const char *
20makevec (const char *s)
21{
22 int
23 len = strlen (s);
24
25 const char *
26 v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + len + 1));
27
28 shstr::length (v) = len;
29 shstr::refcnt (v) = 1;
30
31 memcpy ((char *) v, s, len + 1);
32
33 return v;
34}
35
36const char *shstr::null = makevec ("<nil>");
53 37
54const char * 38const char *
55shstr::find (const char *s) 39shstr::find (const char *s)
56{ 40{
57 if (!s) 41 if (!s)
58 return s; 42 return s;
59 43
60 HT::iterator i = ht.find (s); 44 HT::iterator i = ht.find (s);
61 45
62 return i != ht.end () 46 return i != ht.end ()? *i : 0;
63 ? *i
64 : 0;
65} 47}
66 48
67const char * 49const char *
68shstr::intern (const char *s) 50shstr::intern (const char *s)
69{ 51{
70 if (!s) 52 if (!s)
71 return s; 53 return null;
72 54
73 if (const char *found = find (s)) 55 if (const char *found = find (s))
74 { 56 {
75 ++refcnt (found); 57 ++refcnt (found);
76 return found; 58 return found;
77 } 59 }
78 60
79 int len = strlen (s); 61 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); 62 ht.insert (s);
89
90 return v; 63 return s;
91} 64}
92 65
93// periodically test refcounts == 0 for a few strings 66// periodically test refcounts == 0 for a few strings
94// this is the ONLY thing that erases stuff from ht. keep it that way. 67// this is the ONLY thing that erases stuff from ht. keep it that way.
95void 68void
96shstr::gc () 69shstr::gc ()
97{ 70{
71return; //D
72//D currently disabled: some datastructures might still store them
73//D but their pointers will become invalidated
98 static const char *curpos; 74 static const char *curpos;
99 75
100 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 76 HT::iterator i = curpos ? ht.find (curpos) : ht.begin ();
101 77
102 if (i == ht.end ()) 78 if (i == ht.end ())
… …
116 break; 92 break;
117 else if (!refcnt (*i)) 93 else if (!refcnt (*i))
118 { 94 {
119 HT::iterator o = i++; 95 HT::iterator o = i++;
120 const char *s = *o; 96 const char *s = *o;
97
121 ht.erase (o); 98 ht.erase (o);
122 99
123 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 100 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
124 free (-2 + (int *)s); 101 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
125 } 102 }
126 else 103 else
127 ++i; 104 ++i;
128 } 105 }
129 106
130 curpos = *i; 107 curpos = *i;
131} 108}
132 109
110shstr skill_names[NUM_SKILLS];
111
112// what weird misoptimisation is this again?
113const shstr undead_name ("undead");
114
133//TODO: this should of course not be here 115//TODO: this should of course not be here
116
134/* buf_overflow() - we don't want to exceed the buffer size of 117/* buf_overflow() - we don't want to exceed the buffer size of
135 * buf1 by adding on buf2! Returns true if overflow will occur. 118 * buf1 by adding on buf2! Returns true if overflow will occur.
136 */ 119 */
137 120
138int 121int
139buf_overflow (const char *buf1, const char *buf2, int bufsize) 122buf_overflow (const char *buf1, const char *buf2, int bufsize)
140{ 123{
141 int len1 = 0, len2 = 0; 124 int len1 = 0, len2 = 0;
142 125
143 if (buf1) 126 if (buf1)
144 len1 = strlen (buf1); 127 len1 = strlen (buf1);
145 if (buf2) 128 if (buf2)
146 len2 = strlen (buf2); 129 len2 = strlen (buf2);
147 if ((len1 + len2) >= bufsize) 130 if ((len1 + len2) >= bufsize)
148 return 1;
149 return 0; 131 return 1;
132 return 0;
150} 133}
151

Diff Legend

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