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.17 by root, Tue Sep 12 19:20:06 2006 UTC vs.
Revision 1.53 by root, Sat Nov 17 23:40:00 2018 UTC

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

Diff Legend

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