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.22 by root, Thu May 17 21:32:08 2007 UTC

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

Diff Legend

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