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.18 by root, Tue Sep 12 20:55:40 2006 UTC vs.
Revision 1.52 by root, Sat Nov 17 23:33:17 2018 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 */
1 22
2/* 23/*
3 * shstr.C 24 * shstr.C
4 */ 25 */
5 26
6#include <cstring> 27#include <cstring>
7#include <cstdlib> 28#include <cstdlib>
8
9#include <glib.h> 29#include <glib.h>
10 30
11#include <tr1/unordered_set> 31#include <flat_hash_map.hpp>
12 32
13#include "global.h" 33#include <global.h>
14 34
35size_t shstr_alloc;
36
15typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT; 37typedef ska::flat_hash_set<const char *, str_hash, str_equal, slice_allocator<const char *>> HT;
16 38
17static HT ht; 39static HT ht;
40static int next_gc;
41
42#define NUM_INT 3
18 43
19static const char * 44static const char *
20makevec (const char *s) 45makevec (const char *s)
21{ 46{
22 int len = strlen (s); 47 int len = strlen (s);
48 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
23 49
24 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); 50 shstr_alloc += alloc;
51 char *v = (char *)g_slice_alloc (alloc);
52 v += sizeof (uint32_t) * NUM_INT;
25 53
54 shstr::hash (v) = strhsh (s);
26 shstr::length (v) = len; 55 shstr::length (v) = len;
27 shstr::refcnt (v) = 1; 56 shstr::refcnt (v) = 1;
28 57
29 memcpy ((char *) v, s, len + 1); 58 memcpy (v, s, len + 1);
30 59
31 return v; 60 return v;
32} 61}
33 62
34static const char * 63shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
35makenull () 64
65bool
66shstr_tmp::contains (const char *substring) const
36{ 67{
37 const char *s = makevec ("(null)"); 68 //TODO: this is supposed to check for comma-seperation...
38 shstr::length (s) = 0; 69 return s != null ()
39 return s; 70 && substring
71 && strstr (s, substring);
40} 72}
41
42const char *shstr::null = makenull ();
43 73
44const char * 74const char *
45shstr::find (const char *s) 75shstr::find (const char *s)
46{ 76{
47 if (!s) 77 if (!s)
48 return s; 78 return s;
49 79
50 HT::iterator i = ht.find (s); 80 auto (i, ht.find (s));
51 81
52 return i != ht.end ()? *i : 0; 82 return i != ht.end ()? *i : 0;
53} 83}
54 84
55const char * 85const char *
56shstr::intern (const char *s) 86shstr::intern (const char *s)
57{ 87{
58 if (!s) 88 if (!s)
59 return null; 89 return null ();
60 90
61 if (const char *found = find (s)) 91 if (const char *found = find (s))
62 { 92 {
63 ++refcnt (found); 93 ++refcnt (found);
64 return found; 94 return found;
65 } 95 }
66 96
97 --next_gc;
67 s = makevec (s); 98 s = makevec (s);
68 ht.insert (s); 99 ht.insert (s);
69 return s; 100 return s;
70} 101}
71 102
72// periodically test refcounts == 0 for a few strings 103// periodically test refcounts == 0 for a few strings
73// this is the ONLY thing that erases stuff from ht. keep it that way. 104// this is the ONLY thing that erases stuff from ht. keep it that way.
74void 105void
75shstr::gc () 106shstr::gc ()
76{ 107{
77return; //D 108 if (expect_true (next_gc > 0))
78//D currently disabled: some datastructures might still store them 109 return;
79//D but their pointers will become invalidated 110
80 static const char *curpos; 111 static const char *curpos;
81 112
82 HT::iterator i = curpos ? ht.find (curpos) : ht.begin (); 113 auto (i, curpos ? ht.find (curpos) : ht.begin ());
83 114
84 if (i == ht.end ()) 115 if (i == ht.end ())
85 i = ht.begin (); 116 i = ht.begin ();
86 117
87 // go through all strings roughly once every 4 minutes
88 int n = ht.size () / 256 + 16; 118 int n = ht.size () / 256 + 16;
119 next_gc += n >> 1;
89 120
90 for (;;) 121 for (;;)
91 { 122 {
92 if (i == ht.end ()) 123 if (i == ht.end ())
93 { 124 {
… …
96 } 127 }
97 else if (!--n) 128 else if (!--n)
98 break; 129 break;
99 else if (!refcnt (*i)) 130 else if (!refcnt (*i))
100 { 131 {
101 HT::iterator o = i++; 132 auto (o, i++);
102 const char *s = *o; 133 const char *s = *o;
103 134
104 ht.erase (o); 135 ht.erase (o);
105 136
106 //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));
107 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));
108 } 141 }
109 else 142 else
110 ++i; 143 ++i;
111 } 144 }
112 145
113 curpos = *i; 146 curpos = *i;
114} 147}
115 148
116shstr 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
117 155
118// what weird misoptimisation is this again? 156materialtype_t material_null;
119const shstr undead_name ("undead");
120 157
121//TODO: this should of course not be here 158struct 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