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

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.25 by root, Sat Dec 16 21:40:26 2006 UTC vs.
Revision 1.38 by root, Sun Jan 14 21:20:51 2007 UTC

 /*
     CrossFire, A Multiplayer game for X-windows
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
  * Main client/server loops.
  *
  * \date 2003-12-02
  *
  * loop.c mainly deals with initialization and higher level socket
- * maintenance (checking for lost connections and if data has arrived.)
+ * maintanance (checking for lost connections and if data has arrived.)
- * The reading of data is handled in ericserver.c
  */
 #include <global.h>
 #include <sproto.h>
 #include <arpa/inet.h>
 #include <loader.h>
 #define MAX_QUEUE_DEPTH   500 //TODO
-#define MAX_QUEUE_BACKLOG 5.  //TODO
+#define MAX_QUEUE_BACKLOG 3.  //TODO
 void
 client::reset_state ()
 {
   if (!pl)
     {
       //TODO: just disconnect here?
       reset_state ();
       send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
     }
-  else if (!cmd_queue.empty () && cmd_queue.front ().stamp + MAX_QUEUE_BACKLOG < stamp)
-    {
-      reset_state ();
-      send_packet_printf ("drawinfo %d too many commands in queue, ignoring.", NDI_RED);
-    }
   else
     {
       cmd_queue.push_back (command ());
       command &cmd = cmd_queue.back ();
       cmd.stamp   = stamp;
 }
 bool
 client::handle_command ()
 {
-  if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)
+  bool skipping = false;
-    return false;
-  if (cmd_queue.empty ())
+  while (!cmd_queue.empty ()
-    return false;
+         && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0))
+    {
+      command &cmd = cmd_queue.front ();
-  command &cmd = cmd_queue.front ();
+      if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
+        {
+          if (!skipping)
+            {
+              skipping = true;
+              reset_state ();
+              send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
+            }
-  if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
+          cmd_queue.pop_front ();
-    {
+        }
-      reset_state ();
+      else
-      send_packet_printf ("drawinfo %d ignoring delayed command.", NDI_RED);
+        {
+          execute (cmd.handler, cmd.data, cmd.datalen);
+          cmd_queue.pop_front ();
+          return true;
+        }
     }
-  else
-    execute (cmd.handler, cmd.data, cmd.datalen);
-  cmd_queue.pop_front ();
-  return true;
+  return false;
 }
 void
 flush_sockets (void)
 {
   for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
-    if ((*i)->status != Ns_Dead)
-      (*i)->flush ();
+    (*i)->flush ();
 }
 /**
  * This checks the sockets for input, does the right thing.
  *
 #ifdef CS_LOGSTATS
   if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
     write_cs_stats ();
 #endif
-  /* Go through the players.  Let the loop set the next pl value,
+  //TODO: should not be done here, either
-   * since we may remove some
+  for (int i = 0; i < clients.size (); ++i)
-   */
-  //TODO: must be handled cleanly elsewhere
-  for (player *pl = first_player; pl; )
     {
-      player *npl = pl->next;
-      //TODO: must be handled cleanly elsewhere
-      if (!pl->socket || pl->socket->status == Ns_Dead)
-        {
-          save_player (pl->ob, 0);
-          if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
-            {
-              terminate_all_pets (pl->ob);
-              pl->ob->remove ();
-            }
-          leave (pl, 1);
-          final_free_player (pl);
-        }
-      pl = npl;
-    }
-  for (sockvec::iterator i = clients.begin (); i != clients.end (); )
-    {
-      client *s = *i;
+      client *s = clients [i];
-      if (s->status == Ns_Dead)
-        {
-          clients.erase (i);
-          delete s;
-        }
-      else
-        ++i;
-    }
-  /* We need to do some of the processing below regardless */
-  /* Check for any input on the sockets */
-  for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
-    {
-      client *s = *i;
       player *pl = s->pl;
-      s->handle_packet ();
+      if (pl && pl->ns && !pl->ns->destroyed ())
-      s->handle_command ();
+        {
+          client *ns = pl->ns;
-      //TODO: should not be done here, either
-      if (s->status != Ns_Dead && pl)
-        {
           /* Update the players stats once per tick.  More efficient than
            * sending them whenever they change, and probably just as useful
            */
           esrv_update_stats (pl);
-          if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
+          if (ns->last_weight != -1 && ns->last_weight != WEIGHT (pl->ob))
             {
               esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
-              if (pl->last_weight != WEIGHT (pl->ob))
+              if (ns->last_weight != WEIGHT (pl->ob))
                 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
-                     (unsigned long) pl->last_weight, WEIGHT (pl->ob));
+                     (unsigned long) ns->last_weight, WEIGHT (pl->ob));
             }
           draw_client_map (pl->ob);
           if (s->update_look)
             esrv_draw_look (pl->ob);
         }
+      s->refcnt_chk ();
     }
 }

Diff Legend

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

Comparing deliantra/server/socket/loop.C (file contents): Revision 1.25 by root, Sat Dec 16 21:40:26 2006 UTC vs. Revision 1.38 by root, Sun Jan 14 21:20:51 2007 UTC

Diff Legend

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.25 by root, Sat Dec 16 21:40:26 2006 UTC vs.
Revision 1.38 by root, Sun Jan 14 21:20:51 2007 UTC