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

Diff Legend

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