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.24 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.37 by root, Thu Jan 1 16:05:12 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Crossfire TRT is free software: you can redistribute it and/or modify 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 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 8 * the Free Software Foundation, either version 3 of the License, or
9 * (at your option) any later version. 9 * (at your option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
… …
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License 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/>. 17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 * 18 *
19 * The authors can be reached via e-mail to <crossfire@schmorp.de> 19 * The authors can be reached via e-mail to <support@deliantra.net>
20 */ 20 */
21 21
22/* 22/*
23 * shstr.C 23 * shstr.C
24 */ 24 */
… …
28#include <glib.h> 28#include <glib.h>
29#include <tr1/unordered_set> 29#include <tr1/unordered_set>
30 30
31#include "global.h" 31#include "global.h"
32 32
33size_t shstr_alloc;
34
33typedef 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;
34 36
35static HT ht; 37static HT ht;
38static int next_gc;
36 39
37static const char * 40static const char *
38makevec (const char *s) 41makevec (const char *s)
39{ 42{
40 int len = strlen (s); 43 int len = strlen (s);
41 44
45 shstr_alloc += sizeof (uint32_t) * 2 + len + 1;
42 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));
43 47
44 shstr::length (v) = len; 48 shstr::length (v) = len;
45 shstr::refcnt (v) = 1; 49 shstr::refcnt (v) = 1;
46 50
47 memcpy ((char *) v, s, len + 1); 51 memcpy ((char *) v, s, len + 1);
48 52
49 return v; 53 return v;
50} 54}
51 55
52static const char * 56shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
53makenull ()
54{
55 const char *s = makevec ("(null)");
56 shstr::length (s) = 0;
57 return s;
58}
59
60const char *shstr::null = makenull ();
61 57
62const char * 58const char *
63shstr::find (const char *s) 59shstr::find (const char *s)
64{ 60{
65 if (!s) 61 if (!s)
… …
72 68
73const char * 69const char *
74shstr::intern (const char *s) 70shstr::intern (const char *s)
75{ 71{
76 if (!s) 72 if (!s)
77 return null; 73 return null ();
78 74
79 if (const char *found = find (s)) 75 if (const char *found = find (s))
80 { 76 {
81 ++refcnt (found); 77 ++refcnt (found);
82 return found; 78 return found;
83 } 79 }
84 80
81 --next_gc;
85 s = makevec (s); 82 s = makevec (s);
86 ht.insert (s); 83 ht.insert (s);
87 return s; 84 return s;
88} 85}
89 86
90// periodically test refcounts == 0 for a few strings 87// periodically test refcounts == 0 for a few strings
91// 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.
92void 89void
93shstr::gc () 90shstr::gc ()
94{ 91{
92 if (expect_true (next_gc > 0))
93 return;
94
95 static const char *curpos; 95 static const char *curpos;
96 96
97 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 97 auto (i, curpos ? ht.find (curpos) : ht.begin ());
98 98
99 if (i == ht.end ()) 99 if (i == ht.end ())
100 i = ht.begin (); 100 i = ht.begin ();
101 101
102 // go through all strings roughly once every 4 minutes
103 int n = ht.size () / 256 + 16; 102 int n = ht.size () / 256 + 16;
103 next_gc += n >> 1;
104 104
105 for (;;) 105 for (;;)
106 { 106 {
107 if (i == ht.end ()) 107 if (i == ht.end ())
108 { 108 {
… …
117 const char *s = *o; 117 const char *s = *o;
118 118
119 ht.erase (o); 119 ht.erase (o);
120 120
121 //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;
122 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);
123 } 124 }
124 else 125 else
125 ++i; 126 ++i;
126 } 127 }
127 128
128 curpos = *i; 129 curpos = *i;
129} 130}
130 131
132// declare these here to get correct initialisation order
133#define def2(id,str) const shstr id (str);
134#define def(id) def2(shstr_ ## id, # id)
135# include "shstrinc.h"
136#undef def
137#undef def2
138
131shstr skill_names[NUM_SKILLS]; 139shstr skill_names[NUM_SKILLS];
132
133// what weird misoptimisation is this again?
134const shstr undead_name ("undead");
135 140
136//TODO: this should of course not be here 141//TODO: this should of course not be here
137 142
138/* 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
139 * buf1 by adding on buf2! Returns true if overflow will occur. 144 * buf1 by adding on buf2! Returns true if overflow will occur.
… …
143{ 148{
144 int len1 = 0, len2 = 0; 149 int len1 = 0, len2 = 0;
145 150
146 if (buf1) 151 if (buf1)
147 len1 = strlen (buf1); 152 len1 = strlen (buf1);
153
148 if (buf2) 154 if (buf2)
149 len2 = strlen (buf2); 155 len2 = strlen (buf2);
156
150 if ((len1 + len2) >= bufsize) 157 if ((len1 + len2) >= bufsize)
151 return 1; 158 return 1;
152 159
153 return 0; 160 return 0;
154} 161}

Diff Legend

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