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

Diff Legend

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