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.11 by root, Tue Sep 5 19:20:16 2006 UTC vs.
Revision 1.17 by root, Tue Sep 12 19:20:06 2006 UTC

1
1/* 2/*
2 * shstr.C 3 * shstr.C
3 */ 4 */
4 5
5#include <cstring> 6#include <cstring>
… …
7 8
8#include <glib.h> 9#include <glib.h>
9 10
10#include <tr1/unordered_set> 11#include <tr1/unordered_set>
11 12
12#include "shstr.h"
13#include "util.h" 13#include "global.h"
14 14
15typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT; 15typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT;
16 16
17static HT ht; 17static HT ht;
18 18
19static const char *makevec (const char *s) 19static const char *
20makevec (const char *s)
20{ 21{
21 int len = strlen (s); 22 int len = strlen (s);
22 23
23 const char *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));
24 25
25 shstr::length (v) = len; 26 shstr::length (v) = len;
26 shstr::refcnt (v) = 1; 27 shstr::refcnt (v) = 1;
27 28
28 memcpy ((char *)v, s, len + 1); 29 memcpy ((char *) v, s, len + 1);
29 30
30 return v; 31 return v;
31} 32}
32 33
34static const char *
35makenull ()
36{
33const char *shstr::null = makevec ("<nil>"); 37 const char *s = makevec ("(null)");
38 shstr::length (s) = 0;
39 return s;
40}
34 41
35// what weird misoptimisation is this again? 42const char *shstr::null = makenull ();
36const shstr undead_name ("undead");
37 43
38const char * 44const char *
39shstr::find (const char *s) 45shstr::find (const char *s)
40{ 46{
41 if (!s) 47 if (!s)
42 return s; 48 return s;
43 49
44 HT::iterator i = ht.find (s); 50 HT::iterator i = ht.find (s);
45 51
46 return i != ht.end () 52 return i != ht.end ()? *i : 0;
47 ? *i
48 : 0;
49} 53}
50 54
51const char * 55const char *
52shstr::intern (const char *s) 56shstr::intern (const char *s)
53{ 57{
… …
68// periodically test refcounts == 0 for a few strings 72// periodically test refcounts == 0 for a few strings
69// 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.
70void 74void
71shstr::gc () 75shstr::gc ()
72{ 76{
77return; //D
78//D currently disabled: some datastructures might still store them
79//D but their pointers will become invalidated
73 static const char *curpos; 80 static const char *curpos;
74 81
75 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 82 HT::iterator i = curpos ? ht.find (curpos) : ht.begin ();
76 83
77 if (i == ht.end ()) 84 if (i == ht.end ())
… …
91 break; 98 break;
92 else if (!refcnt (*i)) 99 else if (!refcnt (*i))
93 { 100 {
94 HT::iterator o = i++; 101 HT::iterator o = i++;
95 const char *s = *o; 102 const char *s = *o;
103
96 ht.erase (o); 104 ht.erase (o);
97 105
98 int len = length (s);
99
100 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 106 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
101 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *)s); 107 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
102 } 108 }
103 else 109 else
104 ++i; 110 ++i;
105 } 111 }
106 112
107 curpos = *i; 113 curpos = *i;
108} 114}
109 115
116shstr skill_names[NUM_SKILLS];
117
118// what weird misoptimisation is this again?
119const shstr undead_name ("undead");
120
110//TODO: this should of course not be here 121//TODO: this should of course not be here
122
111/* 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
112 * buf1 by adding on buf2! Returns true if overflow will occur. 124 * buf1 by adding on buf2! Returns true if overflow will occur.
113 */ 125 */
114 126
115int 127int
116buf_overflow (const char *buf1, const char *buf2, int bufsize) 128buf_overflow (const char *buf1, const char *buf2, int bufsize)
117{ 129{
118 int len1 = 0, len2 = 0; 130 int len1 = 0, len2 = 0;
119 131
120 if (buf1) 132 if (buf1)
121 len1 = strlen (buf1); 133 len1 = strlen (buf1);
122 if (buf2) 134 if (buf2)
123 len2 = strlen (buf2); 135 len2 = strlen (buf2);
124 if ((len1 + len2) >= bufsize) 136 if ((len1 + len2) >= bufsize)
125 return 1;
126 return 0; 137 return 1;
138 return 0;
127} 139}
128

Diff Legend

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