ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/loop.C
(Generate patch)

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.74 by root, Tue Apr 22 07:28:05 2008 UTC vs.
Revision 1.80 by root, Thu Jul 16 23:17:44 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team 5 * Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
95 { 95 {
96 command &cmd = cmd_queue.front (); 96 command &cmd = cmd_queue.front ();
97 97
98 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW) 98 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
99 { 99 {
100 reset_state (); 100 reset_state (); // the command might actually reset some movement state etc.
101 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); 101
102 if (pl)
103 pl->failmsg (
104 "Cannot keep up with your commands, ignoring them! "
105 "H<Your character cannot keep up with the instructions you give G<him|her>. "
106 "Try issuing commands slower, or, if G<he|she> is incapacitated (paralyzed and so on), "
107 "wait till your character can act again.\n\nIf G<he|she> is permanently stuck, then "
108 "try the B<suicide> command (or use B<chat> to ask somebody to B<invite> you out).>"
109 );
102 } 110 }
103 else 111 else
104 execute (cmd.handler, cmd.data, cmd.datalen); 112 execute (cmd.handler, cmd.data, cmd.datalen);
105 113
106 sfree<char> (cmd.data, cmd.datalen + 1); 114 sfree<char> (cmd.data, cmd.datalen + 1);
114void 122void
115client::tick () 123client::tick ()
116{ 124{
117 if (!pl || destroyed ()) 125 if (!pl || destroyed ())
118 return; 126 return;
127
128 pl->dirty = true;
119 129
120 /* Update the players stats once per tick. More efficient than 130 /* Update the players stats once per tick. More efficient than
121 * sending them whenever they change, and probably just as useful 131 * sending them whenever they change, and probably just as useful
122 */ 132 */
123 esrv_update_stats (pl); 133 esrv_update_stats (pl);
124 134
125 sint32 weight = pl->ob->client_weight (); 135 sint32 weight = pl->ob->client_weight ();
126 136
127 if (last_weight != weight) 137 if (last_weight != weight)
138 {
139 pl->ob->update_stats ();
128 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 140 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
141 }
129 142
130 draw_client_map (pl); 143 draw_client_map (pl);
131 144
132 if (update_look) 145 if (update_look)
133 esrv_draw_look (pl); 146 esrv_draw_look (pl);
153 tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss, 166 tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss,
154 167
155 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked)); 168 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
156#endif 169#endif
157 170
158 // fast-time-out a player by checking for missign acks 171 // fast-time-out a player by checking for missing acks
159 // do this only when player is active 172 // do this only when player is active
160 if (pl && pl->active 173 if (pl && pl->active
161 && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000)) 174 && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
162 { 175 {
163 send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)"); 176 send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
177#if HAVE_TCP_INFO 190#if HAVE_TCP_INFO
178 // further restrict the available bandwidth by the excess bandwidth available 191 // further restrict the available bandwidth by the excess bandwidth available
179 max_send = min (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss); 192 max_send = min (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss);
180#endif 193#endif
181 194
182 // if we can split images, round to next-lowest mss 195 // round to next-lowest mss
183 if (fxix) max_send -= max_send % mss; 196 max_send -= max_send % mss;
184 197
185 if (ixface.empty ()) 198 if (ixface.empty ())
186 { 199 {
187 // regularly send a new face when queue is empty 200 // regularly send a new face when queue is empty
188 if (bg_scrub && !--bg_scrub && enable_bg_scrub) 201 if (bg_scrub && !--bg_scrub)
189 while (scrub_idx < faces.size () - 1) 202 while (scrub_idx < faces.size () - 1)
190 { 203 {
191 ++scrub_idx; 204 ++scrub_idx;
192 205
193 if (!faces_sent [scrub_idx]) 206 if (!faces_sent [scrub_idx])
215 228
216 ixsend &ix = ixface.back (); 229 ixsend &ix = ixface.back ();
217 230
218 if (facedata *d = face_data (ix.idx, faceset)) 231 if (facedata *d = face_data (ix.idx, faceset))
219 { 232 {
220 if (fxix)
221 {
222 // estimate the packet header overhead "ix " + idx + (new)ofs 233 // estimate the packet header overhead "ix " + idx + (new)ofs
223 int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs); 234 int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
224 int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen; 235 int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
225 236
226 // only transfer something if the amount of data transferred 237 // only transfer something if the amount of data transferred
227 // has a healthy relation to the header overhead 238 // has a healthy relation to the header overhead
228 if (chunk < 64) 239 if (chunk < 64)
229 break; 240 break;
230 241
231 chunk = min (chunk, (int)ix.ofs); 242 chunk = min (chunk, (int)ix.ofs);
232 243
233 ix.ofs -= chunk; 244 ix.ofs -= chunk;
234 245
235 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D 246 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
236 247
237 packet sl ("ix"); 248 packet sl ("ix");
238 249
239 sl << ber32 (ix.idx) 250 sl << ber32 (ix.idx)
240 << ber32 (ix.ofs) 251 << ber32 (ix.ofs)
241 << data (d->data.data () + ix.ofs, chunk); 252 << data (d->data.data () + ix.ofs, chunk);
242 253
243 send_packet (sl); 254 send_packet (sl);
244 }
245 else
246 {
247 send_image (ix.idx);
248 ix.ofs = 0;
249 }
250 } 255 }
251 else 256 else
252 ix.ofs = 0; 257 ix.ofs = 0;
253 258
254 if (!ix.ofs) 259 if (!ix.ofs)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines