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.12 by root, Thu Sep 7 07:52:58 2006 UTC vs.
Revision 1.15 by root, Tue Sep 12 00:26:16 2006 UTC

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

Diff Legend

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