[ViewVC] Diff of: cvs/deliantra/server/common/arch.C

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.73 by root, Sun Apr 20 00:44:12 2008 UTC vs.
Revision 1.93 by root, Fri Nov 6 12:27:05 2009 UTC

  *
  * 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
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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>
  */
 #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 *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
-archetype *archetype::empty;
+arch_ptr archetype::empty;
 // the hashtable
 typedef std::tr1::unordered_map
   <
     const char *,
     str_hash,
     str_equal,
     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;
 // the vector of loaded but not yet committed archetypes
 static std::vector<archetype *> 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.
+ */
+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").
  * It does not use the hashtable system, but browse the whole archlist each time.
 {
   shstr_cmp skill_cmp (skill);
   for_all_archetypes (at)
     if (at->skill == skill_cmp && (type == -1 || type == at->type))
-      return arch_to_object (at);
+      return at->instance ();
   return 0;
 }
 /* similiar to above - this returns the first archetype
  * - name: The name we're searching for (ex: "writing pen");
  * Return value:
  * - 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);
 }
         return 1;
       /* unpaid is a little more specific */
       if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
         return 2;
       if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
         return 2;
       if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))
         return 2;
        * is because of the 'else' handling - we don't want to match on
        * something and set a low retval, even though it may match a higher retcal
        * 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))
         retval = 6;
       else if (count == 1 && !strcasecmp (op->name, cp))
         retval = 6;
       /* base name matched - not bad */
       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)
         {
           if (pl->type == PLAYER)
     }
   return 0;
 }
+//-GPL
 archetype::archetype (const char *name)
 {
   arch = this;
   this->archname = this->name = this->name_pl = name;
 }
 }
 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);
+    }
 }
 /*
  * Finds, using the hashtable, which archetype matches the given name.
  * returns a pointer to the found archetype, otherwise NULL.
     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];
         at->flag [FLAG_NO_PICK]  = new_head->flag [FLAG_NO_PICK];
         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;
+        new_head->min_x = min (new_head->min_x, at->x);
-        if (at->y < new_head->min_y) new_head->min_y = at->y;
+        new_head->min_y = min (new_head->min_y, at->y);
-        if (at->x > new_head->max_x) new_head->max_x = at->x;
+        new_head->max_x = max (new_head->max_x, at->x);
-        if (at->y > new_head->max_y) new_head->max_y = at->y;
+        new_head->max_y = max (new_head->max_y, at->y);
         at->head = new_head;
         less->more = at;
         less = at;
       }
     return new_head;
   }
 fail:
   for (auto (p, parts.begin ()); p != parts.end (); ++p)
-    (*p)->destroy (true);
+    (*p)->destroy ();
   return 0;
 }
 void
       archetype *at = *p;
       if (archetype *old = find (at->archname))
         old->unlink ();
+      allarch.push_back (at);
       at->link ();
+      ++dirtycnt;
     }
   postponed_arch.clear ();
   // now resolve arch references
   postponed_arch_ref.clear ();
   empty = find (shstr_empty_archetype);
 }
-/*
+void
- * Creates and returns a new object which is a copy of the given archetype.
+archetype::gc ()
- * This function returns NULL on failure.
- */
-object *
-arch_to_object (archetype *at)
 {
-  if (!at)
+  int cnt = max (1, min (allarch.size () / 128, dirtycnt));
+  dirtycnt = max (0, dirtycnt - cnt);
+  do
     {
-      LOG (llevError, "Couldn't find archetype.\n");
+      static int idx;
+      if (idx >= allarch.size ())
+        if (idx)
+          idx = 0;
+        else
-      return 0;
+          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 ()
+{
-  object *op = at->clone ();
+  object *op = clone ();
-  op->arch = at;
   op->instantiate ();
   return op;
 }
-object *
+//+GPL
-archetype::instance ()
-{
-  return arch_to_object (this);
-}
-/*
- * 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)
-{
-  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;
-  return op;
-}
 /*
  * Finds which archetype matches the given name, and returns a new
  * object containing a copy of the archetype.
  */
 object *
 get_archetype (const char *name)
 {
+  return archetype::get (name);
+}
+object *
+archetype::get (const char *name)
+{
-  archetype *at = archetype::find (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.
  * Used in treasure-generation.
  */
 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 ();
+  return at->instance ();
-  op->instantiate ();
-  return op;
 }
 /*
  * member: make instance from class
  */
 {
   object *op, *prev = 0, *head = 0;
   while (at)
     {
-      op = arch_to_object (at);
+      op = at->instance ();
       op->x = at->x;
       op->y = at->y;
       if (head)
     }
   return head;
 }
+//-GPL

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/arch.C (file contents): Revision 1.73 by root, Sun Apr 20 00:44:12 2008 UTC vs. Revision 1.93 by root, Fri Nov 6 12:27:05 2009 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.73 by root, Sun Apr 20 00:44:12 2008 UTC vs.
Revision 1.93 by root, Fri Nov 6 12:27:05 2009 UTC