--- deliantra/server/common/arch.C 2006/09/10 13:20:12 1.15 +++ deliantra/server/common/arch.C 2007/01/15 21:06:18 1.37 @@ -1,47 +1,40 @@ - /* - * static char *rcsid_arch_c = - * "$Id: arch.C,v 1.15 2006/09/10 13:20:12 root Exp $"; + * 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 */ -/* - 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 +#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 */ @@ -56,13 +49,19 @@ #if USE_UNORDERED_MAP // the hashtable -typedef - std::tr1::unordered_map < -size_t, archetype *> - HT; - -static HT - ht; +typedef std::tr1::unordered_map + < + std::size_t, + 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 /** @@ -79,8 +78,7 @@ archetype * find_archetype_by_object_name (const char *name) { - archetype * - at; + archetype *at; if (name == NULL) return (archetype *) NULL; @@ -101,8 +99,7 @@ archetype * find_archetype_by_object_type_name (int type, const char *name) { - archetype * - at; + archetype *at; if (name == NULL) return NULL; @@ -124,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 @@ -174,24 +167,21 @@ object * get_archetype_by_object_name (const char *name) { - archetype * - at; - char - tmpname[MAX_BUF]; - int - i; + archetype *at; + char tmpname[MAX_BUF]; + int i; + + assign (tmpname, name); - strncpy (tmpname, name, MAX_BUF - 1); - tmpname[MAX_BUF - 1] = 0; for (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 (at) + return arch_to_object (at); } + return create_singularity (name); } @@ -215,12 +205,8 @@ int item_matched_string (object *pl, object *op, const char *name) { - char * - cp, - local_name[MAX_BUF]; - int - count, - retval = 0; + char *cp, local_name[MAX_BUF]; + int count, retval = 0; strcpy (local_name, name); /* strtok is destructive to name */ @@ -282,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 @@ -294,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; @@ -315,9 +295,11 @@ { if (pl->type == PLAYER) pl->contr->count = count; + return retval; } } + return 0; } @@ -332,10 +314,11 @@ { /* 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"); + empty_archetype = archetype::find ("empty_archetype"); /* init_blocksview();*/ } @@ -369,54 +352,21 @@ void init_archetable (void) { - archetype * - at; + 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); + 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; + archetype *at, *next; + int i = 0, f = 0; for (at = first_archetype; at != NULL; at = next) { @@ -425,16 +375,18 @@ else next = at->next; - delete at; + delete + at; + 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... */ } @@ -449,11 +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)) { @@ -519,8 +470,7 @@ at->clone.arch = at; } - delete - at; + delete at; } /* @@ -531,11 +481,8 @@ void second_arch_pass (object_thawer & thawer) { - char - buf[MAX_BUF], * - variable = buf, *argument, *cp; - archetype * - at = NULL, *other; + char buf[MAX_BUF], *variable = buf, *argument, *cp; + archetype *at = NULL, *other; while (fgets (buf, MAX_BUF, thawer) != NULL) { @@ -553,14 +500,14 @@ } if (!strcmp ("Object", variable)) { - if ((at = find_archetype (argument)) == NULL) + if ((at = archetype::find (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) + if ((other = archetype::find (argument)) == NULL) LOG (llevError, "Warning: failed to find other_arch %s\n", argument); else if (at != NULL) at->clone.other_arch = other; @@ -570,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); @@ -586,8 +532,7 @@ void check_generators (void) { - archetype * - at; + archetype *at; for (at = first_archetype; at != NULL; at = at->next) if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL) @@ -605,20 +550,14 @@ void load_archetypes (void) { - char - filename[MAX_BUF]; - -#if TIME_ARCH_LOAD - struct timeval - tv1, - tv2; -#endif + char filename[MAX_BUF]; sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); LOG (llevDebug, "Reading archetypes from %s:\n", filename); { - object_thawer thawer (filename); + object_thawer + thawer (filename); clear_archetable (); LOG (llevDebug, " arch-pass 1...\n"); @@ -630,11 +569,13 @@ warn_archetypes = 1; { - object_thawer thawer (filename); + object_thawer + thawer (filename); 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 @@ -648,12 +589,10 @@ * 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) { - object * - op; + object *op; if (at == NULL) { @@ -663,8 +602,7 @@ return NULL; } - op = get_object (); - copy_object (&at->clone, op); + op = at->clone.clone (); op->arch = at; op->instantiate (); return op; @@ -676,17 +614,14 @@ * Thus get_archetype() will be guaranteed to always return * an object, and never NULL. */ - object * create_singularity (const char *name) { - object * - op; - char - buf[MAX_BUF]; + object *op; + 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; @@ -696,15 +631,12 @@ * 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 * - at; + archetype *at = archetype::find (name); - at = find_archetype (name); - if (at == NULL) + if (!at) return create_singularity (name); return arch_to_object (at); @@ -717,12 +649,9 @@ unsigned long hasharch (const char *str, int tablesize) { - unsigned long - hash = 0; - unsigned int - i = 0; - const char * - p; + 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 @@ -749,15 +678,13 @@ */ archetype * -find_archetype (const char *name) +archetype::find (const char *name) { -#if USE_UNORDERED_MAP - name = shstr::find (name); - if (!name) return 0; - HT::const_iterator i = ht.find ((size_t) name); +#if USE_UNORDERED_MAP + AUTODECL (i, ht.find ((size_t) name)); if (i == ht.end ()) return 0; @@ -765,28 +692,28 @@ return i->second; #endif - archetype * - at; - unsigned long - index; - - if (name == NULL) - return (archetype *) NULL; + 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; } @@ -795,23 +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) @@ -820,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 } /* @@ -830,13 +782,13 @@ archetype * type_to_archetype (int type) { - archetype * - at; + archetype *at; - for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) + for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) if (at->clone.type == type) return at; - return NULL; + + return 0; } /* @@ -848,18 +800,15 @@ object * clone_arch (int type) { - archetype * - at; - object * - op = get_object (); + archetype *at; 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; } @@ -871,23 +820,24 @@ object * 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; + if (head) op->head = head, prev->more = op; + if (!head) head = op; + prev = op; at = at->more; } + return (head); } -/*** end of arch.c ***/