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.70 by root, Thu Nov 8 19:43:30 2007 UTC vs.
Revision 1.94 by root, Sun Nov 4 02:20:11 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/**
25 * \file 24 * \file
… …
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 {
80 cmd_queue.push_back (command ()); 73 cmd_queue.resize (cmd_queue.size () + 1);
81 command &cmd = cmd_queue.back (); 74 command &cmd = cmd_queue.back ();
82 cmd.stamp = stamp; 75 cmd.stamp = stamp;
83 cmd.handler = handler; 76 cmd.handler = handler;
84 cmd.data = salloc<char> (datalen + 1, data); 77 cmd.data = salloc<char> (datalen + 1, data);
85 cmd.datalen = datalen; 78 cmd.datalen = datalen;
… …
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
107 sfree<char> (cmd.data, cmd.datalen + 1);
106 cmd_queue.pop_front (); 108 cmd_queue.pop_front ();
107 return true; 109 return true;
108 } 110 }
109 else 111 else
110 return false; 112 return false;
111} 113}
112 114
113void 115void
114client::tick () 116client::tick ()
115{ 117{
116 if (!pl || destroyed ()) 118 if (destroyed ())
117 return; 119 return;
118 120
121 if (pl)
122 {
123 pl->dirty = true;
124
119 /* Update the players stats once per tick. More efficient than 125 /* Update the players stats once per tick. More efficient than
120 * sending them whenever they change, and probably just as useful 126 * sending them whenever they change, and probably just as useful
121 */ 127 */
128 pl->need_updated_stats ();
122 esrv_update_stats (pl); 129 esrv_update_stats (pl);
123 130
124 if (last_weight != -1 && last_weight != WEIGHT (pl->ob)) 131 if (pl->ns->update_spells)
125 { 132 esrv_update_spells (pl);
133
134 sint32 weight = pl->ob->client_weight ();
135
136 if (last_weight != weight)
137 {
138 pl->ob->update_stats ();
126 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 139 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
127 if (last_weight != WEIGHT (pl->ob)) 140 }
128 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
129 (unsigned long) last_weight, WEIGHT (pl->ob));
130 }
131 141
132 draw_client_map (pl); 142 draw_client_map (pl);
133 143
134 if (update_look) 144 if (update_look)
135 esrv_draw_look (pl); 145 esrv_draw_look (pl);
136 146
137 mapinfo_queue_run (); 147 mapinfo_queue_run ();
148 }
138 149
139#if HAVE_TCP_INFO 150#if HAVE_TCP_INFO
140 // check time of last ack, and, if too old, kill connection 151 // check time of last ack, and, if too old, kill connection
141 socklen_t len = sizeof (tcpi); 152 socklen_t len = sizeof (tcpi);
142 153
… …
155 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,
156 167
157 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked)); 168 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
158#endif 169#endif
159 170
160 // fast-time-out a player by checking for missign acks 171 // fast-time-out a player by checking for missing acks
161 // do this only when player is active 172 // do this only when player is active
162 if (pl && pl->active 173 if (pl && pl->active
163 && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000)) 174 && tcpi.tcpi_last_ack_recv > int (socket_timeout * 1000))
164 { 175 {
165 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)");
166 write_outputbuffer (); 177 write_outputbuffer ();
167 178
168 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, 179 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
… …
170 destroy (); 181 destroy ();
171 } 182 }
172 } 183 }
173#endif 184#endif
174 185
186 // limit budget surplus/deficit by one mss, add per-tick budget
175 rate_avail = min (max_rate + mss, rate_avail + max_rate); 187 rate_avail = min (rate_avail, mss) + max_rate;
176 188
177 int max_send = rate_avail; 189 int max_send = rate_avail;
178 190
179#if HAVE_TCP_INFO 191#if HAVE_TCP_INFO
180 // further restrict the available bandwidth by the excess bandwidth available 192 // further restrict the available bandwidth by the excess bandwidth available
181 max_send = min (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss); 193 min_it (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss);
182#endif 194#endif
183 195
184 // if we can split images, round to next-lowest mss 196 // round to next-lowest mss
185 if (fxix) max_send -= max_send % mss; 197 max_send -= max_send % mss;
186 198
187 if (ixface.empty ()) 199 if (ixface.empty ())
188 { 200 {
189 // regularly send a new face when queue is empty 201 // regularly send a new face when queue is empty
190 if (bg_scrub && !--bg_scrub && enable_bg_scrub) 202 if (bg_scrub && !--bg_scrub)
191 while (scrub_idx < faces.size () - 1) 203 while (scrub_idx < faces.size () - 1)
192 { 204 {
193 ++scrub_idx; 205 ++scrub_idx;
194 206
195 if (!faces_sent [scrub_idx]) 207 if (!faces_sent [scrub_idx])
… …
217 229
218 ixsend &ix = ixface.back (); 230 ixsend &ix = ixface.back ();
219 231
220 if (facedata *d = face_data (ix.idx, faceset)) 232 if (facedata *d = face_data (ix.idx, faceset))
221 { 233 {
222 if (fxix)
223 {
224 // estimate the packet header overhead "ix " + idx + (new)ofs 234 // estimate the packet header overhead "ix " + idx + (new)ofs
225 int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs); 235 int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
226 int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen; 236 int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
227 237
228 // only transfer something if the amount of data transferred 238 // only transfer something if the amount of data transferred
229 // has a healthy relation to the header overhead 239 // has a healthy relation to the header overhead
230 if (chunk < 64) 240 if (chunk < 64)
231 break; 241 break;
232 242
233 chunk = min (chunk, (int)ix.ofs); 243 chunk = min (chunk, (int)ix.ofs);
234 244
235 ix.ofs -= chunk; 245 ix.ofs -= chunk;
236 246
237 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D 247 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
238 248
239 packet sl ("ix"); 249 packet sl ("ix");
240 250
241 sl << ber32 (ix.idx) 251 sl << ber32 (ix.idx)
242 << ber32 (ix.ofs) 252 << ber32 (ix.ofs)
243 << data (d->data.data () + ix.ofs, chunk); 253 << data (d->data + ix.ofs, chunk);
244 254
245 send_packet (sl); 255 send_packet (sl);
246 }
247 else
248 {
249 send_image (ix.idx);
250 ix.ofs = 0;
251 }
252 } 256 }
253 else 257 else
254 ix.ofs = 0; 258 ix.ofs = 0;
255 259
256 if (!ix.ofs) 260 if (!ix.ofs)
… …
265 269
266 rate_avail -= outputbuffer_len (); 270 rate_avail -= outputbuffer_len ();
267} 271}
268 272
269void 273void
270client::flush_sockets (void) 274client::flush_sockets ()
271{ 275{
272 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 276 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
273 (*i)->flush (); 277 (*i)->flush ();
274} 278}
275 279
276void 280void
277client::clock (void) 281client::clock ()
278{ 282{
279 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 283 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
280 (*i)->tick (); 284 (*i)->tick ();
281 285
282 // give them all the same chances 286 // give them all the same chances

Diff Legend

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