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.10 by root, Tue Sep 5 19:18:04 2006 UTC vs.
Revision 1.14 by root, Mon Sep 11 23:33:28 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");
37 47
38const char * 48const char *
… …
41 if (!s) 51 if (!s)
42 return s; 52 return s;
43 53
44 HT::iterator i = ht.find (s); 54 HT::iterator i = ht.find (s);
45 55
46 return i != ht.end () 56 return i != ht.end ()? *i : 0;
47 ? *i
48 : 0;
49} 57}
50 58
51const char * 59const char *
52shstr::intern (const char *s) 60shstr::intern (const char *s)
53{ 61{
… …
68// periodically test refcounts == 0 for a few strings 76// periodically test refcounts == 0 for a few strings
69// this is the ONLY thing that erases stuff from ht. keep it that way. 77// this is the ONLY thing that erases stuff from ht. keep it that way.
70void 78void
71shstr::gc () 79shstr::gc ()
72{ 80{
81return; //D
82//D currently disabled: some datastructures might still store them
83//D but their pointers will become invalidated
73 static const char *curpos; 84 static const char *curpos;
74 85
75 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 86 HT::iterator i = curpos ? ht.find (curpos) : ht.begin ();
76 87
77 if (i == ht.end ()) 88 if (i == ht.end ())
78 i = ht.begin (); 89 i = ht.begin ();
79 90
80 // go through all strings roughly once every 4 minutes 91 // go through all strings roughly once every 4 minutes
81 int n = ht.size () / 256 + 16000; 92 int n = ht.size () / 256 + 16;
82 93
83 for (;;) 94 for (;;)
84 { 95 {
85 if (i == ht.end ()) 96 if (i == ht.end ())
86 { 97 {
… …
91 break; 102 break;
92 else if (!refcnt (*i)) 103 else if (!refcnt (*i))
93 { 104 {
94 HT::iterator o = i++; 105 HT::iterator o = i++;
95 const char *s = *o; 106 const char *s = *o;
107
96 ht.erase (o); 108 ht.erase (o);
97 109
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)); 110 //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); 111 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
102 } 112 }
103 else 113 else
104 ++i; 114 ++i;
105 } 115 }
106 116
107 curpos = *i; 117 curpos = *i;
108} 118}
109 119
110//TODO: this should of course not be here 120//TODO: this should of course not be here
121
111/* buf_overflow() - we don't want to exceed the buffer size of 122/* buf_overflow() - we don't want to exceed the buffer size of
112 * buf1 by adding on buf2! Returns true if overflow will occur. 123 * buf1 by adding on buf2! Returns true if overflow will occur.
113 */ 124 */
114 125
115int 126int
116buf_overflow (const char *buf1, const char *buf2, int bufsize) 127buf_overflow (const char *buf1, const char *buf2, int bufsize)
117{ 128{
118 int len1 = 0, len2 = 0; 129 int len1 = 0, len2 = 0;
119 130
120 if (buf1) 131 if (buf1)
121 len1 = strlen (buf1); 132 len1 = strlen (buf1);
122 if (buf2) 133 if (buf2)
123 len2 = strlen (buf2); 134 len2 = strlen (buf2);
124 if ((len1 + len2) >= bufsize) 135 if ((len1 + len2) >= bufsize)
125 return 1;
126 return 0; 136 return 1;
137 return 0;
127} 138}
128

Diff Legend

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