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.74 by root, Tue Apr 22 07:28:05 2008 UTC vs.
Revision 1.78 by root, Sat Dec 27 01:25:00 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
115client::tick () 115client::tick ()
116{ 116{
117 if (!pl || destroyed ()) 117 if (!pl || destroyed ())
118 return; 118 return;
119 119
120 pl->dirty = true;
121
120 /* Update the players stats once per tick. More efficient than 122 /* Update the players stats once per tick. More efficient than
121 * sending them whenever they change, and probably just as useful 123 * sending them whenever they change, and probably just as useful
122 */ 124 */
123 esrv_update_stats (pl); 125 esrv_update_stats (pl);
124 126
125 sint32 weight = pl->ob->client_weight (); 127 sint32 weight = pl->ob->client_weight ();
126 128
127 if (last_weight != weight) 129 if (last_weight != weight)
130 {
131 pl->ob->update_stats ();
128 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 132 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
133 }
129 134
130 draw_client_map (pl); 135 draw_client_map (pl);
131 136
132 if (update_look) 137 if (update_look)
133 esrv_draw_look (pl); 138 esrv_draw_look (pl);
177#if HAVE_TCP_INFO 182#if HAVE_TCP_INFO
178 // further restrict the available bandwidth by the excess bandwidth available 183 // further restrict the available bandwidth by the excess bandwidth available
179 max_send = min (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss); 184 max_send = min (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss);
180#endif 185#endif
181 186
182 // if we can split images, round to next-lowest mss 187 // round to next-lowest mss
183 if (fxix) max_send -= max_send % mss; 188 max_send -= max_send % mss;
184 189
185 if (ixface.empty ()) 190 if (ixface.empty ())
186 { 191 {
187 // regularly send a new face when queue is empty 192 // regularly send a new face when queue is empty
188 if (bg_scrub && !--bg_scrub && enable_bg_scrub) 193 if (bg_scrub && !--bg_scrub)
189 while (scrub_idx < faces.size () - 1) 194 while (scrub_idx < faces.size () - 1)
190 { 195 {
191 ++scrub_idx; 196 ++scrub_idx;
192 197
193 if (!faces_sent [scrub_idx]) 198 if (!faces_sent [scrub_idx])
215 220
216 ixsend &ix = ixface.back (); 221 ixsend &ix = ixface.back ();
217 222
218 if (facedata *d = face_data (ix.idx, faceset)) 223 if (facedata *d = face_data (ix.idx, faceset))
219 { 224 {
220 if (fxix)
221 {
222 // estimate the packet header overhead "ix " + idx + (new)ofs 225 // estimate the packet header overhead "ix " + idx + (new)ofs
223 int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs); 226 int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
224 int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen; 227 int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
225 228
226 // only transfer something if the amount of data transferred 229 // only transfer something if the amount of data transferred
227 // has a healthy relation to the header overhead 230 // has a healthy relation to the header overhead
228 if (chunk < 64) 231 if (chunk < 64)
229 break; 232 break;
230 233
231 chunk = min (chunk, (int)ix.ofs); 234 chunk = min (chunk, (int)ix.ofs);
232 235
233 ix.ofs -= chunk; 236 ix.ofs -= chunk;
234 237
235 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D 238 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
236 239
237 packet sl ("ix"); 240 packet sl ("ix");
238 241
239 sl << ber32 (ix.idx) 242 sl << ber32 (ix.idx)
240 << ber32 (ix.ofs) 243 << ber32 (ix.ofs)
241 << data (d->data.data () + ix.ofs, chunk); 244 << data (d->data.data () + ix.ofs, chunk);
242 245
243 send_packet (sl); 246 send_packet (sl);
244 }
245 else
246 {
247 send_image (ix.idx);
248 ix.ofs = 0;
249 }
250 } 247 }
251 else 248 else
252 ix.ofs = 0; 249 ix.ofs = 0;
253 250
254 if (!ix.ofs) 251 if (!ix.ofs)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines