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.10 by root, Tue Sep 5 19:18:04 2006 UTC

3 */ 3 */
4 4
5#include <cstring> 5#include <cstring>
6#include <cstdlib> 6#include <cstdlib>
7 7
8#include <glib.h>
9
8#include <tr1/unordered_set> 10#include <tr1/unordered_set>
9 11
10#include "shstr.h" 12#include "shstr.h"
13#include "util.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 *makevec (const char *s)
20{
21 int len = strlen (s);
22
23 const char *v = (const char *)(2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
24
25 shstr::length (v) = len;
26 shstr::refcnt (v) = 1;
27
28 memcpy ((char *)v, s, len + 1);
29
30 return v;
31}
32
33const char *shstr::null = makevec ("<nil>");
34
35// what weird misoptimisation is this again?
36const shstr undead_name ("undead");
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 ()
57 ? (char *)*i 47 ? *i
58 : 0; 48 : 0;
59} 49}
60 50
61const char * 51const char *
62shstr::intern (const char *s) 52shstr::intern (const char *s)
63{ 53{
64 HT::iterator i = ht.find (s); 54 if (!s)
55 return null;
65 56
66 if (i != ht.end ()) 57 if (const char *found = find (s))
67 return (char *)*i; 58 {
59 ++refcnt (found);
60 return found;
61 }
68 62
69 int len = strlen (s); 63 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); 64 ht.insert (s);
81 65 return s;
82 return (char *)v;
83} 66}
84 67
85// TODO: periodically test refcounts == 0 for a few strings (e.g. one hash bucket, 68// periodically test refcounts == 0 for a few strings
86// exploiting the fatc that iterators stay valid for unordered_set). 69// this is the ONLY thing that erases stuff from ht. keep it that way.
87void 70void
88shstr::gc () 71shstr::gc ()
89{ 72{
73 static const char *curpos;
74
75 HT::iterator i = curpos ? ht.find (curpos) : ht.begin ();
76
77 if (i == ht.end ())
78 i = ht.begin ();
79
80 // go through all strings roughly once every 4 minutes
81 int n = ht.size () / 256 + 16000;
82
83 for (;;)
84 {
85 if (i == ht.end ())
86 {
87 curpos = 0;
88 return;
89 }
90 else if (!--n)
91 break;
92 else if (!refcnt (*i))
93 {
94 HT::iterator o = i++;
95 const char *s = *o;
96 ht.erase (o);
97
98 int len = length (s);
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}
91 109
110//TODO: this should of course not be here
92/* buf_overflow() - we don't want to exceed the buffer size of 111/* buf_overflow() - we don't want to exceed the buffer size of
93 * buf1 by adding on buf2! Returns true if overflow will occur. 112 * buf1 by adding on buf2! Returns true if overflow will occur.
94 */ 113 */
95 114
96int 115int

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines