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

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.82 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.98 by root, Sat Nov 17 06:05:33 2012 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,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
- * Copyright (©) 1992,2007 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.
  *
  * 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 Affero GNU General Public License
  * 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>
  */
 /**
  * \file
 #include <netdb.h>
 #include <unistd.h>
 #include <arpa/inet.h>
-#include <loader.h>
 #define BG_SCRUB_RATE 4 // how often to send a face in the background
 #define MAX_QUEUE_DEPTH   50
 #define MAX_QUEUE_BACKLOG 3.
 {
   tstamp stamp = NOW;
   if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
     {
-      //TODO: just disconnect here?
       reset_state ();
-      send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
+      send_packet_printf ("msg %d 0 command queue overflow, ignoring.", NDI_RED);
     }
   else
     {
       cmd_queue.resize (cmd_queue.size () + 1);
       command &cmd = cmd_queue.back ();
 }
 void
 client::tick ()
 {
-  if (!pl || destroyed ())
+  if (destroyed ())
     return;
+  if (pl)
+    {
-  pl->dirty = true;
+      pl->dirty = true;
-  /* Update the players stats once per tick.  More efficient than
+      /* Update the players stats once per tick.  More efficient than
-   * sending them whenever they change, and probably just as useful
+       * sending them whenever they change, and probably just as useful
-   */
+       */
+      pl->need_updated_stats ();
-  esrv_update_stats (pl);
+      esrv_update_stats (pl);
+      if (pl->ns->update_spells)
+        esrv_update_spells (pl);
-  sint32 weight = pl->ob->client_weight ();
+      sint32 weight = pl->ob->client_weight ();
-  if (last_weight != weight)
+      if (last_weight != weight)
-    {
+        {
-      pl->ob->update_stats ();
+          pl->ob->update_stats ();
-      esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
+          esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
-    }
+        }
-  draw_client_map (pl);
+      draw_client_map (pl);
-  if (update_look)
+      if (update_look)
-    esrv_draw_look (pl);
+        esrv_draw_look (pl);
-  mapinfo_queue_run ();
+      mapinfo_queue_run ();
+    }
 #if HAVE_TCP_INFO
   // check time of last ack, and, if too old, kill connection
   socklen_t len = sizeof (tcpi);
           destroy ();
         }
     }
 #endif
+  // limit budget surplus/deficit by one mss, add per-tick budget
-  rate_avail = min (max_rate + mss, rate_avail + max_rate);
+  rate_avail = min (rate_avail, mss) + max_rate;
   int max_send = rate_avail;
 #if HAVE_TCP_INFO
   // further restrict the available bandwidth by the excess bandwidth available
-  max_send = min (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss);
+  min_it (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss);
 #endif
   // round to next-lowest mss
   max_send -= max_send % mss;
           {
             ++scrub_idx;
             if (!faces_sent [scrub_idx])
               if (faceinfo *f = face_info (scrub_idx))
-                if (f->type == FT_FACE || f->type == FT_SOUND) // only scrub faces and sounds for now
+                if (f->type == FT_IMAGE || f->type == FT_SOUND) // only scrub faces and sounds for now
                   {
                     send_face (scrub_idx, -120);
                     flush_fx ();
                     bg_scrub = 1; // send up to one fx per tick, unless an image was requested
           if (avail <= 0)
             break;
           ixsend &ix = ixface.back ();
-          if (facedata *d = face_data (ix.idx, faceset))
-            {
-              // estimate the packet header overhead "ix " + idx + (new)ofs
+          // estimate the packet header overhead "ix " + idx + (new)ofs
-              int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
+          int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
-              int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
+          int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
-              // only transfer something if the amount of data transferred
+          // only transfer something if the amount of data transferred
-              // has a healthy relation to the header overhead
+          // has a healthy relation to the header overhead
-              if (chunk < 64)
+          if (chunk < 64)
-                break;
+            break;
-              chunk = min (chunk, (int)ix.ofs);
+          chunk = min (chunk, (int)ix.ofs);
-              ix.ofs -= chunk;
+          ix.ofs -= chunk;
-              //fprintf (stderr, "i%dx %6d: %5d+%4d   (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
+          //fprintf (stderr, "i%dx %6d: %5d+%4d   (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
-              packet sl ("ix");
+          packet sl ("ix");
-              sl << ber32 (ix.idx)
+          sl << ber32 (ix.idx)
-                 << ber32 (ix.ofs)
+             << ber32 (ix.ofs)
-                 << data (d->data.data () + ix.ofs, chunk);
+             << data (ix.data + ix.ofs, chunk);
-              send_packet (sl);
+          send_packet (sl);
-            }
-          else
-            ix.ofs = 0;
           if (!ix.ofs)
             {
-              ixface.pop_back ();
+              ix_pop ();
               if (ixface.empty ())
                 break;
             }
         }
   rate_avail -= outputbuffer_len ();
 }
 void
-client::flush_sockets (void)
+client::flush_sockets ()
 {
   for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
     (*i)->flush ();
 }
 void
-client::clock (void)
+client::clock ()
 {
   for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
     (*i)->tick ();
   // give them all the same chances

Diff Legend

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

Comparing deliantra/server/socket/loop.C (file contents): Revision 1.82 by root, Mon Oct 12 14:00:59 2009 UTC vs. Revision 1.98 by root, Sat Nov 17 06:05:33 2012 UTC

Diff Legend

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.82 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.98 by root, Sat Nov 17 06:05:33 2012 UTC