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.8 by root, Mon Sep 4 11:07:59 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 29#include <glib.h>
8#include <tr1/unordered_set> 30#include <tr1/unordered_set>
9 31
10#include "shstr.h" 32#include "global.h"
11 33
12struct hash 34typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
13{
14 std::size_t operator ()(const char *s) const
15 {
16 unsigned long hash = 0;
17 unsigned int i = 0;
18
19 /* use the one-at-a-time hash function, which supposedly is
20 * better than the djb2-like one used by perl5.005, but
21 * certainly is better then the bug used here before.
22 * see http://burtleburtle.net/bob/hash/doobs.html
23 */
24 while (*s)
25 {
26 hash += *s++;
27 hash += hash << 10;
28 hash ^= hash >> 6;
29 }
30
31 hash += hash << 3;
32 hash ^= hash >> 11;
33 hash += hash << 15;
34
35 return hash;
36 }
37};
38
39struct equal
40{
41 bool operator ()(const char *a, const char *b) const
42 {
43 return !strcmp (a, b);
44 }
45};
46
47typedef std::tr1::unordered_set<const char *, hash, equal> HT;
48 35
49static HT ht; 36static HT ht;
50 37
51static const char *makevec (const char *s) 38static const char *
39makevec (const char *s)
52{ 40{
53 int len = strlen (s); 41 int len = strlen (s);
54 42
55 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));
56 44
57 shstr::length (v) = len; 45 shstr::length (v) = len;
58 shstr::refcnt (v) = 1; 46 shstr::refcnt (v) = 1;
59 47
60 memcpy ((char *)v, s, len + 1); 48 memcpy ((char *) v, s, len + 1);
61 49
62 return v; 50 return v;
63} 51}
64 52
53static const char *
54makenull ()
55{
65const char *shstr::null = makevec ("<nil>"); 56 const char *s = makevec ("(null)");
57 shstr::length (s) = 0;
58 return s;
59}
66 60
67// what weird misoptimisation is this again? 61const char *shstr::null = makenull ();
68const shstr undead_name ("undead");
69 62
70const char * 63const char *
71shstr::find (const char *s) 64shstr::find (const char *s)
72{ 65{
73 if (!s) 66 if (!s)
74 return s; 67 return s;
75 68
76 HT::iterator i = ht.find (s); 69 auto (i, ht.find (s));
77 70
78 return i != ht.end () 71 return i != ht.end ()? *i : 0;
79 ? *i
80 : 0;
81} 72}
82 73
83const char * 74const char *
84shstr::intern (const char *s) 75shstr::intern (const char *s)
85{ 76{
… …
102void 93void
103shstr::gc () 94shstr::gc ()
104{ 95{
105 static const char *curpos; 96 static const char *curpos;
106 97
107 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 98 auto (i, curpos ? ht.find (curpos) : ht.begin ());
108 99
109 if (i == ht.end ()) 100 if (i == ht.end ())
110 i = ht.begin (); 101 i = ht.begin ();
111 102
112 // go through all strings roughly once every 4 minutes 103 // go through all strings roughly once every 4 minutes
… …
121 } 112 }
122 else if (!--n) 113 else if (!--n)
123 break; 114 break;
124 else if (!refcnt (*i)) 115 else if (!refcnt (*i))
125 { 116 {
126 HT::iterator o = i++; 117 auto (o, i++);
127 const char *s = *o; 118 const char *s = *o;
119
128 ht.erase (o); 120 ht.erase (o);
129 121
130 //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));
131 free (-2 + (int *)s); 123 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
132 } 124 }
133 else 125 else
134 ++i; 126 ++i;
135 } 127 }
136 128
137 curpos = *i; 129 curpos = *i;
138} 130}
139 131
132shstr skill_names[NUM_SKILLS];
133
134// what weird misoptimisation is this again?
135const shstr undead_name ("undead");
136
140//TODO: this should of course not be here 137//TODO: this should of course not be here
138
141/* 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
142 * buf1 by adding on buf2! Returns true if overflow will occur. 140 * buf1 by adding on buf2! Returns true if overflow will occur.
143 */ 141 */
144
145int 142int
146buf_overflow (const char *buf1, const char *buf2, int bufsize) 143buf_overflow (const char *buf1, const char *buf2, int bufsize)
147{ 144{
148 int len1 = 0, len2 = 0; 145 int len1 = 0, len2 = 0;
149 146
150 if (buf1) 147 if (buf1)
151 len1 = strlen (buf1); 148 len1 = strlen (buf1);
152 if (buf2) 149 if (buf2)
153 len2 = strlen (buf2); 150 len2 = strlen (buf2);
154 if ((len1 + len2) >= bufsize) 151 if ((len1 + len2) >= bufsize)
155 return 1;
156 return 0; 152 return 1;
153
154 return 0;
157} 155}
158

Diff Legend

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