--- deliantra/server/common/arch.C 2006/09/04 17:16:19 1.12 +++ deliantra/server/common/arch.C 2010/03/26 01:04:43 1.101 @@ -1,64 +1,78 @@ /* - * static char *rcsid_arch_c = - * "$Id: arch.C,v 1.12 2006/09/04 17:16:19 root Exp $"; + * This file is part of Deliantra, the Roguelike Realtime MMORPG. + * + * Copyright (©) 2005,2006,2007,2008,2009,2010 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 */ -/* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2002 Mark Wedel & Crossfire Development Team - Copyright (C) 1992 Frank Tore Johansen - - This program 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 this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - The authors can be reached via e-mail at crossfire-devel@real-time.com -*/ - #include -#include - #include -#include -#include -#include -/* IF set, does a little timing on the archetype load. */ -#define TIME_ARCH_LOAD 0 +#include +#include -static void add_arch (archetype * at); +archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing +arch_ptr archetype::empty; -static archetype *arch_table[ARCHTABLE]; -int arch_cmp = 0; /* How many strcmp's */ -int arch_search = 0; /* How many searches */ -int arch_init; /* True if doing arch initialization */ +// the hashtable +typedef std::tr1::unordered_map + < + const char *, + arch_ptr, + str_hash, + str_equal, + slice_allocator< std::pair > + > HT; + +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; -/* 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 +//+GPL + +/* + * 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. */ +static object * +create_singularity (const char *name) +{ + LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); -#if USE_UNORDERED_MAP -// the hashtable -typedef std::tr1::unordered_map HT; + if (!strcmp (name, "bug")) + abort (); -static HT ht; -#endif + 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 @@ -74,17 +88,13 @@ archetype * find_archetype_by_object_name (const char *name) { - archetype *at; + shstr_cmp name_cmp (name); - if (name == NULL) - return (archetype *) NULL; + for_all_archetypes (at) + if (at->name == name_cmp) + return at; - for (at = first_archetype; at != NULL; at = at->next) - { - if (!strcmp (at->clone.name, name)) - return at; - } - return NULL; + return 0; } /** @@ -95,18 +105,13 @@ archetype * find_archetype_by_object_type_name (int type, const char *name) { - archetype *at; + shstr_cmp name_cmp (name); - if (name == NULL) - return NULL; - - for (at = first_archetype; at != NULL; at = at->next) - { - if (at->clone.type == type && strcmp (at->clone.name, name) == 0) - return at; - } + for_all_archetypes (at) + if (at->name == name_cmp && at->type == type) + return at; - return NULL; + return 0; } /* This is a lot like the above function. Instead, we are trying to match @@ -117,18 +122,13 @@ object * get_archetype_by_skill_name (const char *skill, int type) { - archetype * - at; + shstr_cmp skill_cmp (skill); - if (skill == NULL) - return NULL; + for_all_archetypes (at) + if (at->skill == skill_cmp && (type == -1 || type == at->type)) + return at->instance (); - for (at = first_archetype; at != NULL; at = at->next) - { - if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill))) - return arch_to_object (at); - } - return NULL; + return 0; } /* similiar to above - this returns the first archetype @@ -141,15 +141,11 @@ archetype * get_archetype_by_type_subtype (int type, int subtype) { - archetype * - at; + for_all_archetypes (at) + if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype)) + return at; - for (at = first_archetype; at != NULL; at = at->next) - { - if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype)) - return at; - } - return NULL; + return 0; } /** @@ -161,60 +157,51 @@ * - 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) { - archetype * - at; - char - tmpname[MAX_BUF]; - int - i; - - strncpy (tmpname, name, MAX_BUF - 1); - tmpname[MAX_BUF - 1] = 0; - for (i = strlen (tmpname); i > 0; i--) + char tmpname[MAX_BUF]; + + assign (tmpname, name); + + for (int i = strlen (tmpname); i > 0; i--) { tmpname[i] = 0; - at = find_archetype_by_object_name (tmpname); - if (at != NULL) - { - return arch_to_object (at); - } + + if (archetype *at = find_archetype_by_object_name (tmpname)) + return at->instance (); } + return create_singularity (name); } - /* This is a subset of the parse_id command. Basically, name can be - * a string seperated lists of things to match, with certain keywords. - * pl is the player (only needed to set count properly) - * op is the item we are trying to match. Calling function takes care - * of what action might need to be done and if it is valid - * (pickup, drop, etc.) Return NONZERO if we have a match. A higher - * value means a better match. 0 means no match. - * - * Brief outline of the procedure: - * We take apart the name variable into the individual components. - * cases for 'all' and unpaid are pretty obvious. - * Next, we check for a count (either specified in name, or in the - * player object.) - * If count is 1, make a quick check on the name. - * IF count is >1, we need to make plural name. Return if match. - * Last, make a check on the full name. - */ +/* This is a subset of the parse_id command. Basically, name can be + * a string seperated lists of things to match, with certain keywords. + * pl is the player (only needed to set count properly) + * op is the item we are trying to match. Calling function takes care + * of what action might need to be done and if it is valid + * (pickup, drop, etc.) Return NONZERO if we have a match. A higher + * value means a better match. 0 means no match. + * + * Brief outline of the procedure: + * We take apart the name variable into the individual components. + * cases for 'all' and unpaid are pretty obvious. + * Next, we check for a count (either specified in name, or in the + * player object.) + * If count is 1, make a quick check on the name. + * IF count is >1, we need to make plural name. Return if match. + * Last, make a check on the full name. + */ int -item_matched_string (object * pl, object * op, const char *name) +item_matched_string (object *pl, object *op, const char *name) { - char * - cp, - local_name[MAX_BUF]; - int - count, - retval = 0; - strcpy (local_name, name); /* strtok is destructive to name */ + char *cp, local_name[MAX_BUF]; + int count, retval = 0; + + assign (local_name, name); /* strtok is destructive to name */ for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) { @@ -229,6 +216,7 @@ /* unpaid is a little more specific */ if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) return 2; + if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) return 2; @@ -260,580 +248,363 @@ * 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)) - { - retval = 6; - } + retval = 6; else if (count == 1 && !strcasecmp (op->name, cp)) - { - retval = 6; - } + retval = 6; /* base name matched - not bad */ 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) { if (pl->type == PLAYER) pl->contr->count = count; + return retval; } } - return 0; -} - -/* - * Initialises the internal linked list of archetypes (read from file). - * Then the global "empty_archetype" pointer is initialised. - * Then the blocksview[] array is initialised. - */ - -void -init_archetypes (void) -{ /* called from add_player() and edit() */ - if (first_archetype != NULL) /* Only do this once */ - return; - arch_init = 1; - load_archetypes (); - arch_init = 0; - empty_archetype = find_archetype ("empty_archetype"); -/* init_blocksview();*/ -} -/* - * Stores debug-information about how efficient the hashtable - * used for archetypes has been in the static errmsg array. - */ - -void -arch_info (object * op) -{ - sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp); - new_draw_info (NDI_BLACK, 0, op, errmsg); + return 0; } -/* - * Initialise the hashtable used by the archetypes. - */ +//-GPL -void -clear_archetable (void) +archetype::archetype (const char *name) { - memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *)); + arch = this; + this->archname = this->name = this->name_pl = name; } -/* - * An alternative way to init the hashtable which is slower, but _works_... - */ - -void -init_archetable (void) +archetype::~archetype () { - archetype *at; - - LOG (llevDebug, " Setting up archetable...\n"); - - for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) - add_arch (at); - - LOG (llevDebug, "done\n"); + unlink (); } -/* - * Dumps an archetype to debug-level output. - */ - void -dump_arch (archetype * at) +archetype::link () { - dump_object (&at->clone); -} - -/* - * Dumps _all_ archetypes to debug-level output. - * If you run crossfire with debug, and enter DM-mode, you can trigger - * this with the O key. - */ - -void -dump_all_archetypes (void) -{ - archetype * - at; - for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) + if (!archetypes.contains (this)) { - dump_arch (at); - fprintf (logfile, "%s\n", errmsg); + archetypes.insert (this); + ht.insert (std::make_pair (archname, this)); } } void -free_all_archs (void) +archetype::unlink () { - archetype * - at, * - next; - int - i = 0, f = 0; - - for (at = first_archetype; at != NULL; at = next) + if (archetypes.contains (this)) { - if (at->more) - next = at->more; - else - next = at->next; - - delete - at; - i++; + archetypes.erase (this); + ht.erase (archname); } - LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); } /* - * Allocates, initialises and returns the pointer to an archetype structure. + * Finds, using the hashtable, which archetype matches the given name. + * returns a pointer to the found archetype, otherwise NULL. */ -// TODO: should become constructor archetype * -get_archetype_struct (void) +archetype::find (const char *name) { - archetype * - arch; - - arch = new archetype; + if (!name) + return 0; - clear_object (&arch->clone); /* to initial state other also */ - CLEAR_FLAG (&arch->clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ - SET_FLAG (&arch->clone, FLAG_REMOVED); /* doesn't copy these flags... */ + auto (i, ht.find (name)); - return arch; + if (i == ht.end ()) + return 0; + else + return i->second; } -/* - * Reads/parses the archetype-file, and copies into a linked list - * of archetype-structures. - */ void -first_arch_pass (object_thawer & fp) +archetype::post_load_check () +{ + object::post_load_check (); + + assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL])); +} + +archetype * +archetype::read (object_thawer &f) { - object * - op; - archetype * - at, * - head = NULL, *last_more = NULL; - int - i; + assert (f.kw == KW_object); - op = get_object (); - op->arch = first_archetype = at = get_archetype_struct (); + std::vector parts; - while ((i = load_object (fp, op, 0))) + coroapi::cede_to_tick (); + + for (;;) { - copy_object (op, &at->clone); - at->clone.speed_left = (float) (-0.1); - /* copy the body_info to the body_used - this is only really - * need for monsters, but doesn't hurt to do it for everything. - * by doing so, when a monster is created, it has good starting - * values for the body_used info, so when items are created - * for it, they can be properly equipped. - */ - memcpy (&at->clone.body_used, &op->body_info, sizeof (op->body_info)); + archetype *at = new archetype (f.get_str ()); - switch (i) - { - case LL_NORMAL: /* A new archetype, just link it with the previous */ - if (last_more != NULL) - last_more->next = at; - if (head != NULL) - head->next = at; - head = last_more = at; -#if 0 - if (!op->type) - LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name); -#endif - at->tail_x = 0; - at->tail_y = 0; - break; - - case LL_MORE: /* Another part of the previous archetype, link it correctly */ - - at->head = head; - at->clone.head = &head->clone; - if (last_more != NULL) - { - last_more->more = at; - last_more->clone.more = &at->clone; - } - last_more = at; + f.next (); - /* If this multipart image is still composed of individual small - * images, don't set the tail_.. values. We can't use them anyways, - * and setting these to zero makes the map sending to the client much - * easier as just looking at the head, we know what to do. - */ - if (at->clone.face != head->clone.face) - { - head->tail_x = 0; - head->tail_y = 0; - } +#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). + // not that any of this is relevant as of yet... + if (f.kw == KW_inherit) + { + if (archetype *at = find (f.get_str ())) + *op = at->clone; else - { - if (at->clone.x > head->tail_x) - head->tail_x = at->clone.x; - if (at->clone.y > head->tail_y) - head->tail_y = at->clone.y; - } - break; + LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n", + &at->archname, f.get_str ()); + f.next (); } +#endif - at = get_archetype_struct (); - clear_object (op); - op->arch = at; - } + loading_arch = at; // hack to tell parse_kv et al. to behave + bool parse_ok = at->parse_kv (f); + loading_arch = 0; - delete - at; - free_object (op); -} + if (!parse_ok) + goto fail; -/* - * Reads the archetype file once more, and links all pointers between - * archetypes. - */ + loading_arch = at; // hack to tell parse_kv et al. to behave + at->post_load_check (); + loading_arch = 0; -void -second_arch_pass (object_thawer & thawer) -{ - char - buf[MAX_BUF], * - variable = buf, *argument, *cp; - archetype * - at = NULL, *other; + parts.push_back (at); - while (fgets (buf, MAX_BUF, thawer) != NULL) - { - if (*buf == '#') - continue; - if ((argument = strchr (buf, ' ')) != NULL) - { - *argument = '\0', argument++; - cp = argument + strlen (argument) - 1; - while (isspace (*cp)) - { - *cp = '\0'; - cp--; - } - } - if (!strcmp ("Object", variable)) - { - if ((at = find_archetype (argument)) == NULL) - LOG (llevError, "Warning: failed to find arch %s\n", argument); - } - else if (!strcmp ("other_arch", variable)) - { - if (at != NULL && at->clone.other_arch == NULL) - { - if ((other = find_archetype (argument)) == NULL) - LOG (llevError, "Warning: failed to find other_arch %s\n", argument); - else if (at != NULL) - at->clone.other_arch = other; - } - } - else if (!strcmp ("randomitems", variable)) + if (f.kw != KW_more) + break; + + f.next (); + + if (f.kw != KW_object) { - if (at != NULL) - { - treasurelist * - tl = find_treasurelist (argument); - if (tl == NULL) - LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); - else - at->clone.randomitems = tl; - } + f.parse_error ("more object"); + goto fail; } } -} -#ifdef DEBUG -void -check_generators (void) -{ - archetype * - at; - for (at = first_archetype; at != NULL; at = at->next) - if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL) - LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name); -} -#endif - -/* - * First initialises the archtype hash-table (init_archetable()). - * Reads and parses the archetype file (with the first and second-pass - * functions). - * Then initialises treasures by calling load_treasures(). - */ + { + auto (at, parts.begin ()); -void -load_archetypes (void) -{ - char - filename[MAX_BUF]; - int - comp; -#if TIME_ARCH_LOAD - struct timeval - tv1, - tv2; -#endif + archetype *new_head = parts.front (); + archetype *old_head = find (new_head->archname); - sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); - LOG (llevDebug, "Reading archetypes from %s:\n", filename); + if (old_head && !old_head->is_head ()) + { + LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n", + &new_head->archname, &old_head->archname); + goto fail; + } + + // check that all archetypes belong to the same old object or are new + for (auto (at, parts.begin ()); at != parts.end (); ++at) + { + archetype *new_part = *at; + archetype *old_part = find (new_part->archname); + + if (old_part && old_part->head_ () != old_head) + { + LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n", + &new_part->archname, &((archetype *)old_part->head_ ())->archname); + goto fail; + } + } + + // assemble new chain + new_head->max_x = new_head->x; + + archetype *less = new_head; + for (auto (p, parts.begin () + 1); p != parts.end (); ++p) + { + archetype *at = *p; + + // 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; + } - { - object_thawer - thawer (filename); + postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ()); - clear_archetable (); - LOG (llevDebug, " arch-pass 1...\n"); - first_arch_pass (thawer); - LOG (llevDebug, " done\n"); + return new_head; } - init_archetable (); - warn_archetypes = 1; +fail: + for (auto (p, parts.begin ()); p != parts.end (); ++p) + (*p)->destroy (); - { - object_thawer - thawer (filename); - - LOG (llevDebug, " loading treasure...\n"); - load_treasures (); - LOG (llevDebug, " done\n arch-pass 2...\n"); - second_arch_pass (thawer); - LOG (llevDebug, " done\n"); -#ifdef DEBUG - check_generators (); -#endif - } - LOG (llevDebug, " done\n"); + return 0; } -/* - * 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::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch) { - object * - op; - if (at == NULL) - { - if (warn_archetypes) - LOG (llevError, "Couldn't find archetype.\n"); - return NULL; - } - op = get_object (); - copy_object (&at->clone, op); - op->instantiate (); - op->arch = at; - return op; + ref = 0; + postponed_arch_ref.push_back (std::pair(&ref, shstr (other_arch))); } -/* - * 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::commit_load () { - object * - op; - char - buf[MAX_BUF]; - sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); - op = get_object (); - op->name = op->name_pl = buf; - SET_FLAG (op, FLAG_NO_PICK); - return op; -} + // unlink old archetypes and link in new ones */ + for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p) + { + archetype *at = *p; -/* - * Finds which archetype matches the given name, and returns a new - * object containing a copy of the archetype. - */ + if (archetype *old = find (at->archname)) + old->unlink (); -object * -get_archetype (const char *name) -{ - archetype * - at; - at = find_archetype (name); - if (at == NULL) - return create_singularity (name); - return arch_to_object (at); -} + allarch.push_back (at); -/* - * Hash-function used by the arch-hashtable. - */ + at->link (); + ++dirtycnt; + } -unsigned long -hasharch (const char *str, int tablesize) -{ - unsigned long - hash = 0; - unsigned int - i = 0; - const char * - p; - - /* use the one-at-a-time hash function, which supposedly is - * better than the djb2-like one used by perl5.005, but - * certainly is better then the bug used here before. - * see http://burtleburtle.net/bob/hash/doobs.html - */ - for (p = str; i < MAXSTRING && *p; p++, i++) + postponed_arch.clear (); + + // now resolve arch references + for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p) { - hash += *p; - hash += hash << 10; - hash ^= hash >> 6; + 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; } - hash += hash << 3; - hash ^= hash >> 11; - hash += hash << 15; + postponed_arch_ref.clear (); - return hash % tablesize; + empty = find (shstr_empty_archetype); } -/* - * Finds, using the hashtable, which archetype matches the given name. - * returns a pointer to the found archetype, otherwise NULL. - */ - -archetype * -find_archetype (const char *name) +void +archetype::gc () { -#if USE_UNORDERED_MAP - name = shstr::find (name); + int cnt = max (1, min (allarch.size () / 128, dirtycnt)); + dirtycnt = max (0, dirtycnt - cnt); - if (!name) - return 0; + do + { + static int idx; - HT::const_iterator i = ht.find ((size_t)name); + if (idx >= allarch.size ()) + if (idx) + idx = 0; + else + return; - if (i == ht.end ()) - return 0; - else - return i->second; -#endif + archetype *at = allarch [idx]; - archetype *at; - unsigned long index; + 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); - if (name == NULL) - return (archetype *) NULL; + // break chain + for (object *op = at->head_ (); op; ) + { + object *next = op->more; + op->head = 0; + op->more = 0; + op = next; + } - index = hasharch (name, ARCHTABLE); - arch_search++; - for (;;) - { - at = arch_table[index]; - if (at == NULL) - { - if (warn_archetypes) - LOG (llevError, "Couldn't find archetype %s\n", name); - return NULL; + at->destroy (); + at->arch = 0; } - arch_cmp++; - if (!strcmp ((const char *) at->name, name)) - return at; - if (++index >= ARCHTABLE) - index = 0; } + while (--cnt); } +object * +archetype::instance () +{ + object *op = clone (); + op->instantiate (); + return op; +} + +//+GPL + /* - * Adds an archetype to the hashtable. + * Finds which archetype matches the given name, and returns a new + * object containing a copy of the archetype. */ - -static void -add_arch (archetype *at) +object * +get_archetype (const char *name) { -#if USE_UNORDERED_MAP - ht.insert (std::make_pair ((size_t)(const char *)at->name, at)); -#endif - - int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; + return archetype::get (name); +} - for (;;) - { - if (arch_table[index] == NULL) - { - arch_table[index] = at; - return; - } +object * +archetype::get (const char *name) +{ + archetype *at = find (name); - if (++index == ARCHTABLE) - index = 0; + if (!at) + return create_singularity (name); - if (index == org_index) - fatal (ARCHTABLE_TOO_SMALL); - } + return at->instance (); } /* * Returns the first archetype using the given type. * Used in treasure-generation. */ - -archetype * +static archetype * type_to_archetype (int type) { - archetype * - at; - - for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) - if (at->clone.type == type) + for_all_archetypes (at) + if (at->type == type && at->head_ () != at) return at; - return NULL; + + return 0; } /* @@ -841,50 +612,47 @@ * the given type. * Used in treasure-generation. */ - object * clone_arch (int type) { - archetype * - at; - object * - op = get_object (); + archetype *at = type_to_archetype (type); - if ((at = type_to_archetype (type)) == NULL) + if (!at) { LOG (llevError, "Can't clone archetype %d\n", type); - free_object (op); - return NULL; + return 0; } - copy_object (&at->clone, op); - op->instantiate (); - return op; + + return at->instance (); } /* * member: make instance from class */ - object * -object_create_arch (archetype * at) +object_create_arch (archetype *at) { - object * - op, * - prev = NULL, *head = NULL; + object *op, *prev = 0, *head = 0; while (at) { - op = arch_to_object (at); - op->x = at->clone.x; - op->y = at->clone.y; + op = at->instance (); + + op->x = at->x; + op->y = at->y; + if (head) op->head = head, prev->more = op; + if (!head) head = op; + prev = op; - at = at->more; + at = (archetype *)at->more; } - return (head); + + return head; } -/*** end of arch.c ***/ +//-GPL +