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

Diff Legend

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