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

Diff Legend

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