--- deliantra/server/common/arch.C 2008/04/20 00:44:12 1.73 +++ deliantra/server/common/arch.C 2008/05/04 18:46:01 1.80 @@ -24,14 +24,13 @@ #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,8 +42,10 @@ 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; @@ -103,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; } @@ -134,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 * @@ -150,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); @@ -288,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); + } } /* @@ -414,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]; @@ -422,10 +425,10 @@ 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; @@ -462,7 +465,10 @@ if (archetype *old = find (at->archname)) old->unlink (); + allarch.push_back (at); + at->link (); + ++dirtycnt; } postponed_arch.clear (); @@ -484,6 +490,48 @@ 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->debug_desc ()); + 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 and returns a new object which is a copy of the given archetype. * This function returns NULL on failure. @@ -497,17 +545,15 @@ return 0; } - object *op = at->clone (); - op->arch = at; - op->instantiate (); - - return op; + return at->instance (); } object * archetype::instance () { - return arch_to_object (this); + object *op = clone (); + op->instantiate (); + return op; } /* @@ -524,11 +570,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 ("bug"); + op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name); return op; } @@ -540,12 +583,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 (); } /* @@ -570,17 +619,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 +640,7 @@ while (at) { - op = arch_to_object (at); + op = at->instance (); op->x = at->x; op->y = at->y;