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.20 by root, Thu Sep 14 18:13:01 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 */
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>
7
8#include <glib.h> 29#include <glib.h>
9 30
10#include <tr1/unordered_set> 31#include <flat_hash_map.hpp>
11 32
12#include "global.h" 33#include <global.h>
13 34
35size_t shstr_alloc;
36
14typedef 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;
15 38
16static HT ht; 39static HT ht;
40static int next_gc;
41
42#define NUM_INT 3
17 43
18static const char * 44static const char *
19makevec (const char *s) 45makevec (const char *s)
20{ 46{
21 int len = strlen (s); 47 int len = strlen (s);
48 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
22 49
23 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;
24 53
54 shstr::hash (v) = strhsh (s);
25 shstr::length (v) = len; 55 shstr::length (v) = len;
26 shstr::refcnt (v) = 1; 56 shstr::refcnt (v) = 1;
27 57
28 memcpy ((char *) v, s, len + 1); 58 memcpy (v, s, len + 1);
29 59
30 return v; 60 return v;
31} 61}
32 62
33static const char * 63shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
34makenull () 64
65bool
66shstr_tmp::contains (const char *substring) const
35{ 67{
36 const char *s = makevec ("(null)"); 68 //TODO: this is supposed to check for comma-seperation...
37 shstr::length (s) = 0; 69 return s != null ()
38 return s; 70 && substring
71 && strstr (s, substring);
39} 72}
40
41const char *shstr::null = makenull ();
42 73
43const char * 74const char *
44shstr::find (const char *s) 75shstr::find (const char *s)
45{ 76{
46 if (!s) 77 if (!s)
47 return s; 78 return s;
48 79
49 AUTODECL (i, ht.find (s)); 80 auto (i, ht.find (s));
50 81
51 return i != ht.end ()? *i : 0; 82 return i != ht.end ()? *i : 0;
52} 83}
53 84
54const char * 85const char *
55shstr::intern (const char *s) 86shstr::intern (const char *s)
56{ 87{
57 if (!s) 88 if (!s)
58 return null; 89 return null ();
59 90
60 if (const char *found = find (s)) 91 if (const char *found = find (s))
61 { 92 {
62 ++refcnt (found); 93 ++refcnt (found);
63 return found; 94 return found;
64 } 95 }
65 96
97 --next_gc;
66 s = makevec (s); 98 s = makevec (s);
67 ht.insert (s); 99 ht.insert (s);
68 return s; 100 return s;
69} 101}
70 102
71// periodically test refcounts == 0 for a few strings 103// periodically test refcounts == 0 for a few strings
72// 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.
73void 105void
74shstr::gc () 106shstr::gc ()
75{ 107{
108 if (expect_true (next_gc > 0))
109 return;
110
76 static const char *curpos; 111 static const char *curpos;
77 112
78 AUTODECL (i, curpos ? ht.find (curpos) : ht.begin ()); 113 auto (i, curpos ? ht.find (curpos) : ht.begin ());
79 114
80 if (i == ht.end ()) 115 if (i == ht.end ())
81 i = ht.begin (); 116 i = ht.begin ();
82 117
83 // go through all strings roughly once every 4 minutes
84 int n = ht.size () / 256 + 16; 118 int n = ht.size () / 256 + 16;
119 next_gc += n >> 1;
85 120
86 for (;;) 121 for (;;)
87 { 122 {
88 if (i == ht.end ()) 123 if (i == ht.end ())
89 { 124 {
… …
92 } 127 }
93 else if (!--n) 128 else if (!--n)
94 break; 129 break;
95 else if (!refcnt (*i)) 130 else if (!refcnt (*i))
96 { 131 {
97 AUTODECL (o, i++); 132 auto (o, i++);
98 const char *s = *o; 133 const char *s = *o;
99 134
100 ht.erase (o); 135 ht.erase (o);
101 136
102 //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));
103 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));
104 } 141 }
105 else 142 else
106 ++i; 143 ++i;
107 } 144 }
108 145
109 curpos = *i; 146 curpos = *i;
110} 147}
111 148
112shstr 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
113 155
114// what weird misoptimisation is this again? 156materialtype_t material_null;
115const shstr undead_name ("undead");
116 157
117//TODO: this should of course not be here 158struct freed_map freed_map;
118
119/* buf_overflow() - we don't want to exceed the buffer size of
120 * buf1 by adding on buf2! Returns true if overflow will occur.
121 */
122
123int
124buf_overflow (const char *buf1, const char *buf2, int bufsize)
125{
126 int len1 = 0, len2 = 0;
127
128 if (buf1)
129 len1 = strlen (buf1);
130 if (buf2)
131 len2 = strlen (buf2);
132 if ((len1 + len2) >= bufsize)
133 return 1;
134 return 0;
135}

Diff Legend

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