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

Diff Legend

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