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.21 by root, Mon Apr 16 15:41:26 2007 UTC

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

Diff Legend

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