--- deliantra/server/socket/loop.C 2007/06/24 04:09:29 1.52
+++ deliantra/server/socket/loop.C 2007/07/29 02:24:34 1.65
@@ -1,23 +1,22 @@
/*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
*
* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
* Copyright (©) 2002-2003,2007 Mark Wedel & The 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.
- *
- * 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
+ * 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 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 GNU General Public License
+ * along with this program. If not, see .
*
* The authors can be reached via e-mail to
*/
@@ -49,7 +48,7 @@
#define BG_SCRUB_RATE 4 // how often to send a face in the background
-#define MAX_QUEUE_DEPTH 500
+#define MAX_QUEUE_DEPTH 50
#define MAX_QUEUE_BACKLOG 3.
void
@@ -159,21 +158,24 @@
if (update_look)
esrv_draw_look (pl);
- if (askface.empty () && !partial_face_ofs)
+ if (ixface.empty ())
{
// regularly send a new face when queue is empty
if (bg_scrub && !--bg_scrub && enable_bg_scrub)
while (scrub_idx < faces.size () - 1)
{
++scrub_idx;
+
if (!faces_sent [scrub_idx])
- {
- send_face (scrub_idx);
- flush_fx ();
+ if (faceinfo *f = face_info (scrub_idx))
+ if (f->type == FT_FACE) // only scrub faces for now
+ {
+ send_face (scrub_idx, -120);
+ flush_fx ();
- bg_scrub = 1; // send up to one face per tick, unless an image was requested
- break;
- }
+ bg_scrub = 1; // send up to one face per tick, unless an image was requested
+ break;
+ }
}
rate_avail = max_rate - outputbuffer_len ();
@@ -182,65 +184,77 @@
{
int ol = outputbuffer_len ();
- rate_avail = min (max_rate, rate_avail + max_rate);
- rate_avail -= ol;
+ rate_avail = min (max_rate + mss, rate_avail + max_rate);
int avail = rate_avail;
- // if we can split images, transfer up to mss packets if possible
- // but never 768 bytes more.
- if (fxix) avail += min (768, mss - (ol % mss));
+ // if we can split images, round to next-lowest mss
+ if (fxix) avail -= avail % mss;
+
+ rate_avail -= ol;
+ avail -= ol;
+
+#if HAVE_TCP_INFO
+ // further restrict the available bandwidth by the excess bandwidth available
+ avail = max (0, min (avail, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss));
+#endif
bg_scrub = BG_SCRUB_RATE;
while (avail > 0)
{
- if (partial_face_ofs)
+ ixsend &ix = ixface.back ();
+
+ if (facedata *d = face_data (ix.idx, faceset))
{
- if (facedata *d = face_data (partial_face, faceset))
+ if (fxix)
{
- // 9 bytes is enough for fx_FFFOOO, 40 leaves some room
- int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs);
-
- if (chunk <= 0)
+ // estimate the packet header overhead "ix " + idx + (new)ofs
+ int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
+ int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
+
+ // only transfer something if the amount of data transferred
+ // has a healthy relation to the header overhead
+ if (chunk < 64)
break;
- partial_face_ofs -= chunk;
+ chunk = min (chunk, (int)ix.ofs);
+
+ ix.ofs -= chunk;
+
+ //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
packet sl ("ix");
- sl << ber32 (partial_face)
- << ber32 (partial_face_ofs)
- << data (d->data.data () + partial_face_ofs, chunk);
+ sl << ber32 (ix.idx)
+ << ber32 (ix.ofs)
+ << data (d->data.data () + ix.ofs, chunk);
send_packet (sl);
}
else
- partial_face_ofs = 0;
- }
- else if (!askface.empty ())
- {
- // use a lifo to send most recently requested images
- faceidx facenum = askface.back ();
- askface.pop_back ();
-
- if (fxix)
{
- if (facedata *d = face_data (facenum, faceset))
- {
- partial_face = facenum;
- partial_face_ofs = d->data.size ();
- }
+ send_image (ix.idx);
+ ix.ofs = 0;
}
- else
- send_image (facenum);
}
else
- break;
+ ix.ofs = 0;
+
+ int consumed = outputbuffer_len () - ol;
- int consumed = ol - outputbuffer_len ();
avail -= consumed;
rate_avail -= consumed;
+
+ ol = outputbuffer_len ();
+
+ if (!ix.ofs)
+ {
+ ixface.pop_back ();
+
+ if (ixface.empty ())
+ break;
+ }
}
}
}