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.27 by root, Mon Oct 22 05:46:44 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" 31#include "global.h"
11 32
12struct hash 33size_t shstr_alloc;
13{
14 std::size_t operator ()(const char *s) const
15 {
16 unsigned long hash = 0;
17 unsigned int i = 0;
18 34
19 /* use the one-at-a-time hash function, which supposedly is 35typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
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 36
49static HT ht; 37static HT ht;
50 38
51static const char *makevec (const char *s) 39static const char *
40makevec (const char *s)
52{ 41{
53 int len = strlen (s); 42 int len = strlen (s);
54 43
44 shstr_alloc += sizeof (int) * 2 + len + 1;
55 const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1)); 45 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
56 46
57 shstr::length (v) = len; 47 shstr::length (v) = len;
58 shstr::refcnt (v) = 1; 48 shstr::refcnt (v) = 1;
59 49
60 memcpy ((char *)v, s, len + 1); 50 memcpy ((char *) v, s, len + 1);
61 51
62 return v; 52 return v;
63} 53}
64 54
55static const char *
56makenull ()
57{
65const char *shstr::null = makevec ("<nil>"); 58 const char *s = makevec ("(null)");
59 shstr::length (s) = 0;
60 return s;
61}
66 62
67// what weird misoptimisation is this again? 63const char *shstr::null = makenull ();
68const shstr undead_name ("undead");
69 64
70const char * 65const char *
71shstr::find (const char *s) 66shstr::find (const char *s)
72{ 67{
73 if (!s) 68 if (!s)
74 return s; 69 return s;
75 70
76 HT::iterator i = ht.find (s); 71 auto (i, ht.find (s));
77 72
78 return i != ht.end () 73 return i != ht.end ()? *i : 0;
79 ? *i
80 : 0;
81} 74}
82 75
83const char * 76const char *
84shstr::intern (const char *s) 77shstr::intern (const char *s)
85{ 78{
… …
102void 95void
103shstr::gc () 96shstr::gc ()
104{ 97{
105 static const char *curpos; 98 static const char *curpos;
106 99
107 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 100 auto (i, curpos ? ht.find (curpos) : ht.begin ());
108 101
109 if (i == ht.end ()) 102 if (i == ht.end ())
110 i = ht.begin (); 103 i = ht.begin ();
111 104
112 // go through all strings roughly once every 4 minutes
113 int n = ht.size () / 256 + 16; 105 int n = ht.size () / 256 + 16;
114 106
115 for (;;) 107 for (;;)
116 { 108 {
117 if (i == ht.end ()) 109 if (i == ht.end ())
… …
121 } 113 }
122 else if (!--n) 114 else if (!--n)
123 break; 115 break;
124 else if (!refcnt (*i)) 116 else if (!refcnt (*i))
125 { 117 {
126 HT::iterator o = i++; 118 auto (o, i++);
127 const char *s = *o; 119 const char *s = *o;
120
128 ht.erase (o); 121 ht.erase (o);
129 122
130 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 123 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
131 free (-2 + (int *)s); 124 shstr_alloc -= sizeof (int) * 2 + length (s) + 1;
125 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
132 } 126 }
133 else 127 else
134 ++i; 128 ++i;
135 } 129 }
136 130
137 curpos = *i; 131 curpos = *i;
138} 132}
139 133
134// declare these here to get correct initialisation order
135#define def(str) const shstr shstr_ ## str (# str);
136# include "shstrinc.h"
137#undef def
138
139shstr skill_names[NUM_SKILLS];
140
140//TODO: this should of course not be here 141//TODO: this should of course not be here
142
141/* buf_overflow() - we don't want to exceed the buffer size of 143/* buf_overflow() - we don't want to exceed the buffer size of
142 * buf1 by adding on buf2! Returns true if overflow will occur. 144 * buf1 by adding on buf2! Returns true if overflow will occur.
143 */ 145 */
144
145int 146int
146buf_overflow (const char *buf1, const char *buf2, int bufsize) 147buf_overflow (const char *buf1, const char *buf2, int bufsize)
147{ 148{
148 int len1 = 0, len2 = 0; 149 int len1 = 0, len2 = 0;
149 150
150 if (buf1) 151 if (buf1)
151 len1 = strlen (buf1); 152 len1 = strlen (buf1);
153
152 if (buf2) 154 if (buf2)
153 len2 = strlen (buf2); 155 len2 = strlen (buf2);
156
154 if ((len1 + len2) >= bufsize) 157 if ((len1 + len2) >= bufsize)
155 return 1;
156 return 0; 158 return 1;
159
160 return 0;
157} 161}
158

Diff Legend

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