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.24 by root, Sun Jul 1 05:00:18 2007 UTC

1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 *
6 * Crossfire TRT 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 <crossfire@schmorp.de>
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 "global.h" 31#include "global.h"
14 32
15typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT; 33typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
16 34
17static HT ht; 35static HT ht;
18 36
19static const char * 37static const char *
20makevec (const char *s) 38makevec (const char *s)
21{ 39{
22 int
23 len = strlen (s); 40 int len = strlen (s);
24 41
25 const char *
26 v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + len + 1)); 42 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
27 43
28 shstr::length (v) = len; 44 shstr::length (v) = len;
29 shstr::refcnt (v) = 1; 45 shstr::refcnt (v) = 1;
30 46
31 memcpy ((char *) v, s, len + 1); 47 memcpy ((char *) v, s, len + 1);
32 48
33 return v; 49 return v;
34} 50}
35 51
52static const char *
53makenull ()
54{
55 const char *s = makevec ("(null)");
56 shstr::length (s) = 0;
57 return s;
58}
59
36const char *shstr::null = makevec ("<nil>"); 60const char *shstr::null = makenull ();
37 61
38const char * 62const char *
39shstr::find (const char *s) 63shstr::find (const char *s)
40{ 64{
41 if (!s) 65 if (!s)
42 return s; 66 return s;
43 67
44 HT::iterator i = ht.find (s); 68 auto (i, ht.find (s));
45 69
46 return i != ht.end ()? *i : 0; 70 return i != ht.end ()? *i : 0;
47} 71}
48 72
49const char * 73const char *
… …
66// periodically test refcounts == 0 for a few strings 90// periodically test refcounts == 0 for a few strings
67// this is the ONLY thing that erases stuff from ht. keep it that way. 91// this is the ONLY thing that erases stuff from ht. keep it that way.
68void 92void
69shstr::gc () 93shstr::gc ()
70{ 94{
71return; //D
72//D currently disabled: some datastructures might still store them
73//D but their pointers will become invalidated
74 static const char *curpos; 95 static const char *curpos;
75 96
76 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 97 auto (i, curpos ? ht.find (curpos) : ht.begin ());
77 98
78 if (i == ht.end ()) 99 if (i == ht.end ())
79 i = ht.begin (); 100 i = ht.begin ();
80 101
81 // go through all strings roughly once every 4 minutes 102 // go through all strings roughly once every 4 minutes
… …
90 } 111 }
91 else if (!--n) 112 else if (!--n)
92 break; 113 break;
93 else if (!refcnt (*i)) 114 else if (!refcnt (*i))
94 { 115 {
95 HT::iterator o = i++; 116 auto (o, i++);
96 const char *s = *o; 117 const char *s = *o;
97 118
98 ht.erase (o); 119 ht.erase (o);
99 120
100 //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));
… …
115//TODO: this should of course not be here 136//TODO: this should of course not be here
116 137
117/* buf_overflow() - we don't want to exceed the buffer size of 138/* buf_overflow() - we don't want to exceed the buffer size of
118 * buf1 by adding on buf2! Returns true if overflow will occur. 139 * buf1 by adding on buf2! Returns true if overflow will occur.
119 */ 140 */
120
121int 141int
122buf_overflow (const char *buf1, const char *buf2, int bufsize) 142buf_overflow (const char *buf1, const char *buf2, int bufsize)
123{ 143{
124 int len1 = 0, len2 = 0; 144 int len1 = 0, len2 = 0;
125 145
… …
127 len1 = strlen (buf1); 147 len1 = strlen (buf1);
128 if (buf2) 148 if (buf2)
129 len2 = strlen (buf2); 149 len2 = strlen (buf2);
130 if ((len1 + len2) >= bufsize) 150 if ((len1 + len2) >= bufsize)
131 return 1; 151 return 1;
152
132 return 0; 153 return 0;
133} 154}

Diff Legend

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