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.89 by root, Sat Apr 23 04:56:58 2011 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,2009,2010,2011 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 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
178 destroy (); 178 destroy ();
179 } 179 }
180 } 180 }
181#endif 181#endif
182 182
183 // limit budget surplus/deficit by one mss, add per-tick budget
183 rate_avail = min (max_rate + mss, rate_avail + max_rate); 184 rate_avail = min (rate_avail, mss) + max_rate;
184 185
185 int max_send = rate_avail; 186 int max_send = rate_avail;
186 187
187#if HAVE_TCP_INFO 188#if HAVE_TCP_INFO
188 // further restrict the available bandwidth by the excess bandwidth available 189 // further restrict the available bandwidth by the excess bandwidth available
189 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);
190#endif 191#endif
191 192
192 // round to next-lowest mss 193 // round to next-lowest mss
193 max_send -= max_send % mss; 194 max_send -= max_send % mss;
194 195
244 245
245 packet sl ("ix"); 246 packet sl ("ix");
246 247
247 sl << ber32 (ix.idx) 248 sl << ber32 (ix.idx)
248 << ber32 (ix.ofs) 249 << ber32 (ix.ofs)
249 << data (d->data.data () + ix.ofs, chunk); 250 << data (d->data + ix.ofs, chunk);
250 251
251 send_packet (sl); 252 send_packet (sl);
252 } 253 }
253 else 254 else
254 ix.ofs = 0; 255 ix.ofs = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines