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.54 by root, Sun Jul 1 04:08:14 2007 UTC vs.
Revision 1.61 by root, Tue Jul 24 04:55:35 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/**
167 { 166 {
168 ++scrub_idx; 167 ++scrub_idx;
169 168
170 if (!faces_sent [scrub_idx]) 169 if (!faces_sent [scrub_idx])
171 { 170 {
172 send_face (scrub_idx); 171 send_face (scrub_idx, -120);
173 flush_fx (); 172 flush_fx ();
174 173
175 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
176 break; 175 break;
177 } 176 }
178 } 177 }
179 178
180 rate_avail = max_rate - outputbuffer_len (); 179 rate_avail = max_rate - outputbuffer_len ();
181 } 180 }
182 else 181 else if (!outq) // only send when bandwidth allows it
183 { 182 {
184 int ol = outputbuffer_len (); 183 int ol = outputbuffer_len ();
185 184
186 rate_avail = min (max_rate, rate_avail + max_rate); 185 rate_avail = min (max_rate, rate_avail + max_rate);
187 rate_avail -= ol; 186 rate_avail -= ol;
200 199
201 if (facedata *d = face_data (ix.idx, faceset)) 200 if (facedata *d = face_data (ix.idx, faceset))
202 { 201 {
203 if (fxix) 202 if (fxix)
204 { 203 {
205 // 9 bytes is enough for fx_FFFOOO, 40 leaves some room for image data 204 // only transfer something if the amount of data transferred
205 // has a healthy relation to the header overhead
206 if (avail <= 40)
207 break;
208
209 // 9 bytes is enough for fx_FFFOOO
206 int chunk = min (min (avail - 40, MAXSOCKBUF - 9), ix.ofs); 210 int chunk = min (min (avail, MAXSOCKBUF - 9), (int)ix.ofs);
207 211
208 if (chunk <= 0) 212 if (chunk <= 0)
209 break; 213 break;
210 214
211 ix.ofs -= chunk; 215 ix.ofs -= chunk;
216
217 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
212 218
213 packet sl ("ix"); 219 packet sl ("ix");
214 220
215 sl << ber32 (ix.idx) 221 sl << ber32 (ix.idx)
216 << ber32 (ix.ofs) 222 << ber32 (ix.ofs)
225 } 231 }
226 } 232 }
227 else 233 else
228 ix.ofs = 0; 234 ix.ofs = 0;
229 235
230 int consumed = ol - outputbuffer_len (); 236 int consumed = outputbuffer_len () - ol;
231 237
232 avail -= consumed; 238 avail -= consumed;
233 rate_avail -= consumed; 239 rate_avail -= consumed;
234 240
235 ol = outputbuffer_len (); 241 ol = outputbuffer_len ();
236 242
237 if (!ix.ofs) 243 if (!ix.ofs)
238 { 244 {
239 ixface.pop_back (); 245 ixface.pop_back ();
246
240 if (ixface.empty ()) 247 if (ixface.empty ())
241 break; 248 break;
242 } 249 }
243 } 250 }
244 } 251 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines