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.11 by root, Tue Sep 5 19:20:16 2006 UTC vs.
Revision 1.23 by root, Mon May 28 21:21:40 2007 UTC

1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
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 it
7 * under the terms of the GNU General Public License as published by the Free
8 * Software Foundation; either version 2 of the License, or (at your option)
9 * any later version.
10 *
11 * This program is distributed in the hope that it will be useful, but
12 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
13 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14 * for more details.
15 *
16 * You should have received a copy of the GNU General Public License along
17 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
18 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 *
20 * The authors can be reached via e-mail to <crossfire@schmorp.de>
21 */
22
1/* 23/*
2 * shstr.C 24 * shstr.C
3 */ 25 */
4 26
5#include <cstring> 27#include <cstring>
6#include <cstdlib> 28#include <cstdlib>
7
8#include <glib.h> 29#include <glib.h>
9
10#include <tr1/unordered_set> 30#include <tr1/unordered_set>
11 31
12#include "shstr.h"
13#include "util.h" 32#include "global.h"
14 33
15typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT; 34typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
16 35
17static HT ht; 36static HT ht;
18 37
19static const char *makevec (const char *s) 38static const char *
39makevec (const char *s)
20{ 40{
21 int len = strlen (s); 41 int len = strlen (s);
22 42
23 const char *v = (const char *)(2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); 43 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
24 44
25 shstr::length (v) = len; 45 shstr::length (v) = len;
26 shstr::refcnt (v) = 1; 46 shstr::refcnt (v) = 1;
27 47
28 memcpy ((char *)v, s, len + 1); 48 memcpy ((char *) v, s, len + 1);
29 49
30 return v; 50 return v;
31} 51}
32 52
53static const char *
54makenull ()
55{
33const char *shstr::null = makevec ("<nil>"); 56 const char *s = makevec ("(null)");
57 shstr::length (s) = 0;
58 return s;
59}
34 60
35// what weird misoptimisation is this again? 61const char *shstr::null = makenull ();
36const shstr undead_name ("undead");
37 62
38const char * 63const char *
39shstr::find (const char *s) 64shstr::find (const char *s)
40{ 65{
41 if (!s) 66 if (!s)
42 return s; 67 return s;
43 68
44 HT::iterator i = ht.find (s); 69 auto (i, ht.find (s));
45 70
46 return i != ht.end () 71 return i != ht.end ()? *i : 0;
47 ? *i
48 : 0;
49} 72}
50 73
51const char * 74const char *
52shstr::intern (const char *s) 75shstr::intern (const char *s)
53{ 76{
… …
70void 93void
71shstr::gc () 94shstr::gc ()
72{ 95{
73 static const char *curpos; 96 static const char *curpos;
74 97
75 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 98 auto (i, curpos ? ht.find (curpos) : ht.begin ());
76 99
77 if (i == ht.end ()) 100 if (i == ht.end ())
78 i = ht.begin (); 101 i = ht.begin ();
79 102
80 // go through all strings roughly once every 4 minutes 103 // go through all strings roughly once every 4 minutes
… …
89 } 112 }
90 else if (!--n) 113 else if (!--n)
91 break; 114 break;
92 else if (!refcnt (*i)) 115 else if (!refcnt (*i))
93 { 116 {
94 HT::iterator o = i++; 117 auto (o, i++);
95 const char *s = *o; 118 const char *s = *o;
119
96 ht.erase (o); 120 ht.erase (o);
97 121
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)); 122 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
101 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *)s); 123 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
102 } 124 }
103 else 125 else
104 ++i; 126 ++i;
105 } 127 }
106 128
107 curpos = *i; 129 curpos = *i;
108} 130}
109 131
132shstr skill_names[NUM_SKILLS];
133
134// what weird misoptimisation is this again?
135const shstr undead_name ("undead");
136
110//TODO: this should of course not be here 137//TODO: this should of course not be here
138
111/* buf_overflow() - we don't want to exceed the buffer size of 139/* buf_overflow() - we don't want to exceed the buffer size of
112 * buf1 by adding on buf2! Returns true if overflow will occur. 140 * buf1 by adding on buf2! Returns true if overflow will occur.
113 */ 141 */
114
115int 142int
116buf_overflow (const char *buf1, const char *buf2, int bufsize) 143buf_overflow (const char *buf1, const char *buf2, int bufsize)
117{ 144{
118 int len1 = 0, len2 = 0; 145 int len1 = 0, len2 = 0;
119 146
120 if (buf1) 147 if (buf1)
121 len1 = strlen (buf1); 148 len1 = strlen (buf1);
122 if (buf2) 149 if (buf2)
123 len2 = strlen (buf2); 150 len2 = strlen (buf2);
124 if ((len1 + len2) >= bufsize) 151 if ((len1 + len2) >= bufsize)
125 return 1;
126 return 0; 152 return 1;
153
154 return 0;
127} 155}
128

Diff Legend

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