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

Diff Legend

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