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.16 by root, Tue Sep 12 00:53:56 2006 UTC vs.
Revision 1.56 by root, Wed Dec 5 19:03:26 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
23 len = strlen (s); 48 int len = strlen (s);
49 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
24 50
25 const char * 51 shstr_alloc += alloc;
26 v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + len + 1)); 52 char *v = (char *)g_slice_alloc (alloc);
53 v += sizeof (uint32_t) * NUM_INT;
27 54
55 shstr::hash (v) = strhsh (s);
28 shstr::length (v) = len; 56 shstr::length (v) = len;
29 shstr::refcnt (v) = 1; 57 shstr::refcnt (v) = 1;
30 58
31 memcpy ((char *) v, s, len + 1); 59 memcpy (v, s, len + 1);
32 60
33 return v; 61 return v;
34} 62}
35 63
36const char *shstr::null = makevec ("<nil>"); 64shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
65
66bool
67shstr_tmp::contains (const char *substring) const
68{
69 //TODO: this is supposed to check for comma-seperation...
70 return s != null ()
71 && substring
72 && strstr (s, substring);
73}
37 74
38const char * 75const char *
39shstr::find (const char *s) 76shstr::find (const char *s)
40{ 77{
41 if (!s) 78 if (!s)
42 return s; 79 return s;
43 80
44 HT::iterator i = ht.find (s); 81 auto i = ht.find (s);
45 82
46 return i != ht.end ()? *i : 0; 83 return i != ht.end ()? *i : 0;
47} 84}
48 85
49const char * 86const char *
50shstr::intern (const char *s) 87shstr::intern (const char *s)
51{ 88{
52 if (!s) 89 if (!s)
53 return null; 90 return null ();
54 91
55 if (const char *found = find (s)) 92 if (const char *found = find (s))
56 { 93 {
57 ++refcnt (found); 94 ++refcnt (found);
58 return found; 95 return found;
59 } 96 }
60 97
98 --next_gc;
61 s = makevec (s); 99 s = makevec (s);
62 ht.insert (s); 100 ht.insert (s);
63 return s; 101 return s;
64} 102}
65 103
66// periodically test refcounts == 0 for a few strings 104// periodically test refcounts == 0 for a few strings
67// 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.
68void 106void
69shstr::gc () 107shstr::gc ()
70{ 108{
71return; //D 109 if (ecb_expect_true (next_gc > 0))
72//D currently disabled: some datastructures might still store them 110 return;
73//D but their pointers will become invalidated 111
74 static const char *curpos; 112 static const char *curpos;
75 113
76 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 114 auto i = curpos ? ht.find (curpos) : ht.begin ();
77 115
78 if (i == ht.end ()) 116 if (i == ht.end ())
79 i = ht.begin (); 117 i = ht.begin ();
80 118
81 // go through all strings roughly once every 4 minutes
82 int n = ht.size () / 256 + 16; 119 int n = ht.size () / 256 + 16;
120 next_gc += n >> 1;
83 121
84 for (;;) 122 for (;;)
85 { 123 {
86 if (i == ht.end ()) 124 if (i == ht.end ())
87 { 125 {
… …
90 } 128 }
91 else if (!--n) 129 else if (!--n)
92 break; 130 break;
93 else if (!refcnt (*i)) 131 else if (!refcnt (*i))
94 { 132 {
95 HT::iterator o = i++;
96 const char *s = *o; 133 const char *s = *i;
97 134
98 ht.erase (o); 135 i = ht.erase (i);
99 136
100 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 137 //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); 138 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
139 shstr_alloc -= alloc;
140 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
102 } 141 }
103 else 142 else
104 ++i; 143 ++i;
105 } 144 }
106 145
107 curpos = *i; 146 curpos = *i;
108} 147}
109 148
110shstr skill_names[NUM_SKILLS]; 149// declare these here to get correct initialisation order
150#define def2(id,str) const shstr id (str);
151#define def(id) def2(shstr_ ## id, # id)
152# include "shstrinc.h"
153#undef def
154#undef def2
111 155
112// what weird misoptimisation is this again? 156materialtype_t material_null;
113const shstr undead_name ("undead");
114 157
115//TODO: this should of course not be here 158struct freed_map freed_map;
116
117/* buf_overflow() - we don't want to exceed the buffer size of
118 * buf1 by adding on buf2! Returns true if overflow will occur.
119 */
120
121int
122buf_overflow (const char *buf1, const char *buf2, int bufsize)
123{
124 int len1 = 0, len2 = 0;
125
126 if (buf1)
127 len1 = strlen (buf1);
128 if (buf2)
129 len2 = strlen (buf2);
130 if ((len1 + len2) >= bufsize)
131 return 1;
132 return 0;
133}

Diff Legend

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