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.47 by elmex, Fri Jun 3 08:36:45 2011 UTC

1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 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 "global.h" 32#include "global.h"
14 33
34size_t shstr_alloc;
35
15typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT; 36typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
16 37
17static HT ht; 38static HT ht;
39static int next_gc;
40
41#define NUM_INT 3
18 42
19static const char * 43static const char *
20makevec (const char *s) 44makevec (const char *s)
21{ 45{
22 int
23 len = strlen (s); 46 int len = strlen (s);
47 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
24 48
25 const char * 49 shstr_alloc += alloc;
26 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;
27 52
53 shstr::hash (v) = strhsh (s);
28 shstr::length (v) = len; 54 shstr::length (v) = len;
29 shstr::refcnt (v) = 1; 55 shstr::refcnt (v) = 1;
30 56
31 memcpy ((char *) v, s, len + 1); 57 memcpy (v, s, len + 1);
32 58
33 return v; 59 return v;
34} 60}
35 61
36const char *shstr::null = makevec ("<nil>"); 62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
63
64bool
65shstr_tmp::contains (const char *substring) const
66{
67 //TODO: this is supposed to check for comma-seperation...
68 return s != null ()
69 && substring
70 && strstr (s, substring);
71}
37 72
38const char * 73const char *
39shstr::find (const char *s) 74shstr::find (const char *s)
40{ 75{
41 if (!s) 76 if (!s)
42 return s; 77 return s;
43 78
44 HT::iterator i = ht.find (s); 79 auto (i, ht.find (s));
45 80
46 return i != ht.end ()? *i : 0; 81 return i != ht.end ()? *i : 0;
47} 82}
48 83
49const char * 84const char *
50shstr::intern (const char *s) 85shstr::intern (const char *s)
51{ 86{
52 if (!s) 87 if (!s)
53 return null; 88 return null ();
54 89
55 if (const char *found = find (s)) 90 if (const char *found = find (s))
56 { 91 {
57 ++refcnt (found); 92 ++refcnt (found);
58 return found; 93 return found;
59 } 94 }
60 95
96 --next_gc;
61 s = makevec (s); 97 s = makevec (s);
62 ht.insert (s); 98 ht.insert (s);
63 return s; 99 return s;
64} 100}
65 101
66// periodically test refcounts == 0 for a few strings 102// periodically test refcounts == 0 for a few strings
67// 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.
68void 104void
69shstr::gc () 105shstr::gc ()
70{ 106{
71return; //D 107 if (expect_true (next_gc > 0))
72//D currently disabled: some datastructures might still store them 108 return;
73//D but their pointers will become invalidated 109
74 static const char *curpos; 110 static const char *curpos;
75 111
76 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 112 auto (i, curpos ? ht.find (curpos) : ht.begin ());
77 113
78 if (i == ht.end ()) 114 if (i == ht.end ())
79 i = ht.begin (); 115 i = ht.begin ();
80 116
81 // go through all strings roughly once every 4 minutes
82 int n = ht.size () / 256 + 16; 117 int n = ht.size () / 256 + 16;
118 next_gc += n >> 1;
83 119
84 for (;;) 120 for (;;)
85 { 121 {
86 if (i == ht.end ()) 122 if (i == ht.end ())
87 { 123 {
… …
90 } 126 }
91 else if (!--n) 127 else if (!--n)
92 break; 128 break;
93 else if (!refcnt (*i)) 129 else if (!refcnt (*i))
94 { 130 {
95 HT::iterator o = i++; 131 auto (o, i++);
96 const char *s = *o; 132 const char *s = *o;
97 133
98 ht.erase (o); 134 ht.erase (o);
99 135
100 //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));
101 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));
102 } 140 }
103 else 141 else
104 ++i; 142 ++i;
105 } 143 }
106 144
107 curpos = *i; 145 curpos = *i;
108} 146}
109 147
110shstr skill_names[NUM_SKILLS]; 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
111 154
112// what weird misoptimisation is this again? 155materialtype_t material_null;
113const shstr undead_name ("undead");
114 156
115//TODO: this should of course not be here 157struct freed_map freed_map;
116
117/* buf_overflow() - we don't want to exceed the buffer size of
118 * buf1 by adding on buf2! Returns true if overflow will occur.
119 */
120
121int
122buf_overflow (const char *buf1, const char *buf2, int bufsize)
123{
124 int len1 = 0, len2 = 0;
125
126 if (buf1)
127 len1 = strlen (buf1);
128 if (buf2)
129 len2 = strlen (buf2);
130 if ((len1 + len2) >= bufsize)
131 return 1;
132 return 0;
133}

Diff Legend

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