--- deliantra/server/socket/loop.C 2007/05/28 21:22:26 1.49
+++ deliantra/server/socket/loop.C 2007/07/28 00:45:05 1.64
@@ -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
*/
@@ -32,8 +31,6 @@
* maintanance (checking for lost connections and if data has arrived.)
*/
-#define BG_SCRUB_RATE 4 // how often to send a face in the background
-
#include
#include
#include
@@ -49,8 +46,10 @@
#include
-#define MAX_QUEUE_DEPTH 500 //TODO
-#define MAX_QUEUE_BACKLOG 3. //TODO
+#define BG_SCRUB_RATE 4 // how often to send a face in the background
+
+#define MAX_QUEUE_DEPTH 500
+#define MAX_QUEUE_BACKLOG 3.
void
client::reset_state ()
@@ -65,7 +64,7 @@
void
client::queue_command (packet_type *handler, char *data, int datalen)
{
- tstamp stamp = now ();
+ tstamp stamp = NOW;
if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
{
@@ -93,7 +92,7 @@
{
command &cmd = cmd_queue.front ();
- if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
+ if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
{
reset_state ();
send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
@@ -125,11 +124,6 @@
void
doeric_server (void)
{
-#ifdef CS_LOGSTATS
- if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
- write_cs_stats ();
-#endif
-
//TODO: should not be done here, either
for (unsigned i = 0; i < clients.size (); ++i)
{
@@ -159,93 +153,124 @@
(unsigned long) last_weight, WEIGHT (pl->ob));
}
- draw_client_map (pl->ob);
+ draw_client_map (pl);
if (update_look)
- esrv_draw_look (pl->ob);
+ esrv_draw_look (pl);
+
+ bool overload = false;
- if (askface.empty () && !partial_face_ofs)
+#if HAVE_TCP_INFO
+ // do bandwidth checking
+ if (tcpi.tcpi_unacked + 1 > max (4, tcpi.tcpi_snd_cwnd))
{
- // 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])
+ overload = true;
+ if (next_rate_adjust <= NOW)
+ {
+ next_rate_adjust = NOW + 2;
+ max_rate = max (max_rate >> 1, int (5000 * TICK));
+ LOG (llevDebug, "tcp %s overloaded (%d + 1 > 4 | %d), rate now %d\n",
+ host, (int)tcpi.tcpi_unacked, (int)tcpi.tcpi_snd_cwnd, int (max_rate / TICK));//D
+ send_packet_printf ("drawinfo %d Due to possible network congestion, your output-rate has been reduced to %dbps.",
+ NDI_RED, int (max_rate / TICK));
+ }
+ }
+#endif
+
+ if (!overload)
+ {
+ 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)
{
- send_face (scrub_idx);
- flush_fx ();
+ ++scrub_idx;
- bg_scrub = 1; // send up to one face per tick, unless an image was requested
- break;
+ if (!faces_sent [scrub_idx])
+ 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;
+ }
}
- }
- rate_avail = max_rate - outputbuffer_len ();
- }
- else
- {
- int ol = outputbuffer_len ();
+ rate_avail = max_rate - outputbuffer_len ();
+ }
+ else
+ {
+ int ol = outputbuffer_len ();
- rate_avail = min (max_rate, rate_avail + max_rate);
- rate_avail -= ol;
+ rate_avail = min (max_rate, rate_avail + max_rate);
+ rate_avail -= ol;
- int avail = rate_avail;
+ int avail = rate_avail;
- // if we can split images, transfer up to mss packets if possible
- // but never more 768 bytes more.
- if (fxix) avail += min (768, mss - (ol % mss));
+ // if we can split images, transfer up to mss-sized packets if possible
+ // but never 768 bytes more.
+ if (fxix) avail += min (768, mss - (ol % mss));
- bg_scrub = BG_SCRUB_RATE;
+ bg_scrub = BG_SCRUB_RATE;
- while (avail > 0)
- {
- if (partial_face_ofs)
+ while (avail > 0)
{
- if (facedata *d = face_data (partial_face, faceset))
+ ixsend &ix = ixface.back ();
+
+ if (facedata *d = face_data (ix.idx, faceset))
{
- // 9 bytes is enough for fx_FFFOOO, 40 leaves some room
- int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs);
+ if (fxix)
+ {
+ // only transfer something if the amount of data transferred
+ // has a healthy relation to the header overhead
+ if (avail <= 40)
+ break;
- if (chunk <= 0)
- break;
+ // 9 bytes is enough for fx_FFFOOO
+ int chunk = min (min (avail, MAXSOCKBUF - 9), (int)ix.ofs);
- partial_face_ofs -= chunk;
+ if (chunk <= 0)
+ break;
- packet sl ("ix");
+ ix.ofs -= chunk;
- sl << ber32 (partial_face)
- << ber32 (partial_face_ofs)
- << data (d->data.data () + partial_face_ofs, chunk);
+ //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
- 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 ();
+ packet sl ("ix");
- if (fxix)
- {
- if (facedata *d = face_data (facenum, faceset))
+ sl << ber32 (ix.idx)
+ << ber32 (ix.ofs)
+ << data (d->data.data () + ix.ofs, chunk);
+
+ send_packet (sl);
+ }
+ else
{
- 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;
+
+ avail -= consumed;
+ rate_avail -= consumed;
+
+ ol = outputbuffer_len ();
- int consumed = ol - outputbuffer_len ();
- avail -= consumed;
- rate_avail -= consumed;
+ if (!ix.ofs)
+ {
+ ixface.pop_back ();
+
+ if (ixface.empty ())
+ break;
+ }
+ }
}
}
}