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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.139 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.161 by root, Thu Apr 29 08:26:38 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
  * 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.
 #include <../random_maps/random_map.h>
 #include <../random_maps/rproto.h>
 #include "path.h"
-static char days[7][4] = {
-  "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
 void
 version (object *op)
 {
   new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
-#if 0
-  new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
-  new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
-  new_draw_info (NDI_UNIQUE, 0, op, "");
-  new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to the original Crossfire:");
-  new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
-  new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Jarkko Sonninen <Jarkko.Sonninen@lut.fi>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Karl Holland <kholland@sunlab.cit.cornell.du>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Mikael Lundgren <vick@bern.docs.uu.se>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Mikael Olsson <mol@meryl.csd.uu.se>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Tero Haatanen <Tero.Haatanen@lut.fi>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Lasse Ylitalo <ylitalo@student.docs.uu.se>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Niilo Neuvo <anipa@guru.magic.fi>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Markku J{rvinen <mta@modeemi.cs.tut.fi>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Sylvain Meunier <meunier@inf.enst.fr>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Jason Fosback <jfosback@darmok.uoregon.edu>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Carl Edman <cedman@capitalist.princeton.edu>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Charles Henrich <henrich@crh.cl.msu.edu>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Raphael Quinet <quinet@montefiore.ulg.ac.be>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Jari Vanhala <jam@modeemi.cs.tut.fi>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Tero Kivinen <kivinen@joker.cs.hut.fi>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Peter Mardahl <peterm@soda.berkeley.edu>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Matthew Zeher <matt@cs.odu.edu>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Scott R. Turner <srt@sun-dimas.aero.org>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Ben Fennema <huma@netcom.com>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Nick Williams <njw@cs.city.ac.uk>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
-  new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
-  new_draw_info (NDI_UNIQUE, 0, op, "");
-  new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
-  new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
-  new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
-  new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
-  new_draw_info (NDI_UNIQUE, 0, op, "");
-  new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
-#endif
 }
 /* This is a basic little function to put the player back to his
- * savebed.  We do some error checking - its possible that the
+ * savebed.
- * savebed map may no longer exist, so we make sure the player
- * goes someplace.
  */
 void
 enter_player_savebed (object *op)
 {
   op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
  * new map.  map, x, y must be set.  map is the map we are moving the
  * player to - it could be the map he just came from if the load failed for
  * whatever reason.  If default map coordinates are to be used, then
  * the function that calls this should figure them out.
  */
-void
+bool
 object::enter_map (maptile *newmap, int x, int y)
 {
   if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
-    return;
+    return false;
   if (out_of_map (newmap, x, y))
     {
       LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
       x = newmap->enter_x;
       if (out_of_map (newmap, x, y))
         {
           LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n",
                &newmap->path, x, y, newmap->width, newmap->height);
           new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
-          return;
+          return false;
         }
     }
   if (contr && map != newmap && map)
     if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
-      return;
+      return false;
-  // remove, so stupid ob_locked does not trigger a failure
+  // remove, so stupid blocked does not trigger a failure
   remove ();
   /* try to find a spot for the player */
   if (blocked (newmap, x, y))
     {                           /* First choice blocked */
        * Note that for the second and third calls, we could start at a position other
        * than one, but then we could end up on the other side of walls and so forth.
        */
       int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1);
-      if (i == -1)
+      if (i < 0)
         {
           i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
-          if (i == -1)
+          if (i < 0)
             i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
         }
-      if (i != -1)
+      if (i >= 0)
         {
           x += freearr_x[i];
           y += freearr_y[i];
         }
       else
     }
   if (contr && map != newmap)
     {
       if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
-        return;
+        return false;
       if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
-        return;
+        return false;
     }
-  this->x = x;
-  this->y = y;
-  map = newmap;
-  insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
   enemy = 0;
+  //newmap->insert (this, x, y);
+  newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
+  if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
+    {
-  if (contr)
+      if (contr)
-    {
+        {
-      contr->maplevel = newmap->path;
+          contr->maplevel = newmap->path;
-      contr->count = 0;
+          contr->count = 0;
-    }
-  /* Update any golems */
+          /* Update any golems */
-  if (type == PLAYER)
-    if (object *golem = contr->golem)
+          if (object *golem = contr->golem)
-      {
+            {
-        int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
+              int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
-        if (i < 0)
+              if (i < 0)
-          golem->drop_and_destroy ();
+                golem->drop_and_destroy ();
-        else
+              else
-          {
+                {
-            newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
+                  newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
-            golem->direction = find_dir_2 (x - golem->x, y - golem->y);
+                  golem->direction = find_dir_2 (golem->x - x, golem->y - y);
+                }
-          }
+            }
-      }
+        }
-  /* since the players map is already loaded, we don't need to worry
+      /* since the players map is already loaded, we don't need to worry
-   * about pending objects.
+       * about pending objects.
-   */
+       */
-  remove_all_pets (newmap);
+      move_all_pets ();
+      return true;
+    }
+  return false;
 }
 /* process_players1 and process_players2 do all the player related stuff.
  * I moved it out of process events and process_map.  This was to some
  * extent for debugging as well as to get a better idea of the time used
   for_all_players (pl)
     {
       object *ob = pl->ob;
+      // process_objects destroys the speed_left value
+      pl->speed_left_save = ob->speed_left;
       if (expect_false (!ob || !pl->ns || !ob->active))
         continue;
       do_some_living (ob);
     }
 process_players2 ()
 {
   /* Then check if any players should use weapon-speed instead of speed */
   for_all_players (pl)
     {
+      // restore speed_left value saved by process_players1
+      pl->ob->speed_left = pl->speed_left_save;
       pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
       pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
     }
 }
