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.19 by root, Wed Sep 13 23:39:27 2006 UTC vs.
Revision 1.44 by root, Thu Apr 15 00:36:51 2010 UTC

1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your
9 * 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 Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
19 *
20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */
22
1/* 23/*
2 * shstr.C 24 * shstr.C
3 */ 25 */
4 26
5#include <cstring> 27#include <cstring>
6#include <cstdlib> 28#include <cstdlib>
7
8#include <glib.h> 29#include <glib.h>
9
10#include <tr1/unordered_set> 30#include <tr1/unordered_set>
11 31
12#include "global.h" 32#include "global.h"
13 33
34size_t shstr_alloc;
35
14typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT; 36typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
15 37
16static HT ht; 38static HT ht;
39static int next_gc;
40
41#define NUM_INT 3
17 42
18static const char * 43static const char *
19makevec (const char *s) 44makevec (const char *s)
20{ 45{
21 int len = strlen (s); 46 int len = strlen (s);
47 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
22 48
23 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); 49 shstr_alloc += alloc;
50 char *v = (char *)g_slice_alloc (alloc);
51 v += sizeof (uint32_t) * NUM_INT;
24 52
53 shstr::hash (v) = strhsh (s);
25 shstr::length (v) = len; 54 shstr::length (v) = len;
26 shstr::refcnt (v) = 1; 55 shstr::refcnt (v) = 1;
27 56
28 memcpy ((char *) v, s, len + 1); 57 memcpy (v, s, len + 1);
29 58
30 return v; 59 return v;
31} 60}
32 61
33static const char * 62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
34makenull ()
35{
36 const char *s = makevec ("(null)");
37 shstr::length (s) = 0;
38 return s;
39}
40
41const char *shstr::null = makenull ();
42 63
43const char * 64const char *
44shstr::find (const char *s) 65shstr::find (const char *s)
45{ 66{
46 if (!s) 67 if (!s)
47 return s; 68 return s;
48 69
49 HT::iterator i = ht.find (s); 70 auto (i, ht.find (s));
50 71
51 return i != ht.end ()? *i : 0; 72 return i != ht.end ()? *i : 0;
52} 73}
53 74
54const char * 75const char *
55shstr::intern (const char *s) 76shstr::intern (const char *s)
56{ 77{
57 if (!s) 78 if (!s)
58 return null; 79 return null ();
59 80
60 if (const char *found = find (s)) 81 if (const char *found = find (s))
61 { 82 {
62 ++refcnt (found); 83 ++refcnt (found);
63 return found; 84 return found;
64 } 85 }
65 86
87 --next_gc;
66 s = makevec (s); 88 s = makevec (s);
67 ht.insert (s); 89 ht.insert (s);
68 return s; 90 return s;
69} 91}
70 92
71// periodically test refcounts == 0 for a few strings 93// periodically test refcounts == 0 for a few strings
72// this is the ONLY thing that erases stuff from ht. keep it that way. 94// this is the ONLY thing that erases stuff from ht. keep it that way.
73void 95void
74shstr::gc () 96shstr::gc ()
75{ 97{
98 if (expect_true (next_gc > 0))
99 return;
100
76 static const char *curpos; 101 static const char *curpos;
77 102
78 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 103 auto (i, curpos ? ht.find (curpos) : ht.begin ());
79 104
80 if (i == ht.end ()) 105 if (i == ht.end ())
81 i = ht.begin (); 106 i = ht.begin ();
82 107
83 // go through all strings roughly once every 4 minutes
84 int n = ht.size () / 256 + 16; 108 int n = ht.size () / 256 + 16;
109 next_gc += n >> 1;
85 110
86 for (;;) 111 for (;;)
87 { 112 {
88 if (i == ht.end ()) 113 if (i == ht.end ())
89 { 114 {
… …
92 } 117 }
93 else if (!--n) 118 else if (!--n)
94 break; 119 break;
95 else if (!refcnt (*i)) 120 else if (!refcnt (*i))
96 { 121 {
97 HT::iterator o = i++; 122 auto (o, i++);
98 const char *s = *o; 123 const char *s = *o;
99 124
100 ht.erase (o); 125 ht.erase (o);
101 126
102 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 127 //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); 128 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
129 shstr_alloc -= alloc;
130 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
104 } 131 }
105 else 132 else
106 ++i; 133 ++i;
107 } 134 }
108 135
109 curpos = *i; 136 curpos = *i;
110} 137}
111 138
112shstr skill_names[NUM_SKILLS]; 139// declare these here to get correct initialisation order
140#define def2(id,str) const shstr id (str);
141#define def(id) def2(shstr_ ## id, # id)
142# include "shstrinc.h"
143#undef def
144#undef def2
113 145
114// what weird misoptimisation is this again? 146materialtype_t material_null;
115const shstr undead_name ("undead");
116 147
117//TODO: this should of course not be here
118
119/* buf_overflow() - we don't want to exceed the buffer size of
120 * buf1 by adding on buf2! Returns true if overflow will occur.
121 */
122
123int
124buf_overflow (const char *buf1, const char *buf2, int bufsize)
125{
126 int len1 = 0, len2 = 0;
127
128 if (buf1)
129 len1 = strlen (buf1);
130 if (buf2)
131 len2 = strlen (buf2);
132 if ((len1 + len2) >= bufsize)
133 return 1;
134 return 0;
135}

Diff Legend

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