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

Diff Legend

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