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.7 by root, Sun Sep 3 23:33:00 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
12struct hash
13{
14 std::size_t operator ()(const char *s) const
15 {
16 unsigned long hash = 0;
17 unsigned int i = 0;
18
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; 15typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT;
48 16
49static HT ht; 17static HT ht;
50 18
51static const char *makevec (const char *s) 19static const char *
20makevec (const char *s)
52{ 21{
22 int
53 int len = strlen (s); 23 len = strlen (s);
54 24
25 const char *
55 const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1)); 26 v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + len + 1));
56 27
57 shstr::length (v) = len; 28 shstr::length (v) = len;
58 shstr::refcnt (v) = 1; 29 shstr::refcnt (v) = 1;
59 30
60 memcpy ((char *)v, s, len + 1); 31 memcpy ((char *) v, s, len + 1);
61 32
62 return s; 33 return v;
63} 34}
64 35
65const char *shstr::null = makevec ("<nil>"); 36const char *shstr::null = makevec ("<nil>");
66 37
67const char * 38const char *
… …
70 if (!s) 41 if (!s)
71 return s; 42 return s;
72 43
73 HT::iterator i = ht.find (s); 44 HT::iterator i = ht.find (s);
74 45
75 return i != ht.end () 46 return i != ht.end ()? *i : 0;
76 ? *i
77 : 0;
78} 47}
79 48
80const char * 49const char *
81shstr::intern (const char *s) 50shstr::intern (const char *s)
82{ 51{
… …
97// periodically test refcounts == 0 for a few strings 66// periodically test refcounts == 0 for a few strings
98// 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.
99void 68void
100shstr::gc () 69shstr::gc ()
101{ 70{
71return; //D
72//D currently disabled: some datastructures might still store them
73//D but their pointers will become invalidated
102 static const char *curpos; 74 static const char *curpos;
103 75
104 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 76 HT::iterator i = curpos ? ht.find (curpos) : ht.begin ();
105 77
106 if (i == ht.end ()) 78 if (i == ht.end ())
… …
120 break; 92 break;
121 else if (!refcnt (*i)) 93 else if (!refcnt (*i))
122 { 94 {
123 HT::iterator o = i++; 95 HT::iterator o = i++;
124 const char *s = *o; 96 const char *s = *o;
97
125 ht.erase (o); 98 ht.erase (o);
126 99
127 //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));
128 free (-2 + (int *)s); 101 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
129 } 102 }
130 else 103 else
131 ++i; 104 ++i;
132 } 105 }
133 106
134 curpos = *i; 107 curpos = *i;
135} 108}
136 109
110shstr skill_names[NUM_SKILLS];
111
112// what weird misoptimisation is this again?
113const shstr undead_name ("undead");
114
137//TODO: this should of course not be here 115//TODO: this should of course not be here
116
138/* 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
139 * buf1 by adding on buf2! Returns true if overflow will occur. 118 * buf1 by adding on buf2! Returns true if overflow will occur.
140 */ 119 */
141 120
142int 121int
143buf_overflow (const char *buf1, const char *buf2, int bufsize) 122buf_overflow (const char *buf1, const char *buf2, int bufsize)
144{ 123{
145 int len1 = 0, len2 = 0; 124 int len1 = 0, len2 = 0;
146 125
147 if (buf1) 126 if (buf1)
148 len1 = strlen (buf1); 127 len1 = strlen (buf1);
149 if (buf2) 128 if (buf2)
150 len2 = strlen (buf2); 129 len2 = strlen (buf2);
151 if ((len1 + len2) >= bufsize) 130 if ((len1 + len2) >= bufsize)
152 return 1;
153 return 0; 131 return 1;
132 return 0;
154} 133}
155

Diff Legend

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