ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/arch.C
(Generate patch)

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.106 by root, Thu May 6 22:35:41 2010 UTC vs.
Revision 1.115 by root, Sat Nov 17 23:33:17 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 (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / 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 (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <cassert> 25#include <cassert>
26#include <functional>
27
28#include <flat_hash_map.hpp>
26 29
27#include <global.h> 30#include <global.h>
28
29#include <tr1/functional>
30#include <tr1/unordered_map>
31 31
32archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing 32archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
33arch_ptr archetype::empty; 33arch_ptr archetype::empty;
34 34
35// the hashtable 35// the hashtable
36typedef std::tr1::unordered_map 36typedef ska::flat_hash_map<
37 <
38 const char *, 37 const char *,
39 arch_ptr, 38 arch_ptr,
40 str_hash, 39 str_hash,
41 str_equal, 40 str_equal,
42 slice_allocator< std::pair<const char *const, arch_ptr> > 41 slice_allocator< std::pair<const char *const, arch_ptr> >
43 > HT; 42> HT;
44 43
45static HT ht (10000); 44static HT ht (10000);
46archvec archetypes; 45archvec archetypes;
47static unordered_vector<archetype *> allarch; 46static unordered_vector<archetype *> allarch;
48static int dirtycnt; 47static int dirtycnt;
… …
53static std::vector<archetype *> postponed_arch; 52static std::vector<archetype *> postponed_arch;
54 53
55//+GPL 54//+GPL
56 55
57/* 56/*
58 * Creates an object. This function is called by get_archetype () 57 * Creates an object. This function is called by archetype::get ()
59 * if it fails to find the appropriate archetype. 58 * if it fails to find the appropriate archetype.
60 * Thus get_archetype() will be guaranteed to always return 59 * Thus archetype::get() will be guaranteed to always return
61 * an object, and never NULL. 60 * an object, and never NULL.
62 */ 61 */
63static object * 62static object *
64create_singularity (const char *name) 63create_singularity (const char *name)
65{ 64{
… …
530} 529}
531 530
532void 531void
533archetype::gc () 532archetype::gc ()
534{ 533{
535 int cnt = max (1, min (allarch.size () / 128, dirtycnt)); 534 int cnt = max (1, min<int> (allarch.size () / 128, dirtycnt));
536 dirtycnt = max (0, dirtycnt - cnt); 535 dirtycnt = max (0, dirtycnt - cnt);
537 536
538 do 537 do
539 { 538 {
540 static int idx; 539 static int idx;
… …
584/* 583/*
585 * Finds which archetype matches the given name, and returns a new 584 * Finds which archetype matches the given name, and returns a new
586 * object containing a copy of the archetype. 585 * object containing a copy of the archetype.
587 */ 586 */
588object * 587object *
589get_archetype (const char *name)
590{
591 return archetype::get (name);
592}
593
594object *
595archetype::get (const char *name) 588archetype::get (const char *name)
596{ 589{
597 archetype *at = find (name); 590 archetype *at = find (name);
598 591
599 if (!at) 592 if (!at)

Diff Legend

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