--- deliantra/server/socket/loop.C 2007/07/28 00:45:05 1.64 +++ deliantra/server/socket/loop.C 2007/07/31 20:10:31 1.67 @@ -48,9 +48,12 @@ #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. +// disconnect a socket after this many seconds without an ack +#define SOCKET_TIMEOUT 8. + void client::reset_state () { @@ -108,33 +111,6 @@ } void -flush_sockets (void) -{ - for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) - (*i)->flush (); -} - -/** - * This checks the sockets for input, does the right thing. - * - * A bit of this code is grabbed out of socket.c - * There are 2 lists we need to look through - init_sockets is a list - * - */ -void -doeric_server (void) -{ - //TODO: should not be done here, either - for (unsigned i = 0; i < clients.size (); ++i) - { - client *ns = clients [i]; - - ns->tick (); - ns->refcnt_chk (); - } -} - -void client::tick () { if (!pl || destroyed ()) @@ -158,120 +134,153 @@ if (update_look) esrv_draw_look (pl); - bool overload = false; - #if HAVE_TCP_INFO - // do bandwidth checking - if (tcpi.tcpi_unacked + 1 > max (4, tcpi.tcpi_snd_cwnd)) + // check time of last ack, and, if too old, kill connection + socklen_t len = sizeof (tcpi); + + if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) { - overload = true; - if (next_rate_adjust <= NOW) + if (tcpi.tcpi_snd_mss) + mss = tcpi.tcpi_snd_mss; + +#if 0 + fprintf (stderr, "uack %d ack %d lost %d ret %d fack %d sst %d cwnd %d mss %d pmtu %d advmss %d EXC %d\n", + tcpi.tcpi_unacked, + tcpi.tcpi_sacked, + tcpi.tcpi_lost, + tcpi.tcpi_retrans, + tcpi.tcpi_fackets, + tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss, + + tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked)); +#endif + + // do this only when player is active + if (pl && pl->active + && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000)) { - 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)); + send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)"); + write_outputbuffer (); + + LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, + (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked); + destroy (); } } #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) - { - ++scrub_idx; - - 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 = min (max_rate + mss, rate_avail + max_rate); - rate_avail = max_rate - outputbuffer_len (); - } - else - { - int ol = outputbuffer_len (); + 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); +#endif - rate_avail = min (max_rate, rate_avail + max_rate); - rate_avail -= ol; + // if we can split images, round to next-lowest mss + if (fxix) max_send -= max_send % mss; + + 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]) + if (faceinfo *f = face_info (scrub_idx)) + if (f->type == FT_FACE || 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 + break; + } + } + } + else + { + bg_scrub = BG_SCRUB_RATE; - int avail = rate_avail; + for (;;) + { + int avail = max_send - outputbuffer_len (); - // 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)); + if (avail <= 0) + break; - bg_scrub = BG_SCRUB_RATE; + ixsend &ix = ixface.back (); - while (avail > 0) + if (facedata *d = face_data (ix.idx, faceset)) { - ixsend &ix = ixface.back (); - - if (facedata *d = face_data (ix.idx, faceset)) + if (fxix) { - if (fxix) - { - // only transfer something if the amount of data transferred - // has a healthy relation to the header overhead - if (avail <= 40) - break; - - // 9 bytes is enough for fx_FFFOOO - int chunk = min (min (avail, MAXSOCKBUF - 9), (int)ix.ofs); - - if (chunk <= 0) - break; - - 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 (ix.idx) - << ber32 (ix.ofs) - << data (d->data.data () + ix.ofs, chunk); - - send_packet (sl); - } - else - { - send_image (ix.idx); - ix.ofs = 0; - } - } - else - ix.ofs = 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; - int consumed = outputbuffer_len () - ol; + chunk = min (chunk, (int)ix.ofs); - avail -= consumed; - rate_avail -= consumed; + ix.ofs -= chunk; - ol = outputbuffer_len (); + //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D - if (!ix.ofs) - { - ixface.pop_back (); + packet sl ("ix"); - if (ixface.empty ()) - break; + sl << ber32 (ix.idx) + << ber32 (ix.ofs) + << data (d->data.data () + ix.ofs, chunk); + + send_packet (sl); + } + else + { + send_image (ix.idx); + ix.ofs = 0; } } + else + ix.ofs = 0; + + if (!ix.ofs) + { + ixface.pop_back (); + + if (ixface.empty ()) + break; + } } } + + rate_avail -= outputbuffer_len (); +} + +void +client::flush_sockets (void) +{ + for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) + (*i)->flush (); +} + +void +client::clock (void) +{ + for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) + (*i)->tick (); + + // give them all the same chances + flush_sockets (); + + //TODO: should not be done here, either + for (unsigned i = 0; i < clients.size (); ++i) + clients[i]->refcnt_chk (); }