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.71 by root, Sun Jan 13 12:39:29 2008 UTC vs.
Revision 1.92 by root, Tue Jan 3 11:25:37 2012 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,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 5 *
8 * Deliantra is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 9 * option) any later version.
12 * 10 *
13 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 14 * GNU General Public License for more details.
17 * 15 *
18 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 21 */
23 22
24/** 23/**
42#include <netdb.h> 41#include <netdb.h>
43 42
44#include <unistd.h> 43#include <unistd.h>
45#include <arpa/inet.h> 44#include <arpa/inet.h>
46 45
47#include <loader.h>
48
49#define BG_SCRUB_RATE 4 // how often to send a face in the background 46#define BG_SCRUB_RATE 4 // how often to send a face in the background
50 47
51#define MAX_QUEUE_DEPTH 50 48#define MAX_QUEUE_DEPTH 50
52#define MAX_QUEUE_BACKLOG 3. 49#define MAX_QUEUE_BACKLOG 3.
53 50
54// disconnect a socket after this many seconds without an ack
55#define SOCKET_TIMEOUT 8.
56
57void 51void
58client::reset_state () 52client::reset_state ()
59{ 53{
60 if (!pl) 54 if (!pl)
61 return; 55 return;
69{ 63{
70 tstamp stamp = NOW; 64 tstamp stamp = NOW;
71 65
72 if (cmd_queue.size () >= MAX_QUEUE_DEPTH) 66 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
73 { 67 {
74 //TODO: just disconnect here?
75 reset_state (); 68 reset_state ();
76 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED); 69 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
77 } 70 }
78 else 71 else
79 { 72 {
95 { 88 {
96 command &cmd = cmd_queue.front (); 89 command &cmd = cmd_queue.front ();
97 90
98 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW) 91 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
99 { 92 {
100 reset_state (); 93 reset_state (); // the command might actually reset some movement state etc.
101 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); 94
95 if (pl)
96 pl->failmsg (
97 "Cannot keep up with your commands, ignoring them! "
98 "H<Your character cannot keep up with the instructions you give G<him|her>. "
99 "Try issuing commands slower, or, if G<he|she> is incapacitated (paralyzed and so on), "
100 "wait till your character can act again.\n\nIf G<he|she> is permanently stuck, then "
101 "try the B<suicide> command (or use B<chat> to ask somebody to B<invite> you out).>"
102 );
102 } 103 }
103 else 104 else
104 execute (cmd.handler, cmd.data, cmd.datalen); 105 execute (cmd.handler, cmd.data, cmd.datalen);
105 106
106 sfree<char> (cmd.data, cmd.datalen + 1); 107 sfree<char> (cmd.data, cmd.datalen + 1);
115client::tick () 116client::tick ()
116{ 117{
117 if (!pl || destroyed ()) 118 if (!pl || destroyed ())
118 return; 119 return;
119 120
121 pl->dirty = true;
122
120 /* Update the players stats once per tick. More efficient than 123 /* Update the players stats once per tick. More efficient than
121 * sending them whenever they change, and probably just as useful 124 * sending them whenever they change, and probably just as useful
122 */ 125 */
126 pl->need_updated_stats ();
123 esrv_update_stats (pl); 127 esrv_update_stats (pl);
124 128
125 if (last_weight != -1 && last_weight != WEIGHT (pl->ob)) 129 if (pl->ns->update_spells)
130 esrv_update_spells (pl);
131
132 sint32 weight = pl->ob->client_weight ();
133
134 if (last_weight != weight)
126 { 135 {
136 pl->ob->update_stats ();
127 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 137 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
128 if (last_weight != WEIGHT (pl->ob))
129 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
130 (unsigned long) last_weight, WEIGHT (pl->ob));
131 } 138 }
132 139
133 draw_client_map (pl); 140 draw_client_map (pl);
134 141
135 if (update_look) 142 if (update_look)
156 tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss, 163 tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss,
157 164
158 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked)); 165 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
159#endif 166#endif
160 167
161 // fast-time-out a player by checking for missign acks 168 // fast-time-out a player by checking for missing acks
162 // do this only when player is active 169 // do this only when player is active
163 if (pl && pl->active 170 if (pl && pl->active
164 && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000)) 171 && tcpi.tcpi_last_ack_recv > int (socket_timeout * 1000))
165 { 172 {
166 send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)"); 173 send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
167 write_outputbuffer (); 174 write_outputbuffer ();
168 175
169 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, 176 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
171 destroy (); 178 destroy ();
172 } 179 }
173 } 180 }
174#endif 181#endif
175 182
183 // limit budget surplus/deficit by one mss, add per-tick budget
176 rate_avail = min (max_rate + mss, rate_avail + max_rate); 184 rate_avail = min (rate_avail, mss) + max_rate;
177 185
178 int max_send = rate_avail; 186 int max_send = rate_avail;
179 187
180#if HAVE_TCP_INFO 188#if HAVE_TCP_INFO
181 // further restrict the available bandwidth by the excess bandwidth available 189 // further restrict the available bandwidth by the excess bandwidth available
182 max_send = min (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss); 190 min_it (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss);
183#endif 191#endif
184 192
185 // if we can split images, round to next-lowest mss 193 // round to next-lowest mss
186 if (fxix) max_send -= max_send % mss; 194 max_send -= max_send % mss;
187 195
188 if (ixface.empty ()) 196 if (ixface.empty ())
189 { 197 {
190 // regularly send a new face when queue is empty 198 // regularly send a new face when queue is empty
191 if (bg_scrub && !--bg_scrub && enable_bg_scrub) 199 if (bg_scrub && !--bg_scrub)
192 while (scrub_idx < faces.size () - 1) 200 while (scrub_idx < faces.size () - 1)
193 { 201 {
194 ++scrub_idx; 202 ++scrub_idx;
195 203
196 if (!faces_sent [scrub_idx]) 204 if (!faces_sent [scrub_idx])
218 226
219 ixsend &ix = ixface.back (); 227 ixsend &ix = ixface.back ();
220 228
221 if (facedata *d = face_data (ix.idx, faceset)) 229 if (facedata *d = face_data (ix.idx, faceset))
222 { 230 {
223 if (fxix)
224 {
225 // estimate the packet header overhead "ix " + idx + (new)ofs 231 // estimate the packet header overhead "ix " + idx + (new)ofs
226 int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs); 232 int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
227 int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen; 233 int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
228 234
229 // only transfer something if the amount of data transferred 235 // only transfer something if the amount of data transferred
230 // has a healthy relation to the header overhead 236 // has a healthy relation to the header overhead
231 if (chunk < 64) 237 if (chunk < 64)
232 break; 238 break;
233 239
234 chunk = min (chunk, (int)ix.ofs); 240 chunk = min (chunk, (int)ix.ofs);
235 241
236 ix.ofs -= chunk; 242 ix.ofs -= chunk;
237 243
238 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D 244 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
239 245
240 packet sl ("ix"); 246 packet sl ("ix");
241 247
242 sl << ber32 (ix.idx) 248 sl << ber32 (ix.idx)
243 << ber32 (ix.ofs) 249 << ber32 (ix.ofs)
244 << data (d->data.data () + ix.ofs, chunk); 250 << data (d->data + ix.ofs, chunk);
245 251
246 send_packet (sl); 252 send_packet (sl);
247 }
248 else
249 {
250 send_image (ix.idx);
251 ix.ofs = 0;
252 }
253 } 253 }
254 else 254 else
255 ix.ofs = 0; 255 ix.ofs = 0;
256 256
257 if (!ix.ofs) 257 if (!ix.ofs)
266 266
267 rate_avail -= outputbuffer_len (); 267 rate_avail -= outputbuffer_len ();
268} 268}
269 269
270void 270void
271client::flush_sockets (void) 271client::flush_sockets ()
272{ 272{
273 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 273 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
274 (*i)->flush (); 274 (*i)->flush ();
275} 275}
276 276
277void 277void
278client::clock (void) 278client::clock ()
279{ 279{
280 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 280 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
281 (*i)->tick (); 281 (*i)->tick ();
282 282
283 // give them all the same chances 283 // give them all the same chances

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines