--- deliantra/server/common/arch.C 2006/09/14 22:35:53 1.22 +++ deliantra/server/common/arch.C 2007/01/06 14:42:28 1.36 @@ -1,6 +1,7 @@ /* 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 @@ -23,19 +24,17 @@ #include -#include - #include -#include #include #include -/* IF set, does a little timing on the archetype load. */ -#define TIME_ARCH_LOAD 0 +#define USE_UNORDERED_MAP 0 -static void add_arch (archetype *at); +#if USE_UNORDERED_MAP +# include +# include +#endif -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 */ @@ -53,14 +52,16 @@ typedef std::tr1::unordered_map < std::size_t, - archetype *, - std::hash, + arch_ptr, + std::tr1::hash, std::equal_to, slice_allocator< std::pair > true, > HT; static HT ht; +#else +static arch_ptr arch_table[ARCHTABLE]; #endif /** @@ -120,18 +121,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 +178,7 @@ tmpname[i] = 0; at = find_archetype_by_object_name (tmpname); - if (at != NULL) + if (at) return arch_to_object (at); } @@ -271,7 +268,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 +279,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 +295,11 @@ { if (pl->type == PLAYER) pl->contr->count = count; + return retval; } } + return 0; } @@ -364,39 +357,11 @@ LOG (llevDebug, " Setting up archetable...\n"); for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) - add_arch (at); + 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) { @@ -415,13 +380,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 +401,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 +517,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 +552,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); @@ -615,7 +574,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 +589,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 +602,7 @@ return NULL; } - op = get_object (); - copy_object (&at->clone, op); + op = at->clone.clone (); op->arch = at; op->instantiate (); return op; @@ -656,7 +614,6 @@ * Thus get_archetype() will be guaranteed to always return * an object, and never NULL. */ - object * create_singularity (const char *name) { @@ -664,7 +621,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 +631,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) { @@ -766,22 +722,21 @@ /* * 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 + ht.insert (std::make_pair ((size_t) (const char *) name, this)); +#else - int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; + int index = hasharch ((const char *) name, ARCHTABLE), org_index = index; for (;;) { - if (arch_table[index] == NULL) + if (!arch_table[index]) { - arch_table[index] = at; - return; + arch_table[index] = this; + break; } if (++index == ARCHTABLE) @@ -790,6 +745,33 @@ if (index == org_index) fatal (ARCHTABLE_TOO_SMALL); } +#endif +} + +void +archetype::hash_del () +{ +#if USE_UNORDERED_MAP +# error remove this from HT +#else + + int index = hasharch ((const char *) name, ARCHTABLE), org_index = index; + + for (;;) + { + if (arch_table[index] == this) + { + arch_table[index] = 0; + break; + } + + if (++index == ARCHTABLE) + index = 0; + + if (index == org_index) + break; + } +#endif } /* @@ -819,16 +801,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; }