--- deliantra/server/common/arch.C 2007/06/07 18:55:24 1.65 +++ deliantra/server/common/arch.C 2016/11/18 04:44:13 1.113 @@ -1,48 +1,39 @@ /* - * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. - * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team - * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team - * Copyright (©) 1992,2007 Frank Tore Johansen - * - * Crossfire TRT is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 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 GNU General Public License along - * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * The authors can be reached via e-mail to + * This file is part of Deliantra, the Roguelike Realtime MMORPG. + * + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992 Frank Tore Johansen + * + * 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 */ #include #include -#include -#include #include -#include - -/* The naming of these functions is really poor - they are all - * pretty much named '.._arch_...', but they may more may not - * return archetypes. Some make the arch_to_object call, and thus - * return an object. Perhaps those should be called 'archob' functions - * to denote they return an object derived from the archetype. - * MSW 2003-04-29 - */ +#include -bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing +archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing +arch_ptr archetype::empty; // the hashtable -typedef std::tr1::unordered_map +typedef std::unordered_map < const char *, arch_ptr, @@ -51,8 +42,37 @@ slice_allocator< std::pair > > HT; -static HT ht (5000); +static HT ht (10000); archvec archetypes; +static unordered_vector allarch; +static int dirtycnt; + +// the vector of other_arch references to be resolved +static std::vector< std::pair > postponed_arch_ref; +// the vector of loaded but not yet committed archetypes +static std::vector postponed_arch; + +//+GPL + +/* + * Creates an object. This function is called by archetype::get () + * if it fails to find the appropriate archetype. + * Thus archetype::get() will be guaranteed to always return + * an object, and never NULL. + */ +static object * +create_singularity (const char *name) +{ + LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); + + if (!strcmp (name, "bug")) + abort (); + + object *op = archetype::get (shstr_bug); + op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name); + + return op; +} /** * GROS - This function retrieves an archetype given the name that appears @@ -71,7 +91,7 @@ shstr_cmp name_cmp (name); for_all_archetypes (at) - if (at->archname == name_cmp) + if (at->name == name_cmp) return at; return 0; @@ -88,7 +108,7 @@ shstr_cmp name_cmp (name); for_all_archetypes (at) - if (at->archname == name_cmp && at->type == type) + if (at->name == name_cmp && at->type == type) return at; return 0; @@ -106,7 +126,7 @@ for_all_archetypes (at) if (at->skill == skill_cmp && (type == -1 || type == at->type)) - return arch_to_object (at); + return at->instance (); return 0; } @@ -137,23 +157,22 @@ * - a corresponding object if found; a singularity object if not found. * Note by MSW - it appears that it takes the full name and keeps * shortening it until it finds a match. I re-wrote this so that it - * doesn't malloc it each time - not that this function is used much, + * doesn't allocate it each time - not that this function is used much, * but it otherwise had a big memory leak. */ object * get_archetype_by_object_name (const char *name) { char tmpname[MAX_BUF]; - int i; assign (tmpname, name); - for (i = strlen (tmpname); i > 0; i--) + for (int i = strlen (tmpname); i > 0; i--) { tmpname[i] = 0; if (archetype *at = find_archetype_by_object_name (tmpname)) - return arch_to_object (at); + return at->instance (); } return create_singularity (name); @@ -195,12 +214,13 @@ return 1; /* unpaid is a little more specific */ - if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) + if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID]) return 2; - if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) + + if (!strcmp (cp, "cursed") && op->flag [FLAG_KNOWN_CURSED] && (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED])) return 2; - if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) + if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED]) return 2; /* Allow for things like '100 arrows' */ @@ -228,30 +248,32 @@ * later. So keep it in descending order here, so we try for the best * match first, and work downward. */ + const char *qbn0, *qbn1, *qsn; // query base name/short name caches + if (!strcasecmp (cp, query_name (op))) retval = 20; - else if (!strcasecmp (cp, query_short_name (op))) + else if (!strcasecmp (cp, qsn = query_short_name (op))) retval = 18; - else if (!strcasecmp (cp, query_base_name (op, 0))) + else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0))) retval = 16; - else if (!strcasecmp (cp, query_base_name (op, 1))) + else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1))) retval = 16; else if (op->custom_name && !strcasecmp (cp, op->custom_name)) retval = 15; - else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) + else if (!strncasecmp (cp, qbn0, strlen (cp))) retval = 14; - else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) + else if (!strncasecmp (cp, qbn1, strlen (cp))) retval = 14; /* Do substring checks, so things like 'Str+1' will match. * retval of these should perhaps be lower - they are lower * then the specific strcasecmp aboves, but still higher than * some other match criteria. */ - else if (strstr (query_base_name (op, 1), cp)) + else if (strstr (qbn1, cp)) retval = 12; - else if (strstr (query_base_name (op, 0), cp)) + else if (strstr (qbn0, cp)) retval = 12; - else if (strstr (query_short_name (op), cp)) + else if (strstr (qsn, cp)) retval = 12; /* Check against plural/non plural based on count. */ else if (count > 1 && !strcasecmp (cp, op->name_pl)) @@ -262,7 +284,7 @@ else if (strcasecmp (cp, op->name) == 0 && !count) retval = 4; /* Check for partial custom name, but give a real low priority */ - else if (op->custom_name && strstr (op->custom_name, cp)) + else if (op->custom_name.contains (cp)) retval = 3; if (retval) @@ -277,9 +299,16 @@ return 0; } +//-GPL + +void +archetype::do_delete () +{ + delete this; +} + archetype::archetype (const char *name) { - stub = true; arch = this; this->archname = this->name = this->name_pl = name; } @@ -292,19 +321,21 @@ void archetype::link () { - ht.insert (std::make_pair (archname, this)); - if (!archetypes.contains (this)) - archetypes.insert (this); + { + archetypes.insert (this); + ht.insert (std::make_pair (archname, this)); + } } void archetype::unlink () { - ht.erase (archname); - if (!strcmp (&archname, "Gaea")) fprintf (stderr, "oI\n");//D if (archetypes.contains (this)) - archetypes.erase (this); + { + archetypes.erase (this); + ht.erase (archname); + } } /* @@ -325,24 +356,15 @@ return i->second; } -archetype * -archetype::get (const char *name) +void +archetype::post_load_check () { - if (!name) - { - LOG (llevError, "null archetype requested\n"); - name = "(null)"; - } + assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL])); - archetype *at = find (name); + if (type == SKILL) + add_skill_archetype (this); - if (!at) - { - at = new archetype (name); - at->link (); - } - - return at; + object::post_load_check (); } archetype * @@ -350,27 +372,20 @@ { assert (f.kw == KW_object); - loading_arch = true; // hack to tell parse_kv et al. to behave - std::vector parts; - coroapi::cede_to_tick_every (10); + coroapi::cede_to_tick (); for (;;) { - // the archetype might have been referenced earlier - // so try to find an existing stub archetype first - archetype *at = find (f.get_str ()); - - if (!at || !at->stub) - at = new archetype (f.get_str ()); + archetype *at = new archetype (f.get_str ()); f.next (); #if 0 // implementing it here in the server does neither allow multiple inheritence // nor does it cleanly "just override". it would allow use in map files, though, - // and other resource files dynamically laoded (as opposed to being preprocessed). + // and other resource files dynamically loaded (as opposed to being preprocessed). // not that any of this is relevant as of yet... if (f.kw == KW_inherit) { @@ -384,10 +399,16 @@ } #endif - if (!at->parse_kv (f)) + loading_arch = at; // hack to tell parse_kv et al. to behave + bool parse_ok = at->parse_kv (f); + loading_arch = 0; + + if (!parse_ok) goto fail; + loading_arch = at; // hack to tell parse_kv et al. to behave at->post_load_check (); + loading_arch = 0; parts.push_back (at); @@ -403,8 +424,6 @@ } } - loading_arch = false; - { auto (at, parts.begin ()); @@ -432,124 +451,156 @@ } } - // deactivate existing archetype - for (archetype *at = old_head; at; at = (archetype *)at->more) - at->unlink (); - // assemble new chain - new_head->min_x = new_head->max_x = new_head->x; - new_head->min_y = new_head->max_y = new_head->y; + new_head->max_x = new_head->x; archetype *less = new_head; for (auto (p, parts.begin () + 1); p != parts.end (); ++p) { archetype *at = *p; - if (at->x < new_head->min_x) new_head->min_x = at->x; - if (at->y < new_head->min_y) new_head->min_y = at->y; - if (at->x > new_head->max_x) new_head->max_x = at->x; - if (at->y > new_head->max_y) new_head->max_y = at->y; + // some flags get inherited from the head (probably a lot more) + // doing it here doesn't feel too cozy, but it allows code + // to ignore head checks for these flags, which saves time + at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE]; + at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK]; + at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER]; + at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR]; + + new_head->max_x = max (new_head->max_x, at->x); at->head = new_head; less->more = at; less = at; } - // now activate it - for (auto (p, parts.begin ()); p != parts.end (); ++p) - { - archetype *at = *p; - at->stub = false; - at->link (); - } + postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ()); return new_head; } fail: for (auto (p, parts.begin ()); p != parts.end (); ++p) - (*p)->destroy (true); + (*p)->destroy (); - loading_arch = false; return 0; } -/* - * Initialize global archtype pointers: - */ void -init_archetype_pointers () +archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch) { - ring_arch = archetype::find ("ring"); - amulet_arch = archetype::find ("amulet"); - staff_arch = archetype::find ("staff"); - crown_arch = archetype::find ("crown"); - empty_archetype = archetype::find ("empty_archetype"); + ref = 0; + postponed_arch_ref.push_back (std::pair(&ref, shstr (other_arch))); } -/* - * Creates and returns a new object which is a copy of the given archetype. - * This function returns NULL on failure. - */ -object * -arch_to_object (archetype *at) +void +archetype::commit_load () { - if (!at) + // unlink old archetypes and link in new ones */ + for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p) { - LOG (llevError, "Couldn't find archetype.\n"); - return 0; + archetype *at = *p; + + if (archetype *old = find (at->archname)) + old->unlink (); + + allarch.push_back (at); + + at->link (); + ++dirtycnt; } - object *op = at->clone (); - op->arch = at; - op->instantiate (); + postponed_arch.clear (); - return op; + // now resolve arch references + for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p) + { + arch_ptr *ap = p->first; + archetype *at = find (p->second); + + if (!at) + LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second); + + *ap = at; + } + + postponed_arch_ref.clear (); + + empty = find (shstr_empty_archetype); } -/* - * Creates an object. This function is called by get_archetype() - * if it fails to find the appropriate archetype. - * Thus get_archetype() will be guaranteed to always return - * an object, and never NULL. - */ -object * -create_singularity (const char *name) +void +archetype::gc () { - LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); + int cnt = max (1, min (allarch.size () / 128, dirtycnt)); + dirtycnt = max (0, dirtycnt - cnt); - if (!strcmp (name, "bug")) - abort (); + do + { + static int idx; + + if (idx >= allarch.size ()) + if (idx) + idx = 0; + else + return; + + archetype *at = allarch [idx]; - char buf[MAX_BUF]; - sprintf (buf, "bug, please report (%s)", ARCH_SINGULARITY, name); + if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object + ++idx; + else + { + //LOG (llevDebug, "garbage collect arch %s", &at->archname); + assert (at->arch == at); // verify that refcnt == 1 is truly valid + allarch.erase (idx); + + // break chain + for (object *op = at->head_ (); op; ) + { + object *next = op->more; + op->head = 0; + op->more = 0; + op = next; + } - object *op = get_archetype ("bug"); - op->name = op->name_pl = buf; + at->destroy (); + at->arch = 0; + } + } + while (--cnt); +} +object * +archetype::instance () +{ + object *op = clone (); + op->instantiate (); return op; } +//+GPL + /* * Finds which archetype matches the given name, and returns a new * object containing a copy of the archetype. */ object * -get_archetype (const char *name) +archetype::get (const char *name) { - archetype *at = archetype::find (name); + archetype *at = find (name); if (!at) return create_singularity (name); - return arch_to_object (at); + return at->instance (); } /* * Returns the first archetype using the given type. * Used in treasure-generation. */ -archetype * +static archetype * type_to_archetype (int type) { for_all_archetypes (at) @@ -567,17 +618,15 @@ object * clone_arch (int type) { - archetype *at; + archetype *at = type_to_archetype (type); - if ((at = type_to_archetype (type)) == NULL) + if (!at) { LOG (llevError, "Can't clone archetype %d\n", type); return 0; } - object *op = at->clone (); - op->instantiate (); - return op; + return at->instance (); } /* @@ -590,7 +639,7 @@ while (at) { - op = arch_to_object (at); + op = at->instance (); op->x = at->x; op->y = at->y; @@ -608,3 +657,5 @@ return head; } +//-GPL +