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.21 by root, Mon Apr 16 15:41:26 2007 UTC vs.
Revision 1.39 by root, Mon Oct 12 14:00:57 2009 UTC

1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007,2008 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;
17 40
18static const char * 41static const char *
19makevec (const char *s) 42makevec (const char *s)
20{ 43{
21 int len = strlen (s); 44 int len = strlen (s);
45 int alloc = sizeof (uint32_t) * 2 + len + 1;
22 46
23 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); 47 shstr_alloc += alloc;
48 char *v = (char *)g_slice_alloc (alloc);
49 v += sizeof (uint32_t) * 2;
24 50
25 shstr::length (v) = len; 51 shstr::length (v) = len;
26 shstr::refcnt (v) = 1; 52 shstr::refcnt (v) = 1;
27 53
28 memcpy ((char *) v, s, len + 1); 54 memcpy (v, s, len + 1);
29 55
30 return v; 56 return v;
31} 57}
32 58
33static const char * 59shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 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 60
43const char * 61const char *
44shstr::find (const char *s) 62shstr::find (const char *s)
45{ 63{
46 if (!s) 64 if (!s)
… …
53 71
54const char * 72const char *
55shstr::intern (const char *s) 73shstr::intern (const char *s)
56{ 74{
57 if (!s) 75 if (!s)
58 return null; 76 return null ();
59 77
60 if (const char *found = find (s)) 78 if (const char *found = find (s))
61 { 79 {
62 ++refcnt (found); 80 ++refcnt (found);
63 return found; 81 return found;
64 } 82 }
65 83
84 --next_gc;
66 s = makevec (s); 85 s = makevec (s);
67 ht.insert (s); 86 ht.insert (s);
68 return s; 87 return s;
69} 88}
70 89
71// periodically test refcounts == 0 for a few strings 90// periodically test refcounts == 0 for a few strings
72// this is the ONLY thing that erases stuff from ht. keep it that way. 91// this is the ONLY thing that erases stuff from ht. keep it that way.
73void 92void
74shstr::gc () 93shstr::gc ()
75{ 94{
95 if (expect_true (next_gc > 0))
96 return;
97
76 static const char *curpos; 98 static const char *curpos;
77 99
78 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 100 auto (i, curpos ? ht.find (curpos) : ht.begin ());
79 101
80 if (i == ht.end ()) 102 if (i == ht.end ())
81 i = ht.begin (); 103 i = ht.begin ();
82 104
83 // go through all strings roughly once every 4 minutes
84 int n = ht.size () / 256 + 16; 105 int n = ht.size () / 256 + 16;
106 next_gc += n >> 1;
85 107
86 for (;;) 108 for (;;)
87 { 109 {
88 if (i == ht.end ()) 110 if (i == ht.end ())
89 { 111 {
… …
98 const char *s = *o; 120 const char *s = *o;
99 121
100 ht.erase (o); 122 ht.erase (o);
101 123
102 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 124 //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); 125 int alloc = sizeof (uint32_t) * 2 + length (s) + 1;
126 shstr_alloc -= alloc;
127 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2));
104 } 128 }
105 else 129 else
106 ++i; 130 ++i;
107 } 131 }
108 132
109 curpos = *i; 133 curpos = *i;
110} 134}
111 135
136// declare these here to get correct initialisation order
137#define def2(id,str) const shstr id (str);
138#define def(id) def2(shstr_ ## id, # id)
139# include "shstrinc.h"
140#undef def
141#undef def2
142
112shstr skill_names[NUM_SKILLS]; 143shstr skill_names[NUM_SKILLS];
113
114// what weird misoptimisation is this again?
115const shstr undead_name ("undead");
116 144
117//TODO: this should of course not be here 145//TODO: this should of course not be here
118 146
119/* buf_overflow() - we don't want to exceed the buffer size of 147/* buf_overflow() - we don't want to exceed the buffer size of
120 * buf1 by adding on buf2! Returns true if overflow will occur. 148 * buf1 by adding on buf2! Returns true if overflow will occur.
121 */ 149 */
122
123int 150int
124buf_overflow (const char *buf1, const char *buf2, int bufsize) 151buf_overflow (const char *buf1, const char *buf2, int bufsize)
125{ 152{
126 int len1 = 0, len2 = 0; 153 int len1 = 0, len2 = 0;
127 154
128 if (buf1) 155 if (buf1)
129 len1 = strlen (buf1); 156 len1 = strlen (buf1);
157
130 if (buf2) 158 if (buf2)
131 len2 = strlen (buf2); 159 len2 = strlen (buf2);
160
132 if ((len1 + len2) >= bufsize) 161 if ((len1 + len2) >= bufsize)
133 return 1; 162 return 1;
163
134 return 0; 164 return 0;
135} 165}

Diff Legend

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