-void
+static void
 process_events ()
 {
   process_players1 ();
   for_all_actives (op)
     {
+      // try to prefetch some stuff we expect to need
+      // obviously, it should be grouped into the same cacheline.
+      // preliminary results indicate that this gives halves the speed
+      // used for the inner loop
+      if (_i < actives.size ()) // HACK, rely on _i :/
+        {
+          object *next = actives [_i + 1];
+          prefetch (&next->flag      , 0, 1);
+          prefetch (&next->speed     , 0, 1);
+          prefetch (&next->anim_speed, 0, 1);
+          prefetch (&next->contr     , 0, 1);
+        }
       /* Now process op */
-      if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
+      if (expect_false (op->flag [FLAG_FREED]))
         {
           LOG (llevError, "BUG: process_events(): Free object on list\n");
           op->set_speed (0);
           continue;
         }
         {
           --op->speed_left;
           process_object (op);
         }
-      if (expect_true (!op->contr))
+      // this will destroy the speed_left value for players, but
+      // process_players1 and ..2 save/restore the real value,
+      // so we can avoid a costly test here.
-        op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
+      op->speed_left = min (op->speed, op->speed_left + op->speed);
     }
   process_players2 ();
 }
 /* clean up everything before exiting */
 void
 emergency_save ()
 {
-  LOG (llevDebug, "emergency save begin.\n");
+  LOG (llevInfo, "emergency_save: enter\n");
+  LOG (llevInfo, "emergency_save: saving book archive\n");
+  write_book_archive ();
   cfperl_emergency_save ();
-  LOG (llevDebug, "saving book archive.\n");
-  write_book_archive ();
-  LOG (llevDebug, "emergency save done.\n");
+  LOG (llevInfo, "emergency_save: leave\n");
 }
 // send all clients some informational text
 static void
 cleanup_inform (const char *cause, bool make_core)
 cleanup (const char *cause, bool make_core)
 {
   if (make_core)
     fork_abort (cause);
-  LOG (llevError, "cleanup cause: %s\n", cause);
+  LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
   if (!make_core)
     cleanup_inform (cause, make_core);
   LOG (llevDebug, "cleanup begin.\n");
  * done on the same tick, but that will happen very infrequently
  *
  * I also think this code makes it easier to see how often we really are
  * doing the various things.
  */
-void
+static void
-do_specials (void)
+do_specials ()
 {
   shstr::gc ();
   archetype::gc ();
   if (expect_false (!(pticks % TICKS_PER_HOUR)))
   // then do some bookkeeping, should not really be here
   do_specials ();               /* Routines called from time to time. */
   attachable::check_mortals ();
   ++pticks;
+  if (object::object_count >= RESTART_COUNT)
+    cleanup ("running out of protocol ID values - need full restart");
 }
 // normal main
 int
 main (int argc, char **argv)

Diff Legend

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

Comparing deliantra/server/server/main.C (file contents): Revision 1.139 by root, Mon Oct 12 14:00:59 2009 UTC vs. Revision 1.161 by root, Thu Apr 29 08:26:38 2010 UTC

Diff Legend

Comparing deliantra/server/server/main.C (file contents):
Revision 1.139 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.161 by root, Thu Apr 29 08:26:38 2010 UTC