--- deliantra/server/common/arch.C 2006/09/14 22:35:53 1.22 +++ deliantra/server/common/arch.C 2007/02/02 21:50:43 1.38 @@ -1,43 +1,36 @@ /* - 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, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * 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 + */ #include -#include - #include -#include #include #include -/* IF set, does a little timing on the archetype load. */ -#define TIME_ARCH_LOAD 0 - -static void add_arch (archetype *at); +#include +#include -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 naming of these functions is really poor - they are all @@ -48,20 +41,17 @@ * MSW 2003-04-29 */ -#if USE_UNORDERED_MAP // the hashtable typedef std::tr1::unordered_map < - std::size_t, - archetype *, - std::hash, - std::equal_to, - slice_allocator< std::pair > - true, + const char *, + arch_ptr, + str_hash, + str_equal, + slice_allocator< std::pair > > HT; -static HT ht; -#endif +static HT ht (5000); /** * GROS - This function retrieves an archetype given the name that appears @@ -120,18 +110,14 @@ object * get_archetype_by_skill_name (const char *skill, int type) { - archetype * - at; - - if (skill == NULL) - return NULL; + archetype *at; - for (at = first_archetype; at != NULL; at = at->next) - { + if (skill) + for (at = first_archetype; at; 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 @@ -181,7 +167,7 @@ tmpname[i] = 0; at = find_archetype_by_object_name (tmpname); - if (at != NULL) + if (at) return arch_to_object (at); } @@ -271,7 +257,6 @@ retval = 14; else if (!strncasecmp (cp, query_base_name (op, 1), 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 @@ -283,16 +268,11 @@ retval = 12; else if (strstr (query_short_name (op), 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; @@ -304,9 +284,11 @@ { if (pl->type == PLAYER) pl->contr->count = count; + return retval; } } + return 0; } @@ -331,31 +313,8 @@ } /* - * 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); -} - -/* - * Initialise the hashtable used by the archetypes. - */ - -void -clear_archetable (void) -{ - memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *)); -} - -/* * An alternative way to init the hashtable which is slower, but _works_... */ - void init_archetable (void) { @@ -363,47 +322,19 @@ LOG (llevDebug, " Setting up archetable...\n"); - for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) - add_arch (at); + for (at = first_archetype; at; at = at->more ? at->more : at->next) + at->hash_add (); LOG (llevDebug, "done\n"); } -/* - * Dumps an archetype to debug-level output. - */ - -void -dump_arch (archetype *at) -{ - 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) - { - dump_arch (at); - fprintf (logfile, "%s\n", errmsg); - } -} - void free_all_archs (void) { archetype *at, *next; int i = 0, f = 0; - for (at = first_archetype; at != NULL; at = next) + for (at = first_archetype; at; at = next) { if (at->more) next = at->more; @@ -415,13 +346,13 @@ i++; } + LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); } archetype::archetype () { - clear_object (&clone); /* to initial state other also */ - CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ + CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ } @@ -436,9 +367,10 @@ void first_arch_pass (object_thawer & fp) { - archetype *at, *head = NULL, *last_more = NULL; + archetype *head = 0, *last_more = 0; - at->clone.arch = first_archetype = at = new archetype; + archetype *at = new archetype; + at->clone.arch = first_archetype = at; while (int i = load_object (fp, &at->clone, 0)) { @@ -551,8 +483,7 @@ { if (at != NULL) { - treasurelist * - tl = find_treasurelist (argument); + treasurelist *tl = find_treasurelist (argument); if (tl == NULL) LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); @@ -587,12 +518,6 @@ { char filename[MAX_BUF]; -#if TIME_ARCH_LOAD - struct timeval - tv1, - tv2; -#endif - sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); LOG (llevDebug, "Reading archetypes from %s:\n", filename); @@ -600,7 +525,6 @@ object_thawer thawer (filename); - clear_archetable (); LOG (llevDebug, " arch-pass 1...\n"); first_arch_pass (thawer); LOG (llevDebug, " done\n"); @@ -615,7 +539,8 @@ LOG (llevDebug, " loading treasure...\n"); load_treasures (); - LOG (llevDebug, " done\n arch-pass 2...\n"); + LOG (llevDebug, " done\n"); + LOG (llevDebug, " arch-pass 2...\n"); second_arch_pass (thawer); LOG (llevDebug, " done\n"); #ifdef DEBUG @@ -629,7 +554,6 @@ * 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) { @@ -643,8 +567,7 @@ return NULL; } - op = get_object (); - copy_object (&at->clone, op); + op = at->clone.clone (); op->arch = at; op->instantiate (); return op; @@ -656,7 +579,6 @@ * Thus get_archetype() will be guaranteed to always return * an object, and never NULL. */ - object * create_singularity (const char *name) { @@ -664,7 +586,7 @@ char buf[MAX_BUF]; sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); - op = get_object (); + op = object::create (); op->name = op->name_pl = buf; SET_FLAG (op, FLAG_NO_PICK); return op; @@ -674,7 +596,6 @@ * Finds which archetype matches the given name, and returns a new * object containing a copy of the archetype. */ - object * get_archetype (const char *name) { @@ -720,83 +641,39 @@ * Finds, using the hashtable, which archetype matches the given name. * returns a pointer to the found archetype, otherwise NULL. */ - archetype * archetype::find (const char *name) { if (!name) return 0; -#if USE_UNORDERED_MAP - AUTODECL (i, ht.find ((size_t) name)); + AUTODECL (i, ht.find (name)); if (i == ht.end ()) return 0; else return i->second; -#endif - - archetype *at; - unsigned long index; - - 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; - } - - arch_cmp++; - - if (!strcmp ((const char *) at->name, name)) - return at; - - if (++index >= ARCHTABLE) - index = 0; - } } /* * Adds an archetype to the hashtable. */ - -static void -add_arch (archetype *at) +void +archetype::hash_add () { -#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; - - for (;;) - { - if (arch_table[index] == NULL) - { - arch_table[index] = at; - return; - } - - if (++index == ARCHTABLE) - index = 0; + ht.insert (std::make_pair (name, this)); +} - if (index == org_index) - fatal (ARCHTABLE_TOO_SMALL); - } +void +archetype::hash_del () +{ + ht.erase (name); } /* * Returns the first archetype using the given type. * Used in treasure-generation. */ - archetype * type_to_archetype (int type) { @@ -819,16 +696,14 @@ clone_arch (int type) { archetype *at; - object *op = get_object (); if ((at = type_to_archetype (type)) == NULL) { LOG (llevError, "Can't clone archetype %d\n", type); - free_object (op); - return NULL; + return 0; } - copy_object (&at->clone, op); + object *op = at->clone.clone (); op->instantiate (); return op; }