--- deliantra/server/socket/loop.C 2006/12/16 18:39:26 1.24 +++ deliantra/server/socket/loop.C 2007/05/12 22:04:20 1.47 @@ -1,25 +1,26 @@ /* - CrossFire, A Multiplayer game for X-windows - - 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 - 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 this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - The author can be reached via e-mail to -*/ + * 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 + * 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 this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * The author can be reached via e-mail to + */ /** * \file @@ -28,10 +29,10 @@ * \date 2003-12-02 * * loop.c mainly deals with initialization and higher level socket - * maintenance (checking for lost connections and if data has arrived.) - * The reading of data is handled in ericserver.c + * 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 @@ -49,7 +50,7 @@ #include #define MAX_QUEUE_DEPTH 500 //TODO -#define MAX_QUEUE_BACKLOG 5. //TODO +#define MAX_QUEUE_BACKLOG 3. //TODO void client::reset_state () @@ -72,18 +73,13 @@ 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; cmd.handler = handler; - cmd.data = (char *)salloc (datalen + 1, data); + cmd.data = salloc (datalen + 1, data); cmd.datalen = datalen; } } @@ -91,33 +87,40 @@ bool client::handle_command () { - if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0) - return false; + bool skipping = false; - if (cmd_queue.empty ()) - return false; + while (!cmd_queue.empty () + && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0.f)) + { + 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 ()) - { - reset_state (); - send_packet_printf ("drawinfo %d ignoring delayed command.", NDI_RED); + cmd_queue.pop_front (); + } + else + { + 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 (); } /** @@ -135,76 +138,122 @@ write_cs_stats (); #endif - /* Go through the players. Let the loop set the next pl value, - * since we may remove some - */ - //TODO: must be handled cleanly elsewhere - for (player *pl = first_player; pl; ) + //TODO: should not be done here, either + for (unsigned i = 0; i < clients.size (); ++i) { - player *npl = pl->next; + client *ns = clients [i]; - //TODO: must be handled cleanly elsewhere - if (!pl->socket || pl->socket->status == Ns_Dead) - { - save_player (pl->ob, 0); + ns->tick (); + ns->refcnt_chk (); + } +} - if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) - { - terminate_all_pets (pl->ob); - pl->ob->remove (); - } +void +client::tick () +{ + if (!pl || destroyed ()) + return; - leave (pl, 1); - final_free_player (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); - pl = npl; + if (last_weight != -1 && last_weight != WEIGHT (pl->ob)) + { + esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); + if (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) last_weight, WEIGHT (pl->ob)); } - for (sockvec::iterator i = clients.begin (); i != clients.end (); ) + draw_client_map (pl->ob); + + if (update_look) + esrv_draw_look (pl->ob); + + if (askface.empty () && !partial_face_ofs) { - client *s = *i; + // 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 (); + + bg_scrub = 1; // send up to one face per tick, unless an image was requested + break; + } + } - if (s->status == Ns_Dead) - { - clients.erase (i); - delete s; - } - else - ++i; + rate_avail = max_rate - outputbuffer_len (); } + else + { + int ol = outputbuffer_len (); - /* We need to do some of the processing below regardless */ + rate_avail = min (max_rate, rate_avail + max_rate); + rate_avail -= ol; - /* Check for any input on the sockets */ - for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) - { - client *s = *i; - player *pl = s->pl; + int avail = rate_avail; - s->handle_packet (); - s->handle_command (); + // 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)); - //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); + bg_scrub = BG_SCRUB_RATE; - if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) + while (avail > 0) + { + if (partial_face_ofs) { - esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); - if (pl->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)); + if (facedata *d = face_data (partial_face, faceset)) + { + // 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) + break; + + partial_face_ofs -= chunk; + + packet sl ("ix"); + + sl << ber32 (partial_face) + << ber32 (partial_face_ofs) + << data (d->data.data () + partial_face_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 (); + } + } + else + send_image (facenum); + } + else + break; - draw_client_map (pl->ob); - - if (s->update_look) - esrv_draw_look (pl->ob); + int consumed = ol - outputbuffer_len (); + avail -= consumed; + rate_avail -= consumed; } } }