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

Diff Legend

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