--- deliantra/server/common/arch.C 2007/06/04 12:19:08 1.62
+++ deliantra/server/common/arch.C 2008/05/17 00:17:02 1.81
@@ -1,45 +1,36 @@
/*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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
*
- * Crossfire TRT 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 2 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 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.
+ * 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
#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
- */
-
-bool 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
@@ -51,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
@@ -70,8 +68,8 @@
{
shstr_cmp name_cmp (name);
- for (archetype *at = first_archetype; at; at = at->next)
- if (at->clone.name == name_cmp)
+ for_all_archetypes (at)
+ if (at->name == name_cmp)
return at;
return 0;
@@ -87,8 +85,8 @@
{
shstr_cmp name_cmp (name);
- for (archetype *at = first_archetype; at; at = at->next)
- if (at->clone.name == name_cmp && at->clone.type == type)
+ for_all_archetypes (at)
+ if (at->name == name_cmp && at->type == type)
return at;
return 0;
@@ -104,9 +102,9 @@
{
shstr_cmp skill_cmp (skill);
- for (archetype *at = first_archetype; at; at = at->next)
- if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type))
- return arch_to_object (at);
+ for_all_archetypes (at)
+ if (at->skill == skill_cmp && (type == -1 || type == at->type))
+ return at->instance ();
return 0;
}
@@ -121,8 +119,8 @@
archetype *
get_archetype_by_type_subtype (int type, int subtype)
{
- for (archetype *at = first_archetype; at; at = at->next)
- if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype))
+ for_all_archetypes (at)
+ if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype))
return at;
return 0;
@@ -137,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 *
@@ -153,29 +151,29 @@
tmpname[i] = 0;
if (archetype *at = find_archetype_by_object_name (tmpname))
- return arch_to_object (at);
+ return at->instance ();
}
return create_singularity (name);
}
- /* This is a subset of the parse_id command. Basically, name can be
- * a string seperated lists of things to match, with certain keywords.
- * pl is the player (only needed to set count properly)
- * op is the item we are trying to match. Calling function takes care
- * of what action might need to be done and if it is valid
- * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
- * value means a better match. 0 means no match.
- *
- * Brief outline of the procedure:
- * We take apart the name variable into the individual components.
- * cases for 'all' and unpaid are pretty obvious.
- * Next, we check for a count (either specified in name, or in the
- * player object.)
- * If count is 1, make a quick check on the name.
- * IF count is >1, we need to make plural name. Return if match.
- * Last, make a check on the full name.
- */
+/* This is a subset of the parse_id command. Basically, name can be
+ * a string seperated lists of things to match, with certain keywords.
+ * pl is the player (only needed to set count properly)
+ * op is the item we are trying to match. Calling function takes care
+ * of what action might need to be done and if it is valid
+ * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
+ * value means a better match. 0 means no match.
+ *
+ * Brief outline of the procedure:
+ * We take apart the name variable into the individual components.
+ * cases for 'all' and unpaid are pretty obvious.
+ * Next, we check for a count (either specified in name, or in the
+ * player object.)
+ * If count is 1, make a quick check on the name.
+ * IF count is >1, we need to make plural name. Return if match.
+ * Last, make a check on the full name.
+ */
int
item_matched_string (object *pl, object *op, const char *name)
{
@@ -277,45 +275,53 @@
return 0;
}
-archetype::archetype ()
+archetype::archetype (const char *name)
{
- clone.arch = this;
-
- CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
- SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
+ arch = this;
+ this->archname = this->name = this->name_pl = name;
}
archetype::~archetype ()
{
- //TODO: nuke ->more's
+ unlink ();
}
-static void
-unlink (archetype *at)
+void
+archetype::link ()
{
- if (at->head)
- at = at->head;
-
- // destroy this archetype's link, making singletons out of its parts
- while (at)
+ if (!archetypes.contains (this))
{
- archetype *more = at->more;
- at->clone.destroy_inv ();
- at->head = at->more = 0;
- at = more;
+ archetypes.insert (this);
+ ht.insert (std::make_pair (archname, this));
}
}
-// dire hack, need to rationalise
void
-overwrite (archetype *at, object *op)
+archetype::unlink ()
{
- at->clone = *op;
- at->clone.arch = at;
+ if (archetypes.contains (this))
+ {
+ archetypes.erase (this);
+ ht.erase (archname);
+ }
+}
- at->clone.inv = op->inv; op->inv = 0;
+/*
+ * Finds, using the hashtable, which archetype matches the given name.
+ * returns a pointer to the found archetype, otherwise NULL.
+ */
+archetype *
+archetype::find (const char *name)
+{
+ if (!name)
+ return 0;
+
+ auto (i, ht.find (name));
- op->destroy ();
+ if (i == ht.end ())
+ return 0;
+ else
+ return i->second;
}
archetype *
@@ -323,39 +329,45 @@
{
assert (f.kw == KW_object);
- loading_arch = true; // hack to tell parse_kv et al. to behave
-
- typedef std::pair part;
- std::vector parts;
+ std::vector parts;
- coroapi::cede_to_tick_every (100);
+ coroapi::cede_to_tick ();
for (;;)
{
- object *op = object::create ();
- archetype *at = get (f.get_str ());
- f.get (op->name);
+ archetype *at = new archetype (f.get_str ());
+
f.next ();
#if 0
+ // implementing it here in the server does neither allow multiple inheritence
+ // nor does it cleanly "just override". it would allow use in map files, though,
+ // and other resource files dynamically laoded (as opposed to being preprocessed).
+ // not that any of this is relevant as of yet...
if (f.kw == KW_inherit)
{
if (archetype *at = find (f.get_str ()))
*op = at->clone;
else
LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
- &at->name, f.get_str ());
+ &at->archname, f.get_str ());
f.next ();
}
#endif
- if (!op->parse_kv (f))
+ loading_arch = at; // hack to tell parse_kv et al. to behave
+ bool parse_ok = at->parse_kv (f);
+ loading_arch = 0;
+
+ if (!parse_ok)
goto fail;
- op->post_load_check ();
+ loading_arch = at; // hack to tell parse_kv et al. to behave
+ at->post_load_check ();
+ loading_arch = 0;
- parts.push_back (std::make_pair (at, op));
+ parts.push_back (at);
if (f.kw != KW_more)
break;
@@ -370,108 +382,161 @@
}
{
- archetype *head = parts.front ().first;
+ auto (at, parts.begin ());
- // check that all archetypes belong to the same object or are heads
- for (auto (p, parts.begin ()); p != parts.end (); ++p)
+ archetype *new_head = parts.front ();
+ archetype *old_head = find (new_head->archname);
+
+ if (old_head && !old_head->is_head ())
{
- archetype *at = p->first;
+ LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
+ &new_head->archname, &old_head->archname);
+ goto fail;
+ }
- if (at->head != head && at->head)
- {
- LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->archname);
- goto fail;
- }
+ // check that all archetypes belong to the same old object or are new
+ for (auto (at, parts.begin ()); at != parts.end (); ++at)
+ {
+ archetype *new_part = *at;
+ archetype *old_part = find (new_part->archname);
- if (at->next && at != head)
+ if (old_part && old_part->head_ () != old_head)
{
- LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->archname);
+ LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
+ &new_part->archname, &((archetype *)old_part->head_ ())->archname);
goto fail;
}
}
- // sever chain of existing head object
- for (archetype *more, *at = head; at; at = more)
- {
- more = at->more;
+ // 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;
- at->head = 0;
- at->more = 0;
- }
-
- // replace/update head
- overwrite (head, parts.front ().second);
- head->tail_x = 0;
- head->tail_y = 0;
-
- // link into list of heads, if not already there
- if (!head->linked)
- {
- head->linked = true;
- head->next = first_archetype;
- first_archetype = head;
- }
-
- // reassemble new chain
- archetype *prev = head;
+ archetype *less = new_head;
for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
{
- archetype *at = p->first;
- overwrite (at, p->second);
-
- if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
- if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
+ archetype *at = *p;
- at->head = head;
- at->clone.head = &head->clone;
- prev->more = at;
- prev->clone.more = &at->clone;
-
- prev = at;
+ // 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];
+
+ 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;
}
- loading_arch = false;
- return head;
+ postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
+
+ return new_head;
}
fail:
for (auto (p, parts.begin ()); p != parts.end (); ++p)
- p->second->destroy (true);
+ (*p)->destroy (true);
- loading_arch = false;
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.clone ();
- op->arch = at;
- op->instantiate ();
+ postponed_arch.clear ();
+
+ // 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->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);
+}
+
+object *
+archetype::instance ()
+{
+ object *op = clone ();
+ op->instantiate ();
return op;
}
@@ -484,13 +549,14 @@
object *
create_singularity (const char *name)
{
- object *op;
- char buf[MAX_BUF];
+ LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
+
+ if (!strcmp (name, "bug"))
+ abort ();
+
+ object *op = archetype::get ("bug");
+ op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
- sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
- op = object::create ();
- op->name = op->name_pl = buf;
- SET_FLAG (op, FLAG_NO_PICK);
return op;
}
@@ -501,66 +567,18 @@
object *
get_archetype (const char *name)
{
- archetype *at = archetype::find (name);
-
- if (!at)
- return create_singularity (name);
-
- return arch_to_object (at);
+ return archetype::get (name);
}
-/*
- * Finds, using the hashtable, which archetype matches the given name.
- * returns a pointer to the found archetype, otherwise NULL.
- */
-archetype *
-archetype::find (const char *name)
-{
- if (!name)
- return 0;
-
- auto (i, ht.find (name));
-
- if (i == ht.end ())
- return 0;
- else
- return i->second;
-}
-
-archetype *
+object *
archetype::get (const char *name)
{
- if (!name)
- {
- LOG (llevError, "null archetype requested\n");
- name = "(null)";
- }
-
archetype *at = find (name);
if (!at)
- {
- archetypes.insert (at = new archetype);
- at->archname = at->clone.name = at->clone.name_pl = name;
- at->hash_add ();
- }
-
- return at;
-}
-
-/*
- * Adds an archetype to the hashtable.
- */
-void
-archetype::hash_add ()
-{
- ht.insert (std::make_pair (archname, this));
-}
+ return create_singularity (name);
-void
-archetype::hash_del ()
-{
- ht.erase (archname);
+ return at->instance ();
}
/*
@@ -570,8 +588,8 @@
archetype *
type_to_archetype (int type)
{
- for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
- if (at->clone.type == type)
+ for_all_archetypes (at)
+ if (at->type == type && at->head_ () != at)
return at;
return 0;
@@ -585,23 +603,20 @@
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.clone ();
- op->instantiate ();
- return op;
+ return at->instance ();
}
/*
* member: make instance from class
*/
-
object *
object_create_arch (archetype *at)
{
@@ -609,9 +624,10 @@
while (at)
{
- op = arch_to_object (at);
- op->x = at->clone.x;
- op->y = at->clone.y;
+ op = at->instance ();
+
+ op->x = at->x;
+ op->y = at->y;
if (head)
op->head = head, prev->more = op;
@@ -620,9 +636,9 @@
head = op;
prev = op;
- at = at->more;
+ at = (archetype *)at->more;
}
- return (head);
+ return head;
}