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.14 by root, Mon Sep 11 23:33:28 2006 UTC vs.
Revision 1.28 by root, Thu Nov 8 19:43:23 2007 UTC

1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 *
6 * Deliantra 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 <support@deliantra.net>
20 */
1 21
2/* 22/*
3 * shstr.C 23 * shstr.C
4 */ 24 */
5 25
6#include <cstring> 26#include <cstring>
7#include <cstdlib> 27#include <cstdlib>
8
9#include <glib.h> 28#include <glib.h>
10
11#include <tr1/unordered_set> 29#include <tr1/unordered_set>
12 30
13#include "shstr.h"
14#include "util.h" 31#include "global.h"
15 32
16typedef 33size_t shstr_alloc;
17std::tr1::unordered_set < const char *,
18 str_hash,
19 str_equal >
20 HT;
21 34
35typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
36
22static HT 37static HT ht;
23 ht;
24 38
25static const char * 39static const char *
26makevec (const char *s) 40makevec (const char *s)
27{ 41{
28 int
29 len = strlen (s); 42 int len = strlen (s);
30 43
31 const char * 44 shstr_alloc += sizeof (int) * 2 + len + 1;
32 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));
33 46
34 shstr::length (v) = len; 47 shstr::length (v) = len;
35 shstr::refcnt (v) = 1; 48 shstr::refcnt (v) = 1;
36 49
37 memcpy ((char *) v, s, len + 1); 50 memcpy ((char *) v, s, len + 1);
38 51
39 return v; 52 return v;
40} 53}
41 54
42const char * 55static const char *
43 shstr::null = makevec ("<nil>"); 56makenull ()
57{
58 const char *s = makevec ("(null)");
59 shstr::length (s) = 0;
60 return s;
61}
44 62
45// what weird misoptimisation is this again? 63const char *shstr::null = makenull ();
46const shstr undead_name ("undead");
47 64
48const char * 65const char *
49shstr::find (const char *s) 66shstr::find (const char *s)
50{ 67{
51 if (!s) 68 if (!s)
52 return s; 69 return s;
53 70
54 HT::iterator i = ht.find (s); 71 auto (i, ht.find (s));
55 72
56 return i != ht.end ()? *i : 0; 73 return i != ht.end ()? *i : 0;
57} 74}
58 75
59const char * 76const char *
… …
76// periodically test refcounts == 0 for a few strings 93// periodically test refcounts == 0 for a few strings
77// this is the ONLY thing that erases stuff from ht. keep it that way. 94// this is the ONLY thing that erases stuff from ht. keep it that way.
78void 95void
79shstr::gc () 96shstr::gc ()
80{ 97{
81return; //D
82//D currently disabled: some datastructures might still store them
83//D but their pointers will become invalidated
84 static const char *curpos; 98 static const char *curpos;
85 99
86 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 100 auto (i, curpos ? ht.find (curpos) : ht.begin ());
87 101
88 if (i == ht.end ()) 102 if (i == ht.end ())
89 i = ht.begin (); 103 i = ht.begin ();
90 104
91 // go through all strings roughly once every 4 minutes
92 int n = ht.size () / 256 + 16; 105 int n = ht.size () / 256 + 16;
93 106
94 for (;;) 107 for (;;)
95 { 108 {
96 if (i == ht.end ()) 109 if (i == ht.end ())
… …
100 } 113 }
101 else if (!--n) 114 else if (!--n)
102 break; 115 break;
103 else if (!refcnt (*i)) 116 else if (!refcnt (*i))
104 { 117 {
105 HT::iterator o = i++; 118 auto (o, i++);
106 const char *s = *o; 119 const char *s = *o;
107 120
108 ht.erase (o); 121 ht.erase (o);
109 122
110 //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));
124 shstr_alloc -= sizeof (int) * 2 + length (s) + 1;
111 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s); 125 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
112 } 126 }
113 else 127 else
114 ++i; 128 ++i;
115 } 129 }
116 130
117 curpos = *i; 131 curpos = *i;
118} 132}
119 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
120//TODO: this should of course not be here 141//TODO: this should of course not be here
121 142
122/* 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
123 * buf1 by adding on buf2! Returns true if overflow will occur. 144 * buf1 by adding on buf2! Returns true if overflow will occur.
124 */ 145 */
125
126int 146int
127buf_overflow (const char *buf1, const char *buf2, int bufsize) 147buf_overflow (const char *buf1, const char *buf2, int bufsize)
128{ 148{
129 int len1 = 0, len2 = 0; 149 int len1 = 0, len2 = 0;
130 150
131 if (buf1) 151 if (buf1)
132 len1 = strlen (buf1); 152 len1 = strlen (buf1);
153
133 if (buf2) 154 if (buf2)
134 len2 = strlen (buf2); 155 len2 = strlen (buf2);
156
135 if ((len1 + len2) >= bufsize) 157 if ((len1 + len2) >= bufsize)
136 return 1; 158 return 1;
159
137 return 0; 160 return 0;
138} 161}

Diff Legend

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