--- deliantra/server/common/shstr.C 2011/06/03 08:36:45 1.47
+++ deliantra/server/common/shstr.C 2018/12/05 19:03:26 1.56
@@ -1,22 +1,23 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- *
+ *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
* Deliantra is free software: you can redistribute it and/or modify it under
* the terms of the Affero GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the Affero GNU General Public License
* and the GNU General Public License along with this program. If not, see
* .
- *
+ *
* The authors can be reached via e-mail to
*/
@@ -27,13 +28,14 @@
#include
#include
#include
-#include
-#include "global.h"
+#include
+
+#include
size_t shstr_alloc;
-typedef std::tr1::unordered_set > HT;
+typedef ska::flat_hash_set> HT;
static HT ht;
static int next_gc;
@@ -76,7 +78,7 @@
if (!s)
return s;
- auto (i, ht.find (s));
+ auto i = ht.find (s);
return i != ht.end ()? *i : 0;
}
@@ -104,12 +106,12 @@
void
shstr::gc ()
{
- if (expect_true (next_gc > 0))
+ if (ecb_expect_true (next_gc > 0))
return;
static const char *curpos;
- auto (i, curpos ? ht.find (curpos) : ht.begin ());
+ auto i = curpos ? ht.find (curpos) : ht.begin ();
if (i == ht.end ())
i = ht.begin ();
@@ -128,10 +130,9 @@
break;
else if (!refcnt (*i))
{
- auto (o, i++);
- const char *s = *o;
+ const char *s = *i;
- ht.erase (o);
+ i = ht.erase (i);
//printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;