|
|
1 | |
1 | /* |
2 | /* |
2 | * shstr.C |
3 | * shstr.C |
3 | */ |
4 | */ |
4 | |
5 | |
5 | #include <cstring> |
6 | #include <cstring> |
… | |
… | |
10 | #include <tr1/unordered_set> |
11 | #include <tr1/unordered_set> |
11 | |
12 | |
12 | #include "shstr.h" |
13 | #include "shstr.h" |
13 | #include "util.h" |
14 | #include "util.h" |
14 | |
15 | |
15 | typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT; |
16 | typedef |
|
|
17 | std::tr1::unordered_set < const char *, |
|
|
18 | str_hash, |
|
|
19 | str_equal > |
|
|
20 | HT; |
16 | |
21 | |
17 | static HT ht; |
22 | static HT |
|
|
23 | ht; |
18 | |
24 | |
19 | static const char *makevec (const char *s) |
25 | static const char * |
|
|
26 | makevec (const char *s) |
20 | { |
27 | { |
|
|
28 | int |
21 | int len = strlen (s); |
29 | len = strlen (s); |
22 | |
30 | |
|
|
31 | const char * |
23 | const char *v = (const char *)(2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); |
32 | v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + len + 1)); |
24 | |
33 | |
25 | shstr::length (v) = len; |
34 | shstr::length (v) = len; |
26 | shstr::refcnt (v) = 1; |
35 | shstr::refcnt (v) = 1; |
27 | |
36 | |
28 | memcpy ((char *)v, s, len + 1); |
37 | memcpy ((char *) v, s, len + 1); |
29 | |
38 | |
30 | return v; |
39 | return v; |
31 | } |
40 | } |
32 | |
41 | |
|
|
42 | const char * |
33 | const char *shstr::null = makevec ("<nil>"); |
43 | shstr::null = makevec ("<nil>"); |
34 | |
44 | |
35 | // what weird misoptimisation is this again? |
45 | // what weird misoptimisation is this again? |
36 | const shstr undead_name ("undead"); |
46 | const shstr undead_name ("undead"); |
|
|
47 | |
|
|
48 | shstr skill_names[NUM_SKILLS]; |
37 | |
49 | |
38 | const char * |
50 | const char * |
39 | shstr::find (const char *s) |
51 | shstr::find (const char *s) |
40 | { |
52 | { |
41 | if (!s) |
53 | if (!s) |
42 | return s; |
54 | return s; |
43 | |
55 | |
44 | HT::iterator i = ht.find (s); |
56 | HT::iterator i = ht.find (s); |
45 | |
57 | |
46 | return i != ht.end () |
58 | return i != ht.end ()? *i : 0; |
47 | ? *i |
|
|
48 | : 0; |
|
|
49 | } |
59 | } |
50 | |
60 | |
51 | const char * |
61 | const char * |
52 | shstr::intern (const char *s) |
62 | shstr::intern (const char *s) |
53 | { |
63 | { |
… | |
… | |
68 | // periodically test refcounts == 0 for a few strings |
78 | // periodically test refcounts == 0 for a few strings |
69 | // 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. |
70 | void |
80 | void |
71 | shstr::gc () |
81 | shstr::gc () |
72 | { |
82 | { |
|
|
83 | return; //D |
|
|
84 | //D currently disabled: some datastructures might still store them |
|
|
85 | //D but their pointers will become invalidated |
73 | static const char *curpos; |
86 | static const char *curpos; |
74 | |
87 | |
75 | HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); |
88 | HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); |
76 | |
89 | |
77 | if (i == ht.end ()) |
90 | if (i == ht.end ()) |
… | |
… | |
91 | break; |
104 | break; |
92 | else if (!refcnt (*i)) |
105 | else if (!refcnt (*i)) |
93 | { |
106 | { |
94 | HT::iterator o = i++; |
107 | HT::iterator o = i++; |
95 | const char *s = *o; |
108 | const char *s = *o; |
|
|
109 | |
96 | ht.erase (o); |
110 | ht.erase (o); |
97 | |
111 | |
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)); |
112 | //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); |
113 | g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s); |
102 | } |
114 | } |
103 | else |
115 | else |
104 | ++i; |
116 | ++i; |
105 | } |
117 | } |
106 | |
118 | |
107 | curpos = *i; |
119 | curpos = *i; |
108 | } |
120 | } |
109 | |
121 | |
110 | //TODO: this should of course not be here |
122 | //TODO: this should of course not be here |
|
|
123 | |
111 | /* 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 |
112 | * buf1 by adding on buf2! Returns true if overflow will occur. |
125 | * buf1 by adding on buf2! Returns true if overflow will occur. |
113 | */ |
126 | */ |
114 | |
127 | |
115 | int |
128 | int |
116 | buf_overflow (const char *buf1, const char *buf2, int bufsize) |
129 | buf_overflow (const char *buf1, const char *buf2, int bufsize) |
117 | { |
130 | { |
118 | int len1 = 0, len2 = 0; |
131 | int len1 = 0, len2 = 0; |
119 | |
132 | |
120 | if (buf1) |
133 | if (buf1) |
121 | len1 = strlen (buf1); |
134 | len1 = strlen (buf1); |
122 | if (buf2) |
135 | if (buf2) |
123 | len2 = strlen (buf2); |
136 | len2 = strlen (buf2); |
124 | if ((len1 + len2) >= bufsize) |
137 | if ((len1 + len2) >= bufsize) |
125 | return 1; |
|
|
126 | return 0; |
138 | return 1; |
|
|
139 | return 0; |
127 | } |
140 | } |
128 | |
|
|