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.3 by root, Sun Sep 3 00:18:40 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;
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>");
50 37
51const char * 38const char *
52shstr::find (const char *s) 39shstr::find (const char *s)
53{ 40{
41 if (!s)
42 return s;
43
54 HT::iterator i = ht.find (s); 44 HT::iterator i = ht.find (s);
55 45
56 return i != ht.end () 46 return i != ht.end ()? *i : 0;
57 ? (char *)*i
58 : 0;
59} 47}
60 48
61const char * 49const char *
62shstr::intern (const char *s) 50shstr::intern (const char *s)
63{ 51{
64 HT::iterator i = ht.find (s); 52 if (!s)
53 return null;
65 54
66 if (i != ht.end ()) 55 if (const char *found = find (s))
67 return (char *)*i; 56 {
57 ++refcnt (found);
58 return found;
59 }
68 60
69 int len = strlen (s); 61 s = makevec (s);
70
71 int *v = (int *)malloc (sizeof (int) * 2 + len + 1);
72
73 v [0] = len;
74 v [1] = 0;
75
76 v += 2;
77
78 memcpy (v, s, len + 1);
79
80 ht.insert ((char *)v); 62 ht.insert (s);
81 63 return s;
82 return (char *)v;
83} 64}
84 65
85// TODO: periodically test refcounts == 0 for a few strings (e.g. one hash bucket, 66// periodically test refcounts == 0 for a few strings
86// exploiting the fatc that iterators stay valid for unordered_set). 67// this is the ONLY thing that erases stuff from ht. keep it that way.
87void 68void
88shstr::gc () 69shstr::gc ()
89{ 70{
71return; //D
72//D currently disabled: some datastructures might still store them
73//D but their pointers will become invalidated
74 static const char *curpos;
75
76 HT::iterator i = curpos ? ht.find (curpos) : ht.begin ();
77
78 if (i == ht.end ())
79 i = ht.begin ();
80
81 // go through all strings roughly once every 4 minutes
82 int n = ht.size () / 256 + 16;
83
84 for (;;)
85 {
86 if (i == ht.end ())
87 {
88 curpos = 0;
89 return;
90 }
91 else if (!--n)
92 break;
93 else if (!refcnt (*i))
94 {
95 HT::iterator o = i++;
96 const char *s = *o;
97
98 ht.erase (o);
99
100 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
101 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
102 }
103 else
104 ++i;
105 }
106
107 curpos = *i;
90} 108}
109
110shstr skill_names[NUM_SKILLS];
111
112// what weird misoptimisation is this again?
113const shstr undead_name ("undead");
114
115//TODO: this should of course not be here
91 116
92/* 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
93 * buf1 by adding on buf2! Returns true if overflow will occur. 118 * buf1 by adding on buf2! Returns true if overflow will occur.
94 */ 119 */
95 120
96int 121int
97buf_overflow (const char *buf1, const char *buf2, int bufsize) 122buf_overflow (const char *buf1, const char *buf2, int bufsize)
98{ 123{
99 int len1 = 0, len2 = 0; 124 int len1 = 0, len2 = 0;
100 125
101 if (buf1) 126 if (buf1)
102 len1 = strlen (buf1); 127 len1 = strlen (buf1);
103 if (buf2) 128 if (buf2)
104 len2 = strlen (buf2); 129 len2 = strlen (buf2);
105 if ((len1 + len2) >= bufsize) 130 if ((len1 + len2) >= bufsize)
106 return 1;
107 return 0; 131 return 1;
132 return 0;
108} 133}
109

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines