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.24 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.52 by root, Sat Nov 17 23:33:17 2018 UTC

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

Diff Legend

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