--- deliantra/server/common/arch.C	2008/04/20 00:44:12	1.73
+++ deliantra/server/common/arch.C	2009/10/12 14:00:57	1.89
@@ -5,18 +5,19 @@
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 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 <http://www.gnu.org/licenses/>.
+ * 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
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -24,14 +25,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 +43,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;
@@ -103,7 +105,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 +136,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 +152,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);
@@ -259,7 +261,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)
@@ -288,19 +290,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 +418,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 +426,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;
@@ -439,7 +443,7 @@
 
 fail:
   for (auto (p, parts.begin ()); p != parts.end (); ++p)
-    (*p)->destroy (true);
+    (*p)->destroy ();
 
   return 0;
 }
@@ -462,7 +466,10 @@
       if (archetype *old = find (at->archname))
         old->unlink ();
 
+      allarch.push_back (at);
+
       at->link ();
+      ++dirtycnt;
     }
 
   postponed_arch.clear ();
@@ -484,30 +491,54 @@
   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];
+
+      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;
 }
 
 /*
@@ -524,11 +555,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;
 }
@@ -540,12 +568,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 +604,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 +625,7 @@
 
   while (at)
     {
-      op = arch_to_object (at);
+      op = at->instance ();
 
       op->x = at->x;
       op->y = at->y;