--- deliantra/server/common/arch.C 2007/04/13 07:26:29 1.45 +++ deliantra/server/common/arch.C 2008/10/05 14:54:05 1.86 @@ -1,45 +1,36 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen * - * This program is free software; you can redistribute it and/or modify + * Deliantra 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 + * 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 + * 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 + * along with this program. If not, see . + * + * The authors can be reached via e-mail to */ #include #include -#include #include #include #include -int arch_init; /* True if doing arch initialization */ - -/* 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 - */ +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 @@ -51,7 +42,15 @@ 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; /** * GROS - This function retrieves an archetype given the name that appears @@ -69,8 +68,8 @@ { shstr_cmp name_cmp (name); - for (archetype *at = first_archetype; at; at = at->next) - if (at->clone.name == name_cmp) + for_all_archetypes (at) + if (at->name == name_cmp) return at; return 0; @@ -86,8 +85,8 @@ { shstr_cmp name_cmp (name); - for (archetype *at = first_archetype; at; at = at->next) - if (at->clone.name == name_cmp && at->clone.type == type) + for_all_archetypes (at) + if (at->name == name_cmp && at->type == type) return at; return 0; @@ -103,9 +102,9 @@ { shstr_cmp skill_cmp (skill); - for (archetype *at = first_archetype; at; at = at->next) - if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type)) - return arch_to_object (at); + for_all_archetypes (at) + if (at->skill == skill_cmp && (type == -1 || type == at->type)) + return at->instance (); return 0; } @@ -120,8 +119,8 @@ archetype * get_archetype_by_type_subtype (int type, int subtype) { - for (archetype *at = first_archetype; at; at = at->next) - if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype)) + for_all_archetypes (at) + if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype)) return at; return 0; @@ -136,7 +135,7 @@ * - 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 * @@ -152,29 +151,29 @@ tmpname[i] = 0; if (archetype *at = find_archetype_by_object_name (tmpname)) - return arch_to_object (at); + 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) { @@ -276,74 +275,53 @@ 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 = archetype::find ("empty_archetype"); +archetype::archetype (const char *name) +{ + arch = this; + this->archname = this->name = this->name_pl = name; +} -/* init_blocksview();*/ +archetype::~archetype () +{ + unlink (); } -/* - * An alternative way to init the hashtable which is slower, but _works_... - */ void -init_archetable (void) +archetype::link () { - LOG (llevDebug, " Setting up archetable...\n"); - - for (archetype *at = first_archetype; at; at = at->next) - for (archetype *bt = at; bt; bt = bt->more) - bt->hash_add (); - - LOG (llevDebug, "done\n"); + if (!archetypes.contains (this)) + { + 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; 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); } -archetype::archetype () +/* + * 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) { - clone.arch = this; + if (!name) + return 0; - CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ - SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ -} + auto (i, ht.find (name)); -archetype::~archetype () -{ - //TODO: nuke ->more's + if (i == ht.end ()) + return 0; + else + return i->second; } archetype * @@ -351,189 +329,213 @@ { assert (f.kw == KW_object); - archetype *head = new archetype; - f.get (head->name); + std::vector parts; - if (!head->clone.parse_kv (f)) - { - delete head; - return 0; - } + coroapi::cede_to_tick (); - for (archetype *prev = head; f.kw == KW_more; ) + for (;;) { - f.next (); + archetype *at = new archetype (f.get_str ()); - assert (f.kw == KW_object); - - archetype *more = new archetype; - f.get (more->name); + f.next (); - if (!more->clone.parse_kv (f)) +#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) { - delete head; - return 0; + if (archetype *at = find (f.get_str ())) + *op = at->clone; + else + LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n", + &at->archname, f.get_str ()); + + f.next (); } +#endif - if (more->clone.x > head->tail_x) head->tail_x = more->clone.x; - if (more->clone.y > head->tail_y) head->tail_y = more->clone.y; + loading_arch = at; // hack to tell parse_kv et al. to behave + bool parse_ok = at->parse_kv (f); + loading_arch = 0; - more->head = head; - more->clone.head = &head->clone; - prev->more = more; - prev->clone.more = &more->clone; + if (!parse_ok) + goto fail; - prev = more; - } + loading_arch = at; // hack to tell parse_kv et al. to behave + at->post_load_check (); + loading_arch = 0; - head->next = first_archetype; - first_archetype = head; + parts.push_back (at); - return head; -} + if (f.kw != KW_more) + break; -/* - * Reads/parses the archetype-file, and copies into a linked list - * of archetype-structures. - */ -static bool -first_arch_pass (object_thawer &f) -{ - for (;;) - { - switch (f.kw) + f.next (); + + if (f.kw != KW_object) { - case KW_object: - if (!archetype::read (f)) - return false; - continue; - - case KW_EOF: - return true; - - default: - if (!f.parse_error ("archetypes file")) - return false; + f.parse_error ("more object"); + goto fail; } - - f.next (); } + + { + auto (at, parts.begin ()); + + archetype *new_head = parts.front (); + archetype *old_head = find (new_head->archname); + + 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->min_x = new_head->max_x = new_head->x; + new_head->min_y = new_head->max_y = new_head->y; + + 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->min_x = min (new_head->min_x, at->x); + new_head->min_y = min (new_head->min_y, at->y); + new_head->max_x = max (new_head->max_x, at->x); + new_head->max_y = max (new_head->max_y, at->y); + + at->head = new_head; + less->more = at; + less = at; + } + + 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 (); + + return 0; } -/* - * Reads the archetype file once more, and links all pointers between - * archetypes. - */ void -second_arch_pass (object_thawer & thawer) +archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch) { - char buf[MAX_BUF], *variable = buf, *argument, *cp; - archetype *at = NULL, *other; + ref = 0; + postponed_arch_ref.push_back (std::pair(&ref, shstr (other_arch))); +} - while (fgets (buf, MAX_BUF, thawer) != NULL) +void +archetype::commit_load () +{ + // unlink old archetypes and link in new ones */ + for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p) { - if (*buf == '#') - continue; + archetype *at = *p; - if ((argument = strchr (buf, ' ')) != NULL) - { - *argument = '\0', argument++; - cp = argument + strlen (argument) - 1; - while (isspace (*cp)) - { - *cp = '\0'; - cp--; - } - } + if (archetype *old = find (at->archname)) + old->unlink (); - if (!strcmp ("object", variable)) - { - 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 = archetype::find (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 (at) - { - treasurelist *tl = find_treasurelist (argument); + allarch.push_back (at); - if (tl == NULL) - LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); - else - at->clone.randomitems = tl; - } - } + at->link (); + ++dirtycnt; + } + + postponed_arch.clear (); + + // 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); } -/* - * 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(). - */ void -load_archetypes (void) +archetype::gc () { - char filename[MAX_BUF]; - - sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); - LOG (llevDebug, "Reading archetypes from %s:\n", filename); + int cnt = max (1, min (allarch.size () / 128, dirtycnt)); + dirtycnt = max (0, dirtycnt - cnt); - { - object_thawer f (filename); + do + { + static int idx; - f.next (); + if (idx >= allarch.size ()) + if (idx) + idx = 0; + else + return; - LOG (llevDebug, " arch-pass 1...\n"); - if (!first_arch_pass (f)) - cleanup ("errors during first arch pass are fatal"); - LOG (llevDebug, " done\n"); - } + archetype *at = allarch [idx]; - init_archetable (); - warn_archetypes = 1; + 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); - { - object_thawer f (filename); + // break chain + for (object *op = at->head_ (); op; ) + { + object *next = op->more; + op->head = 0; + op->more = 0; + op = next; + } - LOG (llevDebug, " loading treasure...\n"); - load_treasures (); - LOG (llevDebug, " done\n"); - LOG (llevDebug, " arch-pass 2...\n"); - second_arch_pass (f); - LOG (llevDebug, " done\n"); - } - LOG (llevDebug, " done\n"); + at->destroy (); + at->arch = 0; + } + } + while (--cnt); } -/* - * 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) +archetype::instance () { - if (!at) - { - if (warn_archetypes) - LOG (llevError, "Couldn't find archetype.\n"); - - return NULL; - } - - object *op = at->clone.clone (); - op->arch = at; + object *op = clone (); op->instantiate (); return op; } @@ -547,13 +549,14 @@ object * create_singularity (const char *name) { - object *op; - char buf[MAX_BUF]; + 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); - sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); - op = object::create (); - op->name = op->name_pl = buf; - SET_FLAG (op, FLAG_NO_PICK); return op; } @@ -564,75 +567,18 @@ object * get_archetype (const char *name) { - archetype *at = archetype::find (name); - - if (!at) - return create_singularity (name); - - return arch_to_object (at); + return archetype::get (name); } -/* - * Hash-function used by the arch-hashtable. - */ - -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++) - { - hash += *p; - hash += hash << 10; - hash ^= hash >> 6; - } - - hash += hash << 3; - hash ^= hash >> 11; - hash += hash << 15; - - return hash % tablesize; -} - -/* - * 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) +object * +archetype::get (const char *name) { - if (!name) - return 0; - - AUTODECL (i, ht.find (name)); + archetype *at = find (name); - if (i == ht.end ()) - return 0; - else - return i->second; -} - -/* - * Adds an archetype to the hashtable. - */ -void -archetype::hash_add () -{ - ht.insert (std::make_pair (name, this)); -} + if (!at) + return create_singularity (name); -void -archetype::hash_del () -{ - ht.erase (name); + return at->instance (); } /* @@ -642,10 +588,8 @@ archetype * type_to_archetype (int type) { - archetype *at; - - for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) - if (at->clone.type == type) + for_all_archetypes (at) + if (at->type == type && at->head_ () != at) return at; return 0; @@ -656,27 +600,23 @@ * the given type. * Used in treasure-generation. */ - 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.clone (); - op->instantiate (); - return op; + return at->instance (); } /* * member: make instance from class */ - object * object_create_arch (archetype *at) { @@ -684,9 +624,10 @@ 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; @@ -695,9 +636,9 @@ head = op; prev = op; - at = at->more; + at = (archetype *)at->more; } - return (head); + return head; }