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.9 by root, Mon Sep 4 17:16:19 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 */
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 28#include <glib.h>
8#include <tr1/unordered_set> 29#include <tr1/unordered_set>
9 30
10#include "shstr.h"
11#include "util.h" 31#include "global.h"
12 32
13typedef 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;
14 34
15static HT ht; 35static HT ht;
16 36
17static const char *makevec (const char *s) 37static const char *
38makevec (const char *s)
18{ 39{
19 int len = strlen (s); 40 int len = strlen (s);
20 41
21 const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1)); 42 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
22 43
23 shstr::length (v) = len; 44 shstr::length (v) = len;
24 shstr::refcnt (v) = 1; 45 shstr::refcnt (v) = 1;
25 46
26 memcpy ((char *)v, s, len + 1); 47 memcpy ((char *) v, s, len + 1);
27 48
28 return v; 49 return v;
29} 50}
30 51
52static const char *
53makenull ()
54{
31const char *shstr::null = makevec ("<nil>"); 55 const char *s = makevec ("(null)");
56 shstr::length (s) = 0;
57 return s;
58}
32 59
33// what weird misoptimisation is this again? 60const char *shstr::null = makenull ();
34const shstr undead_name ("undead");
35 61
36const char * 62const char *
37shstr::find (const char *s) 63shstr::find (const char *s)
38{ 64{
39 if (!s) 65 if (!s)
40 return s; 66 return s;
41 67
42 HT::iterator i = ht.find (s); 68 auto (i, ht.find (s));
43 69
44 return i != ht.end () 70 return i != ht.end ()? *i : 0;
45 ? *i
46 : 0;
47} 71}
48 72
49const char * 73const char *
50shstr::intern (const char *s) 74shstr::intern (const char *s)
51{ 75{
… …
68void 92void
69shstr::gc () 93shstr::gc ()
70{ 94{
71 static const char *curpos; 95 static const char *curpos;
72 96
73 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 97 auto (i, curpos ? ht.find (curpos) : ht.begin ());
74 98
75 if (i == ht.end ()) 99 if (i == ht.end ())
76 i = ht.begin (); 100 i = ht.begin ();
77 101
78 // go through all strings roughly once every 4 minutes 102 // go through all strings roughly once every 4 minutes
… …
87 } 111 }
88 else if (!--n) 112 else if (!--n)
89 break; 113 break;
90 else if (!refcnt (*i)) 114 else if (!refcnt (*i))
91 { 115 {
92 HT::iterator o = i++; 116 auto (o, i++);
93 const char *s = *o; 117 const char *s = *o;
118
94 ht.erase (o); 119 ht.erase (o);
95 120
96 //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));
97 free (-2 + (int *)s); 122 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
98 } 123 }
99 else 124 else
100 ++i; 125 ++i;
101 } 126 }
102 127
103 curpos = *i; 128 curpos = *i;
104} 129}
105 130
131shstr skill_names[NUM_SKILLS];
132
133// what weird misoptimisation is this again?
134const shstr undead_name ("undead");
135
106//TODO: this should of course not be here 136//TODO: this should of course not be here
137
107/* 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
108 * buf1 by adding on buf2! Returns true if overflow will occur. 139 * buf1 by adding on buf2! Returns true if overflow will occur.
109 */ 140 */
110
111int 141int
112buf_overflow (const char *buf1, const char *buf2, int bufsize) 142buf_overflow (const char *buf1, const char *buf2, int bufsize)
113{ 143{
114 int len1 = 0, len2 = 0; 144 int len1 = 0, len2 = 0;
115 145
116 if (buf1) 146 if (buf1)
117 len1 = strlen (buf1); 147 len1 = strlen (buf1);
118 if (buf2) 148 if (buf2)
119 len2 = strlen (buf2); 149 len2 = strlen (buf2);
120 if ((len1 + len2) >= bufsize) 150 if ((len1 + len2) >= bufsize)
121 return 1;
122 return 0; 151 return 1;
152
153 return 0;
123} 154}
124

Diff Legend

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