--- deliantra/server/common/arch.C	2008/04/20 00:44:12	1.73
+++ deliantra/server/common/arch.C	2008/05/02 16:16:02	1.78
@@ -24,14 +24,13 @@
 #include <cassert>
 
 #include <global.h>
-#include <funcpoint.h>
 #include <loader.h>
 
 #include <tr1/functional>
 #include <tr1/unordered_map>
 
-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<const char *const, arch_ptr> >
   > HT;
 
-static HT ht (5000);
+static HT ht (10000);
 archvec archetypes;
+static unordered_vector<archetype *> allarch;
+static int dirtycnt;
 
 // the vector of other_arch references to be resolved
 static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
@@ -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 *
@@ -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 truely 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.
@@ -548,6 +596,12 @@
   return arch_to_object (at);
 }
 
+object *
+archetype::get (const char *name)
+{
+  return get_archetype (name);
+}
+
 /*
  * Returns the first archetype using the given type.
  * Used in treasure-generation.