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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.140 by root, Wed Nov 4 00:08:44 2009 UTC vs.
Revision 1.144 by root, Thu Nov 19 04:30:46 2009 UTC

 #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);
 }
   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)))
         {
           LOG (llevError, "BUG: process_events(): Free object on list\n");
           op->set_speed (0);
         {
           --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 (abs (op->speed), op->speed_left + abs (op->speed));
     }
   process_players2 ();
 }
  * 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)
 {
   shstr::gc ();
   archetype::gc ();

Diff Legend

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

Comparing deliantra/server/server/main.C (file contents): Revision 1.140 by root, Wed Nov 4 00:08:44 2009 UTC vs. Revision 1.144 by root, Thu Nov 19 04:30:46 2009 UTC

Diff Legend

Comparing deliantra/server/server/main.C (file contents):
Revision 1.140 by root, Wed Nov 4 00:08:44 2009 UTC vs.
Revision 1.144 by root, Thu Nov 19 04:30:46 2009 UTC