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

Diff Legend

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