|
|
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 | |
12 | struct 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 | |
|
|
39 | struct equal |
|
|
40 | { |
|
|
41 | bool operator ()(const char *a, const char *b) const |
|
|
42 | { |
|
|
43 | return !strcmp (a, b); |
|
|
44 | } |
|
|
45 | }; |
|
|
46 | |
|
|
47 | typedef std::tr1::unordered_set<const char *, hash, equal> HT; |
15 | typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT; |
48 | |
16 | |
49 | static HT ht; |
17 | static HT ht; |
50 | |
18 | |
51 | static const char *makevec (const char *s) |
19 | static const char * |
|
|
20 | makevec (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 | |
62 | return v; |
31 | return v; |
63 | } |
32 | } |
64 | |
33 | |
|
|
34 | static const char * |
|
|
35 | makenull () |
|
|
36 | { |
65 | const char *shstr::null = makevec ("<nil>"); |
37 | const char *s = makevec ("(null)"); |
|
|
38 | shstr::length (s) = 0; |
|
|
39 | return s; |
|
|
40 | } |
66 | |
41 | |
67 | // what weird misoptimisation is this again? |
42 | const char *shstr::null = makenull (); |
68 | const shstr undead_name ("undead"); |
|
|
69 | |
43 | |
70 | const char * |
44 | const char * |
71 | shstr::find (const char *s) |
45 | shstr::find (const char *s) |
72 | { |
46 | { |
73 | if (!s) |
47 | if (!s) |
74 | return s; |
48 | return s; |
75 | |
49 | |
76 | HT::iterator i = ht.find (s); |
50 | HT::iterator i = ht.find (s); |
77 | |
51 | |
78 | return i != ht.end () |
52 | return i != ht.end ()? *i : 0; |
79 | ? *i |
|
|
80 | : 0; |
|
|
81 | } |
53 | } |
82 | |
54 | |
83 | const char * |
55 | const char * |
84 | shstr::intern (const char *s) |
56 | shstr::intern (const char *s) |
85 | { |
57 | { |
… | |
… | |
100 | // periodically test refcounts == 0 for a few strings |
72 | // periodically test refcounts == 0 for a few strings |
101 | // 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. |
102 | void |
74 | void |
103 | shstr::gc () |
75 | shstr::gc () |
104 | { |
76 | { |
|
|
77 | return; //D |
|
|
78 | //D currently disabled: some datastructures might still store them |
|
|
79 | //D but their pointers will become invalidated |
105 | static const char *curpos; |
80 | static const char *curpos; |
106 | |
81 | |
107 | HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); |
82 | HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); |
108 | |
83 | |
109 | if (i == ht.end ()) |
84 | if (i == ht.end ()) |
… | |
… | |
123 | break; |
98 | break; |
124 | else if (!refcnt (*i)) |
99 | else if (!refcnt (*i)) |
125 | { |
100 | { |
126 | HT::iterator o = i++; |
101 | HT::iterator o = i++; |
127 | const char *s = *o; |
102 | const char *s = *o; |
|
|
103 | |
128 | ht.erase (o); |
104 | ht.erase (o); |
129 | |
105 | |
130 | //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)); |
131 | free (-2 + (int *)s); |
107 | g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s); |
132 | } |
108 | } |
133 | else |
109 | else |
134 | ++i; |
110 | ++i; |
135 | } |
111 | } |
136 | |
112 | |
137 | curpos = *i; |
113 | curpos = *i; |
138 | } |
114 | } |
139 | |
115 | |
|
|
116 | shstr skill_names[NUM_SKILLS]; |
|
|
117 | |
|
|
118 | // what weird misoptimisation is this again? |
|
|
119 | const shstr undead_name ("undead"); |
|
|
120 | |
140 | //TODO: this should of course not be here |
121 | //TODO: this should of course not be here |
|
|
122 | |
141 | /* 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 |
142 | * buf1 by adding on buf2! Returns true if overflow will occur. |
124 | * buf1 by adding on buf2! Returns true if overflow will occur. |
143 | */ |
125 | */ |
144 | |
126 | |
145 | int |
127 | int |
146 | buf_overflow (const char *buf1, const char *buf2, int bufsize) |
128 | buf_overflow (const char *buf1, const char *buf2, int bufsize) |
147 | { |
129 | { |
148 | int len1 = 0, len2 = 0; |
130 | int len1 = 0, len2 = 0; |
149 | |
131 | |
150 | if (buf1) |
132 | if (buf1) |
151 | len1 = strlen (buf1); |
133 | len1 = strlen (buf1); |
152 | if (buf2) |
134 | if (buf2) |
153 | len2 = strlen (buf2); |
135 | len2 = strlen (buf2); |
154 | if ((len1 + len2) >= bufsize) |
136 | if ((len1 + len2) >= bufsize) |
155 | return 1; |
|
|
156 | return 0; |
137 | return 1; |
|
|
138 | return 0; |
157 | } |
139 | } |
158 | |
|
|