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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines