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.25 by root, Tue Jul 10 05:51:37 2007 UTC vs.
Revision 1.29 by root, Fri Apr 11 21:09:52 2008 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 *>, true> 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 (int) * 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 (int) * 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
… …
80 { 84 {
81 ++refcnt (found); 85 ++refcnt (found);
82 return found; 86 return found;
83 } 87 }
84 88
89 --next_gc;
85 s = makevec (s); 90 s = makevec (s);
86 ht.insert (s); 91 ht.insert (s);
87 return s; 92 return s;
88} 93}
89 94
90// periodically test refcounts == 0 for a few strings 95// periodically test refcounts == 0 for a few strings
91// this is the ONLY thing that erases stuff from ht. keep it that way. 96// this is the ONLY thing that erases stuff from ht. keep it that way.
92void 97void
93shstr::gc () 98shstr::gc ()
94{ 99{
100 if (expect_true (next_gc > 0))
101 return;
102
95 static const char *curpos; 103 static const char *curpos;
96 104
97 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 105 auto (i, curpos ? ht.find (curpos) : ht.begin ());
98 106
99 if (i == ht.end ()) 107 if (i == ht.end ())
100 i = ht.begin (); 108 i = ht.begin ();
101 109
102 // go through all strings roughly once every 4 minutes
103 int n = ht.size () / 256 + 16; 110 int n = ht.size () / 256 + 16;
111 next_gc += n >> 1;
104 112
105 for (;;) 113 for (;;)
106 { 114 {
107 if (i == ht.end ()) 115 if (i == ht.end ())
108 { 116 {
… …
117 const char *s = *o; 125 const char *s = *o;
118 126
119 ht.erase (o); 127 ht.erase (o);
120 128
121 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 129 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
130 shstr_alloc -= sizeof (int) * 2 + length (s) + 1;
122 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s); 131 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
123 } 132 }
124 else 133 else
125 ++i; 134 ++i;
126 } 135 }
… …
145{ 154{
146 int len1 = 0, len2 = 0; 155 int len1 = 0, len2 = 0;
147 156
148 if (buf1) 157 if (buf1)
149 len1 = strlen (buf1); 158 len1 = strlen (buf1);
159
150 if (buf2) 160 if (buf2)
151 len2 = strlen (buf2); 161 len2 = strlen (buf2);
162
152 if ((len1 + len2) >= bufsize) 163 if ((len1 + len2) >= bufsize)
153 return 1; 164 return 1;
154 165
155 return 0; 166 return 0;
156} 167}

Diff Legend

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