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.52 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.56 by root, Sun Jul 1 05:47:00 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);
172 flush_fx (); 172 flush_fx ();
173 173
… …
185 rate_avail = min (max_rate, rate_avail + max_rate); 185 rate_avail = min (max_rate, rate_avail + max_rate);
186 rate_avail -= ol; 186 rate_avail -= ol;
187 187
188 int avail = rate_avail; 188 int avail = rate_avail;
189 189
190 // if we can split images, transfer up to mss packets if possible 190 // if we can split images, transfer up to mss-sized packets if possible
191 // but never 768 bytes more. 191 // but never 768 bytes more.
192 if (fxix) avail += min (768, mss - (ol % mss)); 192 if (fxix) avail += min (768, mss - (ol % mss));
193 193
194 bg_scrub = BG_SCRUB_RATE; 194 bg_scrub = BG_SCRUB_RATE;
195 195
196 while (avail > 0) 196 while (avail > 0)
197 { 197 {
198 if (partial_face_ofs) 198 ixsend &ix = ixface.back ();
199
200 if (facedata *d = face_data (ix.idx, faceset))
199 { 201 {
200 if (facedata *d = face_data (partial_face, faceset)) 202 if (fxix)
201 { 203 {
202 // 9 bytes is enough for fx_FFFOOO, 40 leaves some room 204 // 9 bytes is enough for fx_FFFOOO, 40 leaves some room for image data
203 int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs); 205 int chunk = min (min (avail - 40, MAXSOCKBUF - 9), ix.ofs);
204 206
205 if (chunk <= 0) 207 if (chunk <= 0)
206 break; 208 break;
207 209
208 partial_face_ofs -= chunk; 210 ix.ofs -= chunk;
209 211
210 packet sl ("ix"); 212 packet sl ("ix");
211 213
212 sl << ber32 (partial_face) 214 sl << ber32 (ix.idx)
213 << ber32 (partial_face_ofs) 215 << ber32 (ix.ofs)
214 << data (d->data.data () + partial_face_ofs, chunk); 216 << data (d->data.data () + ix.ofs, chunk);
215 217
216 send_packet (sl); 218 send_packet (sl);
217 } 219 }
218 else 220 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)
228 { 221 {
229 if (facedata *d = face_data (facenum, faceset)) 222 send_image (ix.idx);
230 { 223 ix.ofs = 0;
231 partial_face = facenum;
232 partial_face_ofs = d->data.size ();
233 }
234 } 224 }
235 else
236 send_image (facenum);
237 } 225 }
238 else 226 else
239 break; 227 ix.ofs = 0;
240 228
241 int consumed = ol - outputbuffer_len (); 229 int consumed = outputbuffer_len () - ol;
230
242 avail -= consumed; 231 avail -= consumed;
243 rate_avail -= consumed; 232 rate_avail -= consumed;
233
234 ol = outputbuffer_len ();
235
236 if (!ix.ofs)
237 {
238 ixface.pop_back ();
239
240 if (ixface.empty ())
241 break;
242 }
244 } 243 }
245 } 244 }
246} 245}
247 246

Diff Legend

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