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

Diff Legend

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