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.23 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.26 by root, Tue Oct 16 05:34:24 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * 5 *
6 * Crossfire TRT is free software; you can redistribute it and/or modify it 6 * Crossfire TRT is free software: you can redistribute it and/or modify
7 * under the terms of the GNU General Public License as published by the Free 7 * it under the terms of the GNU General Public License as published by
8 * Software Foundation; either version 2 of the License, or (at your option) 8 * the Free Software Foundation, either version 3 of the License, or
9 * any later version. 9 * (at your option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, but 11 * This program is distributed in the hope that it will be useful,
12 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License along 16 * You should have received a copy of the GNU General Public License
17 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 * 18 *
20 * The authors can be reached via e-mail to <crossfire@schmorp.de> 19 * The authors can be reached via e-mail to <crossfire@schmorp.de>
21 */ 20 */
22 21
23/* 22/*
… …
29#include <glib.h> 28#include <glib.h>
30#include <tr1/unordered_set> 29#include <tr1/unordered_set>
31 30
32#include "global.h" 31#include "global.h"
33 32
33size_t shstr_alloc;
34
34typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT; 35typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
35 36
36static HT ht; 37static HT ht;
37 38
38static const char * 39static const char *
39makevec (const char *s) 40makevec (const char *s)
40{ 41{
41 int len = strlen (s); 42 int len = strlen (s);
42 43
44 shstr_alloc += sizeof (int) * 2 + len + 1;
43 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));
44 46
45 shstr::length (v) = len; 47 shstr::length (v) = len;
46 shstr::refcnt (v) = 1; 48 shstr::refcnt (v) = 1;
47 49
… …
118 const char *s = *o; 120 const char *s = *o;
119 121
120 ht.erase (o); 122 ht.erase (o);
121 123
122 //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;
123 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);
124 } 127 }
125 else 128 else
126 ++i; 129 ++i;
127 } 130 }
128 131
129 curpos = *i; 132 curpos = *i;
130} 133}
131 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
132shstr skill_names[NUM_SKILLS]; 140shstr skill_names[NUM_SKILLS];
133
134// what weird misoptimisation is this again?
135const shstr undead_name ("undead");
136 141
137//TODO: this should of course not be here 142//TODO: this should of course not be here
138 143
139/* 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
140 * buf1 by adding on buf2! Returns true if overflow will occur. 145 * buf1 by adding on buf2! Returns true if overflow will occur.
… …
144{ 149{
145 int len1 = 0, len2 = 0; 150 int len1 = 0, len2 = 0;
146 151
147 if (buf1) 152 if (buf1)
148 len1 = strlen (buf1); 153 len1 = strlen (buf1);
154
149 if (buf2) 155 if (buf2)
150 len2 = strlen (buf2); 156 len2 = strlen (buf2);
157
151 if ((len1 + len2) >= bufsize) 158 if ((len1 + len2) >= bufsize)
152 return 1; 159 return 1;
153 160
154 return 0; 161 return 0;
155} 162}

Diff Legend

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