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.21 by root, Mon Apr 16 15:41:26 2007 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 "global.h" 31#include "global.h"
32
33size_t shstr_alloc;
13 34
14typedef 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;
15 36
16static HT ht; 37static HT ht;
17 38
18static const char * 39static const char *
19makevec (const char *s) 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
… …
98 const char *s = *o; 120 const char *s = *o;
99 121
100 ht.erase (o); 122 ht.erase (o);
101 123
102 //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;
103 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);
104 } 127 }
105 else 128 else
106 ++i; 129 ++i;
107 } 130 }
108 131
109 curpos = *i; 132 curpos = *i;
110} 133}
111 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
112shstr skill_names[NUM_SKILLS]; 140shstr skill_names[NUM_SKILLS];
113
114// what weird misoptimisation is this again?
115const shstr undead_name ("undead");
116 141
117//TODO: this should of course not be here 142//TODO: this should of course not be here
118 143
119/* 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
120 * buf1 by adding on buf2! Returns true if overflow will occur. 145 * buf1 by adding on buf2! Returns true if overflow will occur.
121 */ 146 */
122
123int 147int
124buf_overflow (const char *buf1, const char *buf2, int bufsize) 148buf_overflow (const char *buf1, const char *buf2, int bufsize)
125{ 149{
126 int len1 = 0, len2 = 0; 150 int len1 = 0, len2 = 0;
127 151
128 if (buf1) 152 if (buf1)
129 len1 = strlen (buf1); 153 len1 = strlen (buf1);
154
130 if (buf2) 155 if (buf2)
131 len2 = strlen (buf2); 156 len2 = strlen (buf2);
157
132 if ((len1 + len2) >= bufsize) 158 if ((len1 + len2) >= bufsize)
133 return 1; 159 return 1;
160
134 return 0; 161 return 0;
135} 162}

Diff Legend

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