--- deliantra/server/common/arch.C 2008/04/20 00:44:12 1.73 +++ deliantra/server/common/arch.C 2010/04/12 05:22:37 1.104 @@ -1,22 +1,23 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * 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 + * 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 GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * 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 GNU General Public License - * along with this program. If not, see . + * 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 */ @@ -24,14 +25,12 @@ #include #include -#include -#include #include #include -archetype *loading_arch; // ugly flag to object laoder etc. to suppress/request special processing -archetype *archetype::empty; +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 @@ -43,14 +42,38 @@ 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; +//+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 (!strcmp (name, "bug")) + abort (); + + 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 * during the game (for example, "writing pen" instead of "stylus"). @@ -103,7 +126,7 @@ for_all_archetypes (at) if (at->skill == skill_cmp && (type == -1 || type == at->type)) - return arch_to_object (at); + return at->instance (); return 0; } @@ -134,23 +157,22 @@ * - 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) { char tmpname[MAX_BUF]; - int i; assign (tmpname, name); - for (i = strlen (tmpname); i > 0; i--) + for (int i = strlen (tmpname); i > 0; i--) { tmpname[i] = 0; if (archetype *at = find_archetype_by_object_name (tmpname)) - return arch_to_object (at); + return at->instance (); } return create_singularity (name); @@ -192,12 +214,13 @@ return 1; /* unpaid is a little more specific */ - if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) + if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID]) return 2; - if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) + + if (!strcmp (cp, "cursed") && op->flag [FLAG_KNOWN_CURSED] && (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED])) return 2; - if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) + if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED]) return 2; /* Allow for things like '100 arrows' */ @@ -225,30 +248,32 @@ * 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)) @@ -259,7 +284,7 @@ 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) @@ -274,6 +299,14 @@ return 0; } +//-GPL + +void +archetype::do_delete () +{ + delete this; +} + archetype::archetype (const char *name) { arch = this; @@ -288,19 +321,21 @@ void archetype::link () { - ht.insert (std::make_pair (archname, this)); - if (!archetypes.contains (this)) - archetypes.insert (this); + { + archetypes.insert (this); + ht.insert (std::make_pair (archname, this)); + } } void archetype::unlink () { - ht.erase (archname); - if (archetypes.contains (this)) - archetypes.erase (this); + { + archetypes.erase (this); + ht.erase (archname); + } } /* @@ -321,6 +356,14 @@ return i->second; } +void +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) { @@ -339,7 +382,7 @@ #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). + // and other resource files dynamically loaded (as opposed to being preprocessed). // not that any of this is relevant as of yet... if (f.kw == KW_inherit) { @@ -406,15 +449,14 @@ } // 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; + 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 formt he head (probably a lot more) + // 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]; @@ -422,10 +464,7 @@ at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER]; at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR]; - if (at->x < new_head->min_x) new_head->min_x = at->x; - if (at->y < new_head->min_y) new_head->min_y = at->y; - if (at->x > new_head->max_x) new_head->max_x = at->x; - if (at->y > new_head->max_y) new_head->max_y = at->y; + new_head->max_x = max (new_head->max_x, at->x); at->head = new_head; less->more = at; @@ -439,7 +478,7 @@ fail: for (auto (p, parts.begin ()); p != parts.end (); ++p) - (*p)->destroy (true); + (*p)->destroy (); return 0; } @@ -462,7 +501,10 @@ if (archetype *old = find (at->archname)) old->unlink (); + allarch.push_back (at); + at->link (); + ++dirtycnt; } postponed_arch.clear (); @@ -484,55 +526,58 @@ empty = find (shstr_empty_archetype); } -/* - * 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::gc () { - if (!at) + int cnt = max (1, min (allarch.size () / 128, dirtycnt)); + dirtycnt = max (0, dirtycnt - cnt); + + do { - LOG (llevError, "Couldn't find archetype.\n"); - return 0; - } + static int idx; - object *op = at->clone (); - op->arch = at; - op->instantiate (); + if (idx >= allarch.size ()) + if (idx) + idx = 0; + else + return; - return op; -} + archetype *at = allarch [idx]; -object * -archetype::instance () -{ - return arch_to_object (this); + 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); + + // break chain + for (object *op = at->head_ (); op; ) + { + object *next = op->more; + op->head = 0; + op->more = 0; + op = next; + } + + at->destroy (); + at->arch = 0; + } + } + while (--cnt); } -/* - * 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) +archetype::instance () { - LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); - - if (!strcmp (name, "bug")) - abort (); - - char buf[MAX_BUF]; - sprintf (buf, "bug, please report (%s)", name); - - object *op = get_archetype ("bug"); - op->name = op->name_pl = buf; - + object *op = clone (); + op->instantiate (); return op; } +//+GPL + /* * Finds which archetype matches the given name, and returns a new * object containing a copy of the archetype. @@ -540,19 +585,25 @@ object * get_archetype (const char *name) { - archetype *at = archetype::find (name); + return archetype::get (name); +} + +object * +archetype::get (const char *name) +{ + archetype *at = find (name); if (!at) return create_singularity (name); - return arch_to_object (at); + return at->instance (); } /* * Returns the first archetype using the given type. * Used in treasure-generation. */ -archetype * +static archetype * type_to_archetype (int type) { for_all_archetypes (at) @@ -570,17 +621,15 @@ 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 (); - op->instantiate (); - return op; + return at->instance (); } /* @@ -593,7 +642,7 @@ while (at) { - op = arch_to_object (at); + op = at->instance (); op->x = at->x; op->y = at->y; @@ -611,3 +660,5 @@ return head; } +//-GPL +