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

Diff Legend

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