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.24 by root, Sun Jul 1 05:00:18 2007 UTC

1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 *
6 * Crossfire TRT is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation, either version 3 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 *
19 * The authors can be reached via e-mail to <crossfire@schmorp.de>
20 */
21
1/* 22/*
2 * shstr.C 23 * shstr.C
3 */ 24 */
4 25
5#include <cstring> 26#include <cstring>
6#include <cstdlib> 27#include <cstdlib>
7 28#include <glib.h>
8#include <tr1/unordered_set> 29#include <tr1/unordered_set>
9 30
10#include "shstr.h" 31#include "global.h"
11 32
12struct hash 33typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
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;
48 34
49static HT ht; 35static HT ht;
36
37static const char *
38makevec (const char *s)
39{
40 int len = strlen (s);
41
42 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
43
44 shstr::length (v) = len;
45 shstr::refcnt (v) = 1;
46
47 memcpy ((char *) v, s, len + 1);
48
49 return v;
50}
51
52static const char *
53makenull ()
54{
55 const char *s = makevec ("(null)");
56 shstr::length (s) = 0;
57 return s;
58}
59
60const char *shstr::null = makenull ();
50 61
51const char * 62const char *
52shstr::find (const char *s) 63shstr::find (const char *s)
53{ 64{
54 HT::iterator i = ht.find (s); 65 if (!s)
66 return s;
55 67
68 auto (i, ht.find (s));
69
56 return i != ht.end () 70 return i != ht.end ()? *i : 0;
57 ? (char *)*i
58 : 0;
59} 71}
60 72
61const char * 73const char *
62shstr::intern (const char *s) 74shstr::intern (const char *s)
63{ 75{
64 HT::iterator i = ht.find (s); 76 if (!s)
77 return null;
65 78
66 if (i != ht.end ()) 79 if (const char *found = find (s))
67 return (char *)*i; 80 {
81 ++refcnt (found);
82 return found;
83 }
68 84
69 int len = strlen (s); 85 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); 86 ht.insert (s);
81 87 return s;
82 return (char *)v;
83} 88}
84 89
85// TODO: periodically test refcounts == 0 for a few strings (e.g. one hash bucket, 90// periodically test refcounts == 0 for a few strings
86// exploiting the fatc that iterators stay valid for unordered_set). 91// this is the ONLY thing that erases stuff from ht. keep it that way.
87void 92void
88shstr::gc () 93shstr::gc ()
89{ 94{
95 static const char *curpos;
96
97 auto (i, curpos ? ht.find (curpos) : ht.begin ());
98
99 if (i == ht.end ())
100 i = ht.begin ();
101
102 // go through all strings roughly once every 4 minutes
103 int n = ht.size () / 256 + 16;
104
105 for (;;)
106 {
107 if (i == ht.end ())
108 {
109 curpos = 0;
110 return;
111 }
112 else if (!--n)
113 break;
114 else if (!refcnt (*i))
115 {
116 auto (o, i++);
117 const char *s = *o;
118
119 ht.erase (o);
120
121 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
122 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
123 }
124 else
125 ++i;
126 }
127
128 curpos = *i;
90} 129}
130
131shstr skill_names[NUM_SKILLS];
132
133// what weird misoptimisation is this again?
134const shstr undead_name ("undead");
135
136//TODO: this should of course not be here
91 137
92/* buf_overflow() - we don't want to exceed the buffer size of 138/* buf_overflow() - we don't want to exceed the buffer size of
93 * buf1 by adding on buf2! Returns true if overflow will occur. 139 * buf1 by adding on buf2! Returns true if overflow will occur.
94 */ 140 */
95
96int 141int
97buf_overflow (const char *buf1, const char *buf2, int bufsize) 142buf_overflow (const char *buf1, const char *buf2, int bufsize)
98{ 143{
99 int len1 = 0, len2 = 0; 144 int len1 = 0, len2 = 0;
100 145
101 if (buf1) 146 if (buf1)
102 len1 = strlen (buf1); 147 len1 = strlen (buf1);
103 if (buf2) 148 if (buf2)
104 len2 = strlen (buf2); 149 len2 = strlen (buf2);
105 if ((len1 + len2) >= bufsize) 150 if ((len1 + len2) >= bufsize)
106 return 1;
107 return 0; 151 return 1;
152
153 return 0;
108} 154}
109

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines