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.51 by root, Fri Nov 18 04:44:13 2016 UTC

1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
19 *
20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */
22
1/* 23/*
2 * shstr.C 24 * shstr.C
3 */ 25 */
4 26
5#include <cstring> 27#include <cstring>
6#include <cstdlib> 28#include <cstdlib>
29#include <glib.h>
30#include <unordered_set>
7 31
8#include <tr1/unordered_set> 32#include "global.h"
9 33
10#include "shstr.h" 34size_t shstr_alloc;
11#include "util.h"
12 35
13typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT; 36typedef std::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
14 37
15static HT ht; 38static HT ht;
39static int next_gc;
16 40
17static const char *makevec (const char *s) 41#define NUM_INT 3
42
43static const char *
44makevec (const char *s)
18{ 45{
19 int len = strlen (s); 46 int len = strlen (s);
47 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
20 48
21 const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1)); 49 shstr_alloc += alloc;
50 char *v = (char *)g_slice_alloc (alloc);
51 v += sizeof (uint32_t) * NUM_INT;
22 52
53 shstr::hash (v) = strhsh (s);
23 shstr::length (v) = len; 54 shstr::length (v) = len;
24 shstr::refcnt (v) = 1; 55 shstr::refcnt (v) = 1;
25 56
26 memcpy ((char *)v, s, len + 1); 57 memcpy (v, s, len + 1);
27 58
28 return v; 59 return v;
29} 60}
30 61
31const char *shstr::null = makevec ("<nil>"); 62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
32 63
33// what weird misoptimisation is this again? 64bool
34const shstr undead_name ("undead"); 65shstr_tmp::contains (const char *substring) const
66{
67 //TODO: this is supposed to check for comma-seperation...
68 return s != null ()
69 && substring
70 && strstr (s, substring);
71}
35 72
36const char * 73const char *
37shstr::find (const char *s) 74shstr::find (const char *s)
38{ 75{
39 if (!s) 76 if (!s)
40 return s; 77 return s;
41 78
42 HT::iterator i = ht.find (s); 79 auto (i, ht.find (s));
43 80
44 return i != ht.end () 81 return i != ht.end ()? *i : 0;
45 ? *i
46 : 0;
47} 82}
48 83
49const char * 84const char *
50shstr::intern (const char *s) 85shstr::intern (const char *s)
51{ 86{
52 if (!s) 87 if (!s)
53 return null; 88 return null ();
54 89
55 if (const char *found = find (s)) 90 if (const char *found = find (s))
56 { 91 {
57 ++refcnt (found); 92 ++refcnt (found);
58 return found; 93 return found;
59 } 94 }
60 95
96 --next_gc;
61 s = makevec (s); 97 s = makevec (s);
62 ht.insert (s); 98 ht.insert (s);
63 return s; 99 return s;
64} 100}
65 101
66// periodically test refcounts == 0 for a few strings 102// periodically test refcounts == 0 for a few strings
67// this is the ONLY thing that erases stuff from ht. keep it that way. 103// this is the ONLY thing that erases stuff from ht. keep it that way.
68void 104void
69shstr::gc () 105shstr::gc ()
70{ 106{
107 if (expect_true (next_gc > 0))
108 return;
109
71 static const char *curpos; 110 static const char *curpos;
72 111
73 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 112 auto (i, curpos ? ht.find (curpos) : ht.begin ());
74 113
75 if (i == ht.end ()) 114 if (i == ht.end ())
76 i = ht.begin (); 115 i = ht.begin ();
77 116
78 // go through all strings roughly once every 4 minutes
79 int n = ht.size () / 256 + 16; 117 int n = ht.size () / 256 + 16;
118 next_gc += n >> 1;
80 119
81 for (;;) 120 for (;;)
82 { 121 {
83 if (i == ht.end ()) 122 if (i == ht.end ())
84 { 123 {
… …
87 } 126 }
88 else if (!--n) 127 else if (!--n)
89 break; 128 break;
90 else if (!refcnt (*i)) 129 else if (!refcnt (*i))
91 { 130 {
92 HT::iterator o = i++; 131 auto (o, i++);
93 const char *s = *o; 132 const char *s = *o;
133
94 ht.erase (o); 134 ht.erase (o);
95 135
96 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 136 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
97 free (-2 + (int *)s); 137 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
138 shstr_alloc -= alloc;
139 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
98 } 140 }
99 else 141 else
100 ++i; 142 ++i;
101 } 143 }
102 144
103 curpos = *i; 145 curpos = *i;
104} 146}
105 147
106//TODO: this should of course not be here 148// declare these here to get correct initialisation order
107/* buf_overflow() - we don't want to exceed the buffer size of 149#define def2(id,str) const shstr id (str);
108 * buf1 by adding on buf2! Returns true if overflow will occur. 150#define def(id) def2(shstr_ ## id, # id)
109 */ 151# include "shstrinc.h"
152#undef def
153#undef def2
110 154
111int 155materialtype_t material_null;
112buf_overflow (const char *buf1, const char *buf2, int bufsize)
113{
114 int len1 = 0, len2 = 0;
115 156
116 if (buf1) 157struct freed_map freed_map;
117 len1 = strlen (buf1);
118 if (buf2)
119 len2 = strlen (buf2);
120 if ((len1 + len2) >= bufsize)
121 return 1;
122 return 0;
123}
124

Diff Legend

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