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.13 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.17 by root, Tue Sep 12 19:20:06 2006 UTC

… …
8 8
9#include <glib.h> 9#include <glib.h>
10 10
11#include <tr1/unordered_set> 11#include <tr1/unordered_set>
12 12
13#include "shstr.h"
14#include "util.h" 13#include "global.h"
15 14
16typedef 15typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT;
17std::tr1::unordered_set < const char *,
18 str_hash,
19 str_equal >
20 HT;
21 16
22static HT 17static HT ht;
23 ht;
24 18
25static const char * 19static const char *
26makevec (const char *s) 20makevec (const char *s)
27{ 21{
28 int
29 len = strlen (s); 22 int len = strlen (s);
30 23
31 const char *
32 v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + len + 1)); 24 const char *v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + len + 1));
33 25
34 shstr::length (v) = len; 26 shstr::length (v) = len;
35 shstr::refcnt (v) = 1; 27 shstr::refcnt (v) = 1;
36 28
37 memcpy ((char *) v, s, len + 1); 29 memcpy ((char *) v, s, len + 1);
38 30
39 return v; 31 return v;
40} 32}
41 33
42const char * 34static const char *
43 shstr::null = makevec ("<nil>"); 35makenull ()
36{
37 const char *s = makevec ("(null)");
38 shstr::length (s) = 0;
39 return s;
40}
44 41
45// what weird misoptimisation is this again? 42const char *shstr::null = makenull ();
46const shstr undead_name ("undead");
47 43
48const char * 44const char *
49shstr::find (const char *s) 45shstr::find (const char *s)
50{ 46{
51 if (!s) 47 if (!s)
… …
76// periodically test refcounts == 0 for a few strings 72// periodically test refcounts == 0 for a few strings
77// this is the ONLY thing that erases stuff from ht. keep it that way. 73// this is the ONLY thing that erases stuff from ht. keep it that way.
78void 74void
79shstr::gc () 75shstr::gc ()
80{ 76{
77return; //D
78//D currently disabled: some datastructures might still store them
79//D but their pointers will become invalidated
81 static const char *curpos; 80 static const char *curpos;
82 81
83 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 82 HT::iterator i = curpos ? ht.find (curpos) : ht.begin ();
84 83
85 if (i == ht.end ()) 84 if (i == ht.end ())
… …
112 } 111 }
113 112
114 curpos = *i; 113 curpos = *i;
115} 114}
116 115
116shstr skill_names[NUM_SKILLS];
117
118// what weird misoptimisation is this again?
119const shstr undead_name ("undead");
120
117//TODO: this should of course not be here 121//TODO: this should of course not be here
118 122
119/* buf_overflow() - we don't want to exceed the buffer size of 123/* buf_overflow() - we don't want to exceed the buffer size of
120 * buf1 by adding on buf2! Returns true if overflow will occur. 124 * buf1 by adding on buf2! Returns true if overflow will occur.
121 */ 125 */

Diff Legend

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