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.79 by root, Wed Mar 18 11:09:14 2009 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,2008 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 16.
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 {
… …
128 pl->dirty = true; 121 pl->dirty = true;
129 122
130 /* Update the players stats once per tick. More efficient than 123 /* Update the players stats once per tick. More efficient than
131 * sending them whenever they change, and probably just as useful 124 * sending them whenever they change, and probably just as useful
132 */ 125 */
126 pl->need_updated_stats ();
133 esrv_update_stats (pl); 127 esrv_update_stats (pl);
128
129 if (pl->ns->update_spells)
130 esrv_update_spells (pl);
134 131
135 sint32 weight = pl->ob->client_weight (); 132 sint32 weight = pl->ob->client_weight ();
136 133
137 if (last_weight != weight) 134 if (last_weight != weight)
138 { 135 {
… …
166 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,
167 164
168 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked)); 165 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
169#endif 166#endif
170 167
171 // fast-time-out a player by checking for missign acks 168 // fast-time-out a player by checking for missing acks
172 // do this only when player is active 169 // do this only when player is active
173 if (pl && pl->active 170 if (pl && pl->active
174 && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000)) 171 && tcpi.tcpi_last_ack_recv > int (socket_timeout * 1000))
175 { 172 {
176 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)");
177 write_outputbuffer (); 174 write_outputbuffer ();
178 175
179 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,
… …
181 destroy (); 178 destroy ();
182 } 179 }
183 } 180 }
184#endif 181#endif
185 182
183 // limit budget surplus/deficit by one mss, add per-tick budget
186 rate_avail = min (max_rate + mss, rate_avail + max_rate); 184 rate_avail = min (rate_avail, mss) + max_rate;
187 185
188 int max_send = rate_avail; 186 int max_send = rate_avail;
189 187
190#if HAVE_TCP_INFO 188#if HAVE_TCP_INFO
191 // further restrict the available bandwidth by the excess bandwidth available 189 // further restrict the available bandwidth by the excess bandwidth available
192 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);
193#endif 191#endif
194 192
195 // round to next-lowest mss 193 // round to next-lowest mss
196 max_send -= max_send % mss; 194 max_send -= max_send % mss;
197 195
… …
247 245
248 packet sl ("ix"); 246 packet sl ("ix");
249 247
250 sl << ber32 (ix.idx) 248 sl << ber32 (ix.idx)
251 << ber32 (ix.ofs) 249 << ber32 (ix.ofs)
252 << data (d->data.data () + ix.ofs, chunk); 250 << data (d->data + ix.ofs, chunk);
253 251
254 send_packet (sl); 252 send_packet (sl);
255 } 253 }
256 else 254 else
257 ix.ofs = 0; 255 ix.ofs = 0;
… …
268 266
269 rate_avail -= outputbuffer_len (); 267 rate_avail -= outputbuffer_len ();
270} 268}
271 269
272void 270void
273client::flush_sockets (void) 271client::flush_sockets ()
274{ 272{
275 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 273 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
276 (*i)->flush (); 274 (*i)->flush ();
277} 275}
278 276
279void 277void
280client::clock (void) 278client::clock ()
281{ 279{
282 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 280 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
283 (*i)->tick (); 281 (*i)->tick ();
284 282
285 // give them all the same chances 283 // give them all the same chances

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines