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.49 by root, Mon Oct 29 23:55:52 2012 UTC

1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your
9 * 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 Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
19 *
20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */
1 22
2/* 23/*
3 * shstr.C 24 * shstr.C
4 */ 25 */
5 26
6#include <cstring> 27#include <cstring>
7#include <cstdlib> 28#include <cstdlib>
8
9#include <glib.h> 29#include <glib.h>
10
11#include <tr1/unordered_set> 30#include <tr1/unordered_set>
12 31
13#include "shstr.h"
14#include "util.h" 32#include "global.h"
15 33
16typedef 34size_t shstr_alloc;
17std::tr1::unordered_set < const char *,
18 str_hash,
19 str_equal >
20 HT;
21 35
36typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
37
22static HT 38static HT ht;
23 ht; 39static int next_gc;
40
41#define NUM_INT 3
24 42
25static const char * 43static const char *
26makevec (const char *s) 44makevec (const char *s)
27{ 45{
28 int
29 len = strlen (s); 46 int len = strlen (s);
47 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
30 48
31 const char * 49 shstr_alloc += alloc;
32 v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + len + 1)); 50 char *v = (char *)g_slice_alloc (alloc);
51 v += sizeof (uint32_t) * NUM_INT;
33 52
53 shstr::hash (v) = strhsh (s);
34 shstr::length (v) = len; 54 shstr::length (v) = len;
35 shstr::refcnt (v) = 1; 55 shstr::refcnt (v) = 1;
36 56
37 memcpy ((char *) v, s, len + 1); 57 memcpy (v, s, len + 1);
38 58
39 return v; 59 return v;
40} 60}
41 61
42const char * 62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
43 shstr::null = makevec ("<nil>");
44 63
45// what weird misoptimisation is this again? 64bool
46const shstr undead_name ("undead"); 65shstr_tmp::contains (const char *substring) const
47 66{
48shstr skill_names[NUM_SKILLS]; 67 //TODO: this is supposed to check for comma-seperation...
68 return s != null ()
69 && substring
70 && strstr (s, substring);
71}
49 72
50const char * 73const char *
51shstr::find (const char *s) 74shstr::find (const char *s)
52{ 75{
53 if (!s) 76 if (!s)
54 return s; 77 return s;
55 78
56 HT::iterator i = ht.find (s); 79 auto (i, ht.find (s));
57 80
58 return i != ht.end ()? *i : 0; 81 return i != ht.end ()? *i : 0;
59} 82}
60 83
61const char * 84const char *
62shstr::intern (const char *s) 85shstr::intern (const char *s)
63{ 86{
64 if (!s) 87 if (!s)
65 return null; 88 return null ();
66 89
67 if (const char *found = find (s)) 90 if (const char *found = find (s))
68 { 91 {
69 ++refcnt (found); 92 ++refcnt (found);
70 return found; 93 return found;
71 } 94 }
72 95
96 --next_gc;
73 s = makevec (s); 97 s = makevec (s);
74 ht.insert (s); 98 ht.insert (s);
75 return s; 99 return s;
76} 100}
77 101
78// periodically test refcounts == 0 for a few strings 102// periodically test refcounts == 0 for a few strings
79// this is the ONLY thing that erases stuff from ht. keep it that way. 103// this is the ONLY thing that erases stuff from ht. keep it that way.
80void 104void
81shstr::gc () 105shstr::gc ()
82{ 106{
83return; //D 107 if (expect_true (next_gc > 0))
84//D currently disabled: some datastructures might still store them 108 return;
85//D but their pointers will become invalidated 109
86 static const char *curpos; 110 static const char *curpos;
87 111
88 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 112 auto (i, curpos ? ht.find (curpos) : ht.begin ());
89 113
90 if (i == ht.end ()) 114 if (i == ht.end ())
91 i = ht.begin (); 115 i = ht.begin ();
92 116
93 // go through all strings roughly once every 4 minutes
94 int n = ht.size () / 256 + 16; 117 int n = ht.size () / 256 + 16;
118 next_gc += n >> 1;
95 119
96 for (;;) 120 for (;;)
97 { 121 {
98 if (i == ht.end ()) 122 if (i == ht.end ())
99 { 123 {
… …
102 } 126 }
103 else if (!--n) 127 else if (!--n)
104 break; 128 break;
105 else if (!refcnt (*i)) 129 else if (!refcnt (*i))
106 { 130 {
107 HT::iterator o = i++; 131 auto (o, i++);
108 const char *s = *o; 132 const char *s = *o;
109 133
110 ht.erase (o); 134 ht.erase (o);
111 135
112 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 136 //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); 137 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
138 shstr_alloc -= alloc;
139 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
114 } 140 }
115 else 141 else
116 ++i; 142 ++i;
117 } 143 }
118 144
119 curpos = *i; 145 curpos = *i;
120} 146}
121 147
122//TODO: this should of course not be here 148// declare these here to get correct initialisation order
149#define def2(id,str) const shstr id (str);
150#define def(id) def2(shstr_ ## id, # id)
151# include "shstrinc.h"
152#undef def
153#undef def2
123 154
124/* buf_overflow() - we don't want to exceed the buffer size of 155materialtype_t material_null;
125 * buf1 by adding on buf2! Returns true if overflow will occur.
126 */
127 156
128int 157struct freed_map freed_map;
129buf_overflow (const char *buf1, const char *buf2, int bufsize)
130{
131 int len1 = 0, len2 = 0;
132
133 if (buf1)
134 len1 = strlen (buf1);
135 if (buf2)
136 len2 = strlen (buf2);
137 if ((len1 + len2) >= bufsize)
138 return 1;
139 return 0;
140}

Diff Legend

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