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.51 by root, Sat Jun 9 22:54:04 2007 UTC vs.
Revision 1.63 by root, Sat Jul 28 00:15:03 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/** 24/**
… …
157 draw_client_map (pl); 156 draw_client_map (pl);
158 157
159 if (update_look) 158 if (update_look)
160 esrv_draw_look (pl); 159 esrv_draw_look (pl);
161 160
162 if (askface.empty () && !partial_face_ofs) 161 if (ixface.empty ())
163 { 162 {
164 // regularly send a new face when queue is empty 163 // regularly send a new face when queue is empty
165 if (bg_scrub && !--bg_scrub && enable_bg_scrub) 164 if (bg_scrub && !--bg_scrub && enable_bg_scrub)
166 while (scrub_idx < faces.size () - 1) 165 while (scrub_idx < faces.size () - 1)
167 { 166 {
168 ++scrub_idx; 167 ++scrub_idx;
168
169 if (!faces_sent [scrub_idx]) 169 if (!faces_sent [scrub_idx])
170 { 170 {
171 send_face (scrub_idx); 171 send_face (scrub_idx, -120);
172 flush_fx (); 172 flush_fx ();
173 173
174 bg_scrub = 1; // send up to one face per tick, unless an image was requested 174 bg_scrub = 1; // send up to one face per tick, unless an image was requested
175 break; 175 break;
176 } 176 }
… …
178 178
179 rate_avail = max_rate - outputbuffer_len (); 179 rate_avail = max_rate - outputbuffer_len ();
180 } 180 }
181 else 181 else
182 { 182 {
183 int ol = outputbuffer_len (); 183 bool overload = false;
184 184
185 rate_avail = min (max_rate, rate_avail + max_rate); 185#if HAVE_TCP_INFO
186 rate_avail -= ol; 186 // do bandwidth checking
187 187 if (tcpi.tcpi_unacked + 1 > max (4, tcpi.tcpi_snd_cwnd))
188 int avail = rate_avail;
189
190 // if we can split images, transfer up to mss packets if possible
191 // but never more 768 bytes more.
192 if (fxix) avail += min (768, mss - (ol % mss));
193
194 bg_scrub = BG_SCRUB_RATE;
195
196 while (avail > 0)
197 { 188 {
198 if (partial_face_ofs) 189 overload = true;
190 if (next_rate_adjust <= NOW)
199 { 191 {
192 next_rate_adjust = NOW + 2;
193 max_rate = max (max_rate >> 1, int (5000 * TICK));
194 LOG (llevDebug, "tcp %s overloaded (%d + 1 > 4 | %d), rate now %d\n",
195 host, (int)tcpi.tcpi_unacked, (int)tcpi.tcpi_snd_cwnd, int (max_rate / TICK));//D
196 send_packet_printf ("drawinfo %d Due to possible network congestion, your output-rate has been reduced to %dbps.",
197 NDI_RED, int (max_rate / TICK));
198 }
199 }
200#endif
201
202 if (!overload)
203 {
204 int ol = outputbuffer_len ();
205
206 rate_avail = min (max_rate, rate_avail + max_rate);
207 rate_avail -= ol;
208
209 int avail = rate_avail;
210
211 // if we can split images, transfer up to mss-sized packets if possible
212 // but never 768 bytes more.
213 if (fxix) avail += min (768, mss - (ol % mss));
214
215 bg_scrub = BG_SCRUB_RATE;
216
217 while (avail > 0)
218 {
219 ixsend &ix = ixface.back ();
220
200 if (facedata *d = face_data (partial_face, faceset)) 221 if (facedata *d = face_data (ix.idx, faceset))
201 { 222 {
202 // 9 bytes is enough for fx_FFFOOO, 40 leaves some room
203 int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs);
204
205 if (chunk <= 0)
206 break;
207
208 partial_face_ofs -= chunk;
209
210 packet sl ("ix");
211
212 sl << ber32 (partial_face)
213 << ber32 (partial_face_ofs)
214 << data (d->data.data () + partial_face_ofs, chunk);
215
216 send_packet (sl);
217 }
218 else
219 partial_face_ofs = 0;
220 }
221 else if (!askface.empty ())
222 {
223 // use a lifo to send most recently requested images
224 faceidx facenum = askface.back ();
225 askface.pop_back ();
226
227 if (fxix) 223 if (fxix)
228 {
229 if (facedata *d = face_data (facenum, faceset))
230 { 224 {
231 partial_face = facenum; 225 // only transfer something if the amount of data transferred
232 partial_face_ofs = d->data.size (); 226 // has a healthy relation to the header overhead
227 if (avail <= 40)
228 break;
229
230 // 9 bytes is enough for fx_FFFOOO
231 int chunk = min (min (avail, MAXSOCKBUF - 9), (int)ix.ofs);
232
233 if (chunk <= 0)
234 break;
235
236 ix.ofs -= chunk;
237
238 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
239
240 packet sl ("ix");
241
242 sl << ber32 (ix.idx)
243 << ber32 (ix.ofs)
244 << data (d->data.data () + ix.ofs, chunk);
245
246 send_packet (sl);
247 }
248 else
249 {
250 send_image (ix.idx);
251 ix.ofs = 0;
233 } 252 }
234 } 253 }
235 else 254 else
236 send_image (facenum); 255 ix.ofs = 0;
256
257 int consumed = outputbuffer_len () - ol;
258
259 avail -= consumed;
260 rate_avail -= consumed;
261
262 ol = outputbuffer_len ();
263
264 if (!ix.ofs)
265 {
266 ixface.pop_back ();
267
268 if (ixface.empty ())
269 break;
270 }
237 } 271 }
238 else
239 break;
240
241 int consumed = ol - outputbuffer_len ();
242 avail -= consumed;
243 rate_avail -= consumed;
244 } 272 }
245 } 273 }
246} 274}
247 275

Diff Legend

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