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.51 by root, Fri Nov 18 04:44:13 2016 UTC vs.
Revision 1.57 by root, Wed Dec 5 22:14:02 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / 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
5 * 6 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 7 * 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 * 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 * Free Software Foundation, either version 3 of the License, or (at your
… …
25 */ 26 */
26 27
27#include <cstring> 28#include <cstring>
28#include <cstdlib> 29#include <cstdlib>
29#include <glib.h> 30#include <glib.h>
30#include <unordered_set>
31 31
32#include <flat_hash_map.hpp>
33
32#include "global.h" 34#include <global.h>
33 35
34size_t shstr_alloc; 36size_t shstr_alloc;
35 37
36typedef std::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT; 38typedef ska::flat_hash_set<const char *, str_hash, str_equal, slice_allocator<const char *>> HT;
37 39
38static HT ht; 40static HT ht;
39static int next_gc; 41static int next_gc;
40 42
41#define NUM_INT 3 43#define NUM_INT 3
… …
74shstr::find (const char *s) 76shstr::find (const char *s)
75{ 77{
76 if (!s) 78 if (!s)
77 return s; 79 return s;
78 80
79 auto (i, ht.find (s)); 81 auto i = ht.find (s);
80 82
81 return i != ht.end ()? *i : 0; 83 return i != ht.end ()? *i : 0;
82} 84}
83 85
84const char * 86const char *
… …
102// periodically test refcounts == 0 for a few strings 104// periodically test refcounts == 0 for a few strings
103// 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.
104void 106void
105shstr::gc () 107shstr::gc ()
106{ 108{
107 if (expect_true (next_gc > 0)) 109 if (ecb_expect_true (--next_gc > 0))
108 return; 110 return;
109 111
110 static const char *curpos; 112 static const char *curpos;
111 113
112 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 114 auto i = curpos ? ht.find (curpos) : ht.begin ();
113 115
114 if (i == ht.end ()) 116 if (i == ht.end ())
115 i = ht.begin (); 117 i = ht.begin ();
116 118
117 int n = ht.size () / 256 + 16; 119 int n = ht.size () / 256 + 16;
… …
126 } 128 }
127 else if (!--n) 129 else if (!--n)
128 break; 130 break;
129 else if (!refcnt (*i)) 131 else if (!refcnt (*i))
130 { 132 {
131 auto (o, i++);
132 const char *s = *o; 133 const char *s = *i;
133 134
134 ht.erase (o); 135 i = ht.erase (i);
135 136
136 //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));
137 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1; 138 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
138 shstr_alloc -= alloc; 139 shstr_alloc -= alloc;
139 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT)); 140 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));

Diff Legend

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