--- deliantra/server/common/arch.C 2008/04/02 11:13:51 1.72 +++ deliantra/server/common/arch.C 2008/10/05 14:54:05 1.86 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * 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 * @@ -24,21 +24,13 @@ #include #include -#include #include #include #include -/* 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 laoder etc. to suppress/request special processing +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 @@ -50,8 +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 @@ -105,7 +104,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; } @@ -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,7 +151,7 @@ tmpname[i] = 0; if (archetype *at = find_archetype_by_object_name (tmpname)) - return arch_to_object (at); + return at->instance (); } return create_singularity (name); @@ -278,7 +277,6 @@ archetype::archetype (const char *name) { - stub = true; arch = this; this->archname = this->name = this->name_pl = name; } @@ -291,19 +289,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); + } } /* @@ -325,29 +325,6 @@ } archetype * -archetype::get (const char *name) -{ - if (!name) - { - LOG (llevError, "null archetype requested\n"); - name = "(null)"; - } - - if (loading_arch && !strcmp (&loading_arch->archname, name)) - return loading_arch; - - archetype *at = find (name); - - if (!at) - { - at = new archetype (name); - at->link (); - } - - return at; -} - -archetype * archetype::read (object_thawer &f) { assert (f.kw == KW_object); @@ -358,12 +335,7 @@ for (;;) { - // the archetype might have been referenced earlier - // so try to find an existing stub archetype first - archetype *at = find (f.get_str ()); - - if (!at || !at->stub) - at = new archetype (f.get_str ()); + archetype *at = new archetype (f.get_str ()); f.next (); @@ -436,10 +408,6 @@ } } - // deactivate existing archetype - for (archetype *at = old_head; at; at = (archetype *)at->more) - at->unlink (); - // 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; @@ -449,7 +417,7 @@ { 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]; @@ -457,71 +425,119 @@ 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->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; } - // now activate it - for (auto (p, parts.begin ()); p != parts.end (); ++p) - { - archetype *at = *p; - at->stub = false; - at->link (); - } + 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 (true); + (*p)->destroy (); return 0; } -/* - * Initialize global archtype pointers: - */ void -init_archetype_pointers () +archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch) { - ring_arch = archetype::find ("ring"); - amulet_arch = archetype::find ("amulet"); - staff_arch = archetype::find ("staff"); - crown_arch = archetype::find ("crown"); - empty_archetype = archetype::find ("empty_archetype"); + ref = 0; + postponed_arch_ref.push_back (std::pair(&ref, shstr (other_arch))); } -/* - * 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::commit_load () { - if (!at) + // unlink old archetypes and link in new ones */ + for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p) { - LOG (llevError, "Couldn't find archetype.\n"); - return 0; + archetype *at = *p; + + if (archetype *old = find (at->archname)) + old->unlink (); + + allarch.push_back (at); + + at->link (); + ++dirtycnt; } - object *op = at->clone (); - op->arch = at; - op->instantiate (); + postponed_arch.clear (); - return op; + // 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); +} + +void +archetype::gc () +{ + int cnt = max (1, min (allarch.size () / 128, dirtycnt)); + dirtycnt = max (0, dirtycnt - cnt); + + do + { + static int idx; + + if (idx >= allarch.size ()) + if (idx) + idx = 0; + else + return; + + archetype *at = allarch [idx]; + + 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); } object * archetype::instance () { - return arch_to_object (this); + object *op = clone (); + op->instantiate (); + return op; } /* @@ -538,11 +554,8 @@ 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 = archetype::get (shstr_bug); + op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name); return op; } @@ -554,12 +567,18 @@ 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 (); } /* @@ -584,17 +603,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 (); } /* @@ -607,7 +624,7 @@ while (at) { - op = arch_to_object (at); + op = at->instance (); op->x = at->x; op->y = at->y;