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

Diff Legend

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