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.1 by elmex, Sun Aug 13 17:16:01 2006 UTC vs.
Revision 1.20 by root, Thu Sep 14 18:13:01 2006 UTC

1/* 1/*
2 * static char *rcsid_shstr_c =
3 * "$Id: shstr.C,v 1.1 2006/08/13 17:16:01 elmex Exp $";
4 *
5 * shstr.c 2 * shstr.C
6 *
7 * This is a simple shared strings package with a simple interface.
8 *
9 * char *find_string(const char *str)
10 * char *add_string(const char *str)
11 * char *add_refcount(char *str)
12 * void free_string(char *str)
13 * char *ss_dump_table(int what)
14 * void ss_dump_statistics()
15 *
16 * Author: Kjetil T. Homme, Oslo 1992.
17 */ 3 */
18 4
19#include <stdio.h>
20#include <stddef.h>
21#include <stdlib.h>
22#include <sys/types.h>
23#include <limits.h>
24#include <string.h> 5#include <cstring>
6#include <cstdlib>
25 7
26#if defined (__sun__) && defined (StupidSunHeaders) 8#include <glib.h>
27#include <sys/time.h>
28#include "sunos.h"
29#endif
30 9
31#include "shstr.h" 10#include <tr1/unordered_set>
32 11
33#ifndef WIN32 12#include "global.h"
34#include <autoconf.h>
35#endif
36#ifdef HAVE_LIBDMALLOC
37#include <dmalloc.h>
38#endif
39 13
40static shared_string *hash_table[TABLESIZE]; 14typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
41 15
42/* 16static HT ht;
43 * Initialises the hash-table used by the shared string library.
44 */
45 17
46void 18static const char *
47init_hash_table(void) { 19makevec (const char *s)
48 /* A static object should be zeroed out always */ 20{
49#if !defined(__STDC__) 21 int len = strlen (s);
50 (void) memset((void *)hash_table, 0, TABLESIZE * sizeof(shared_string *)); 22
51#endif 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;
52} 31}
53 32
54/* 33static const char *
55 * Hashing-function used by the shared string library. 34makenull ()
56 */ 35{
57 36 const char *s = makevec ("(null)");
58static int 37 shstr::length (s) = 0;
59hashstr(const char *str) { 38 return s;
60 unsigned long hash = 0;
61 int i = 0;
62 unsigned rot = 0;
63 const char *p;
64
65 GATHER(hash_stats.calls);
66
67 for (p = str; i < MAXSTRING && *p; p++, i++) {
68 hash ^= (unsigned long) *p << rot;
69 rot += 2;
70 if (rot >= (sizeof(long) - sizeof(char)) * CHAR_BIT)
71 rot = 0;
72 }
73 return (hash % TABLESIZE);
74} 39}
75 40
76/* 41const char *shstr::null = makenull ();
77 * Allocates and initialises a new shared_string structure, containing
78 * the string str.
79 */
80 42
81static shared_string * 43const char *
82new_shared_string(const char *str) { 44shstr::find (const char *s)
83 shared_string *ss; 45{
46 if (!s)
47 return s;
84 48
85 /* Allocate room for a struct which can hold str. Note 49 AUTODECL (i, ht.find (s));
86 * that some bytes for the string are already allocated in the
87 * shared_string struct.
88 */
89 ss = (shared_string *) malloc(sizeof(shared_string) - PADDING +
90 strlen(str) + 1);
91 ss->u.previous = NULL;
92 ss->next = NULL;
93 ss->refcount = 1;
94 strcpy(ss->string, str);
95 50
96 return ss; 51 return i != ht.end ()? *i : 0;
97} 52}
98 53
99/* 54const char *
100 * Description: 55shstr::intern (const char *s)
101 * This will add 'str' to the hash table. If there's no entry for this 56{
102 * string, a copy will be allocated, and a pointer to that is returned. 57 if (!s)
103 * Return values: 58 return null;
104 * - pointer to string identical to str
105 */
106 59
107const char * 60 if (const char *found = find (s))
108add_string(const char *str) { 61 {
109 shared_string *ss; 62 ++refcnt (found);
110 int ind; 63 return found;
111
112 GATHER(add_stats.calls);
113
114 /* Should really core dump here, since functions should not be calling
115 * add_string with a null parameter. But this will prevent a few
116 * core dumps.
117 */
118 if (str==NULL) {
119#ifdef MANY_CORES
120 abort();
121#else
122 return NULL;
123#endif
124 } 64 }
125 65
126 ind = hashstr(str); 66 s = makevec (s);
127 ss = hash_table[ind]; 67 ht.insert (s);
128 68 return s;
129 /* Is there an entry for that hash?
130 */
131 if (ss) {
132 /* Simple case first: See if the first pointer matches.
133 */
134 if (str != ss->string) {
135 GATHER(add_stats.strcmps);
136 if (strcmp(ss->string, str)) {
137 /* Apparantly, a string with the same hash value has this
138 * slot. We must see in the list if "str" has been
139 * registered earlier.
140 */
141 while (ss->next) {
142 GATHER(add_stats.search);
143 ss = ss->next;
144 if (ss->string != str) {
145 GATHER(add_stats.strcmps);
146 if (strcmp(ss->string, str)) {
147 /* This wasn't the right string...
148 */
149 continue;
150 }
151 }
152 /* We found an entry for this string. Fix the
153 * refcount and exit.
154 */
155 GATHER(add_stats.linked);
156 ++(ss->refcount);
157
158 return ss->string;
159 }
160 /* There are no occurences of this string in the hash table.
161 */
162 {
163 shared_string *new_ss;
164
165 GATHER(add_stats.linked);
166 new_ss = new_shared_string(str);
167 ss->next = new_ss;
168 new_ss->u.previous = ss;
169 return new_ss->string;
170 }
171 }
172 /* Fall through.
173 */
174 }
175 GATHER(add_stats.hashed);
176 ++(ss->refcount);
177 return ss->string;
178 } else {
179 /* The string isn't registered, and the slot is empty.
180 */
181 GATHER(add_stats.hashed);
182 hash_table[ind] = new_shared_string(str);
183
184 /* One bit in refcount is used to keep track of the union.
185 */
186 hash_table[ind]->refcount |= TOPBIT;
187 hash_table[ind]->u.array = &(hash_table[ind]);
188
189 return hash_table[ind]->string;
190 }
191} 69}
192 70
193/* 71// periodically test refcounts == 0 for a few strings
194 * Description: 72// this is the ONLY thing that erases stuff from ht. keep it that way.
195 * This will increase the refcount of the string str, which *must* 73void
196 * have been returned from a previous add_string(). 74shstr::gc ()
197 * Return values: 75{
198 * - str 76 static const char *curpos;
199 */
200 77
201const char * 78 AUTODECL (i, curpos ? ht.find (curpos) : ht.begin ());
202add_refcount(const char *str) { 79
203 GATHER(add_ref_stats.calls); 80 if (i == ht.end ())
204 ++(SS(str)->refcount); 81 i = ht.begin ();
205 /* This function should be declared 82
206 * const char *add_refcount(const char *) 83 // go through all strings roughly once every 4 minutes
207 * Unfortunately, that would require changing a lot of structs 84 int n = ht.size () / 256 + 16;
208 * 85
209 * Yup, many changes, but may have make some bugs more visible :) 86 for (;;)
210 * -- Ryo 2005-08-12 87 {
211 */ 88 if (i == ht.end ())
212 return (char*)str; 89 {
90 curpos = 0;
91 return;
92 }
93 else if (!--n)
94 break;
95 else if (!refcnt (*i))
96 {
97 AUTODECL (o, i++);
98 const char *s = *o;
99
100 ht.erase (o);
101
102 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
103 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
104 }
105 else
106 ++i;
107 }
108
109 curpos = *i;
213} 110}
214 111
215/* 112shstr skill_names[NUM_SKILLS];
216 * Description:
217 * This will return the refcount of the string str, which *must*
218 * have been returned from a previous add_string().
219 * Return values:
220 * - length
221 */
222 113
223int 114// what weird misoptimisation is this again?
224query_refcount(const char *str) { 115const shstr undead_name ("undead");
225 return (SS(str)->refcount) & ~TOPBIT;
226}
227 116
228/* 117//TODO: this should of course not be here
229 * Description:
230 * This will see if str is in the hash table, and return the address
231 * of that string if it exists.
232 * Return values:
233 * - pointer to identical string or NULL
234 */
235
236const char *
237find_string(const char *str) {
238 shared_string *ss;
239 int ind;
240
241 GATHER(find_stats.calls);
242
243 ind = hashstr(str);
244 ss = hash_table[ind];
245
246 /* Is there an entry for that hash?
247 */
248 if (ss) {
249 /* Simple case first: Is the first string the right one?
250 */
251 GATHER(find_stats.strcmps);
252 if (!strcmp(ss->string, str)) {
253 GATHER(find_stats.hashed);
254 return ss->string;
255 } else {
256 /* Recurse through the linked list, if there's one.
257 */
258 while (ss->next) {
259 GATHER(find_stats.search);
260 GATHER(find_stats.strcmps);
261 ss = ss->next;
262 if (!strcmp(ss->string, str)) {
263 GATHER(find_stats.linked);
264 return ss->string;
265 }
266 }
267 /* No match. Fall through.
268 */
269 }
270 }
271 return NULL;
272}
273
274/*
275 * Description:
276 * This will reduce the refcount, and if it has reached 0, str will
277 * be freed.
278 * Return values:
279 * None
280 */
281
282void
283free_string(const char *str) {
284 shared_string *ss;
285
286 GATHER(free_stats.calls);
287
288 ss = SS(str);
289
290 if ((--ss->refcount & ~TOPBIT) == 0) {
291 /* Remove this entry.
292 */
293 if (ss->refcount & TOPBIT) {
294 /* We must put a new value into the hash_table[].
295 */
296 if (ss->next) {
297 *(ss->u.array) = ss->next;
298 ss->next->u.array = ss->u.array;
299 ss->next->refcount |= TOPBIT;
300 } else {
301 *(ss->u.array) = NULL;
302 }
303 free(ss);
304 } else {
305 /* Relink and free this struct.
306 */
307 if (ss->next)
308 ss->next->u.previous = ss->u.previous;
309 ss->u.previous->next = ss->next;
310 free(ss);
311 }
312 }
313}
314
315#ifdef SS_STATISTICS
316
317extern char errmsg[];
318
319/*
320 * Description:
321 * The routines will gather statistics if SS_STATISTICS is defined.
322 * A call to this function will cause the statistics to be dumped
323 * into an external string errmsg, which must be large.
324 * Return values:
325 * None
326 */
327
328void
329ss_dump_statistics(void) {
330 static char line[80];
331
332 sprintf(errmsg, "%-13s %6s %6s %6s %6s %6s\n",
333 "", "calls", "hashed", "strcmp", "search", "linked");
334 sprintf(line, "%-13s %6d %6d %6d %6d %6d\n",
335 "add_string:", add_stats.calls, add_stats.hashed,
336 add_stats.strcmps, add_stats.search, add_stats.linked);
337 strcat(errmsg, line);
338 sprintf(line, "%-13s %6d\n",
339 "add_refcount:", add_ref_stats.calls);
340 strcat(errmsg, line);
341 sprintf(line, "%-13s %6d\n",
342 "free_string:", free_stats.calls);
343 strcat(errmsg, line);
344 sprintf(line, "%-13s %6d %6d %6d %6d %6d\n",
345 "find_string:", find_stats.calls, find_stats.hashed,
346 find_stats.strcmps, find_stats.search, find_stats.linked);
347 strcat(errmsg, line);
348 sprintf(line, "%-13s %6d\n",
349 "hashstr:", hash_stats.calls);
350 strcat(errmsg, line);
351}
352#endif /* SS_STATISTICS */
353
354/*
355 * Description:
356 * If (what & SS_DUMP_TABLE) dump the contents of the hash table to
357 * stderr. If (what & SS_DUMP_TOTALS) return a string which
358 * says how many entries etc. there are in the table.
359 * Return values:
360 * - a string or NULL
361 */
362
363const char *
364ss_dump_table(int what) {
365 static char totals[80];
366 int entries = 0, refs = 0, links = 0;
367 int i;
368
369 for (i = 0; i < TABLESIZE; i++) {
370 shared_string *ss;
371
372 if ((ss = hash_table[i])!=NULL) {
373 ++entries;
374 refs += (ss->refcount & ~TOPBIT);
375#if 1 /* Can't use stderr any longer, need to include global.h and
376 if (what & SS_DUMP_TABLE)
377 * use logfile. */
378 fprintf(stderr, "%4d -- %4d refs '%s' %c\n",
379 i, (ss->refcount & ~TOPBIT), ss->string,
380 (ss->refcount & TOPBIT ? ' ' : '#'));
381#endif
382 while (ss->next) {
383 ss = ss->next;
384 ++links;
385 refs += (ss->refcount & ~TOPBIT);
386#if 1
387 if (what & SS_DUMP_TABLE)
388 fprintf(stderr, " -- %4d refs '%s' %c\n",
389 (ss->refcount & ~TOPBIT), ss->string,
390 (ss->refcount & TOPBIT ? '*' : ' '));
391#endif
392 }
393 }
394 }
395
396 if (what & SS_DUMP_TOTALS) {
397 sprintf(totals, "\n%d entries, %d refs, %d links.",
398 entries, refs, links);
399 return totals;
400 }
401 return NULL;
402}
403 118
404/* buf_overflow() - we don't want to exceed the buffer size of 119/* buf_overflow() - we don't want to exceed the buffer size of
405 * buf1 by adding on buf2! Returns true if overflow will occur. 120 * buf1 by adding on buf2! Returns true if overflow will occur.
406 */ 121 */
407 122
408int 123int
409buf_overflow (const char *buf1, const char *buf2, int bufsize) 124buf_overflow (const char *buf1, const char *buf2, int bufsize)
410{ 125{
411 int len1 = 0, len2 = 0; 126 int len1 = 0, len2 = 0;
412 127
413 if (buf1) 128 if (buf1)
414 len1 = strlen (buf1); 129 len1 = strlen (buf1);
415 if (buf2) 130 if (buf2)
416 len2 = strlen (buf2); 131 len2 = strlen (buf2);
417 if ((len1 + len2) >= bufsize) 132 if ((len1 + len2) >= bufsize)
418 return 1;
419 return 0; 133 return 1;
134 return 0;
420} 135}
421

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines