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.50 by root, Sun Jun 3 17:05:36 2007 UTC vs.
Revision 1.65 by root, Sun Jul 29 02:24:34 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/**
30 * 29 *
31 * loop.c mainly deals with initialization and higher level socket 30 * loop.c mainly deals with initialization and higher level socket
32 * maintanance (checking for lost connections and if data has arrived.) 31 * maintanance (checking for lost connections and if data has arrived.)
33 */ 32 */
34 33
35#define BG_SCRUB_RATE 4 // how often to send a face in the background
36
37#include <global.h> 34#include <global.h>
38#include <sproto.h> 35#include <sproto.h>
39#include <sockproto.h> 36#include <sockproto.h>
40 37
41#include <sys/types.h> 38#include <sys/types.h>
47#include <unistd.h> 44#include <unistd.h>
48#include <arpa/inet.h> 45#include <arpa/inet.h>
49 46
50#include <loader.h> 47#include <loader.h>
51 48
49#define BG_SCRUB_RATE 4 // how often to send a face in the background
50
52#define MAX_QUEUE_DEPTH 500 //TODO 51#define MAX_QUEUE_DEPTH 50
53#define MAX_QUEUE_BACKLOG 3. //TODO 52#define MAX_QUEUE_BACKLOG 3.
54 53
55void 54void
56client::reset_state () 55client::reset_state ()
57{ 56{
58 if (!pl) 57 if (!pl)
63} 62}
64 63
65void 64void
66client::queue_command (packet_type *handler, char *data, int datalen) 65client::queue_command (packet_type *handler, char *data, int datalen)
67{ 66{
68 tstamp stamp = now (); 67 tstamp stamp = NOW;
69 68
70 if (cmd_queue.size () >= MAX_QUEUE_DEPTH) 69 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
71 { 70 {
72 //TODO: just disconnect here? 71 //TODO: just disconnect here?
73 reset_state (); 72 reset_state ();
91 && state == ST_PLAYING 90 && state == ST_PLAYING
92 && pl->ob->speed_left > 0.f) 91 && pl->ob->speed_left > 0.f)
93 { 92 {
94 command &cmd = cmd_queue.front (); 93 command &cmd = cmd_queue.front ();
95 94
96 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 95 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
97 { 96 {
98 reset_state (); 97 reset_state ();
99 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); 98 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
100 } 99 }
101 else 100 else
123 * 122 *
124 */ 123 */
125void 124void
126doeric_server (void) 125doeric_server (void)
127{ 126{
128#ifdef CS_LOGSTATS
129 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
130 write_cs_stats ();
131#endif
132
133 //TODO: should not be done here, either 127 //TODO: should not be done here, either
134 for (unsigned i = 0; i < clients.size (); ++i) 128 for (unsigned i = 0; i < clients.size (); ++i)
135 { 129 {
136 client *ns = clients [i]; 130 client *ns = clients [i];
137 131
162 draw_client_map (pl); 156 draw_client_map (pl);
163 157
164 if (update_look) 158 if (update_look)
165 esrv_draw_look (pl); 159 esrv_draw_look (pl);
166 160
167 if (askface.empty () && !partial_face_ofs) 161 if (ixface.empty ())
168 { 162 {
169 // regularly send a new face when queue is empty 163 // regularly send a new face when queue is empty
170 if (bg_scrub && !--bg_scrub && enable_bg_scrub) 164 if (bg_scrub && !--bg_scrub && enable_bg_scrub)
171 while (scrub_idx < faces.size () - 1) 165 while (scrub_idx < faces.size () - 1)
172 { 166 {
173 ++scrub_idx; 167 ++scrub_idx;
168
174 if (!faces_sent [scrub_idx]) 169 if (!faces_sent [scrub_idx])
170 if (faceinfo *f = face_info (scrub_idx))
171 if (f->type == FT_FACE) // only scrub faces for now
175 { 172 {
176 send_face (scrub_idx); 173 send_face (scrub_idx, -120);
177 flush_fx (); 174 flush_fx ();
178 175
179 bg_scrub = 1; // send up to one face per tick, unless an image was requested 176 bg_scrub = 1; // send up to one face per tick, unless an image was requested
180 break; 177 break;
181 } 178 }
182 } 179 }
183 180
184 rate_avail = max_rate - outputbuffer_len (); 181 rate_avail = max_rate - outputbuffer_len ();
185 } 182 }
186 else 183 else
187 { 184 {
188 int ol = outputbuffer_len (); 185 int ol = outputbuffer_len ();
189 186
190 rate_avail = min (max_rate, rate_avail + max_rate); 187 rate_avail = min (max_rate + mss, rate_avail + max_rate);
188
189 int avail = rate_avail;
190
191 // if we can split images, round to next-lowest mss
192 if (fxix) avail -= avail % mss;
193
191 rate_avail -= ol; 194 rate_avail -= ol;
195 avail -= ol;
192 196
193 int avail = rate_avail; 197#if HAVE_TCP_INFO
194 198 // further restrict the available bandwidth by the excess bandwidth available
195 // if we can split images, transfer up to mss packets if possible 199 avail = max (0, min (avail, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss));
196 // but never more 768 bytes more. 200#endif
197 if (fxix) avail += min (768, mss - (ol % mss));
198 201
199 bg_scrub = BG_SCRUB_RATE; 202 bg_scrub = BG_SCRUB_RATE;
200 203
201 while (avail > 0) 204 while (avail > 0)
202 { 205 {
203 if (partial_face_ofs) 206 ixsend &ix = ixface.back ();
207
208 if (facedata *d = face_data (ix.idx, faceset))
204 { 209 {
205 if (facedata *d = face_data (partial_face, faceset)) 210 if (fxix)
206 { 211 {
207 // 9 bytes is enough for fx_FFFOOO, 40 leaves some room 212 // estimate the packet header overhead "ix " + idx + (new)ofs
213 int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
208 int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs); 214 int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
209 215
216 // only transfer something if the amount of data transferred
217 // has a healthy relation to the header overhead
210 if (chunk <= 0) 218 if (chunk < 64)
211 break; 219 break;
212 220
221 chunk = min (chunk, (int)ix.ofs);
222
213 partial_face_ofs -= chunk; 223 ix.ofs -= chunk;
224
225 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
214 226
215 packet sl ("ix"); 227 packet sl ("ix");
216 228
217 sl << ber32 (partial_face) 229 sl << ber32 (ix.idx)
218 << ber32 (partial_face_ofs) 230 << ber32 (ix.ofs)
219 << data (d->data.data () + partial_face_ofs, chunk); 231 << data (d->data.data () + ix.ofs, chunk);
220 232
221 send_packet (sl); 233 send_packet (sl);
222 } 234 }
223 else 235 else
224 partial_face_ofs = 0;
225 }
226 else if (!askface.empty ())
227 {
228 // use a lifo to send most recently requested images
229 faceidx facenum = askface.back ();
230 askface.pop_back ();
231
232 if (fxix)
233 { 236 {
234 if (facedata *d = face_data (facenum, faceset)) 237 send_image (ix.idx);
235 { 238 ix.ofs = 0;
236 partial_face = facenum;
237 partial_face_ofs = d->data.size ();
238 }
239 } 239 }
240 else
241 send_image (facenum);
242 } 240 }
243 else 241 else
244 break; 242 ix.ofs = 0;
245 243
246 int consumed = ol - outputbuffer_len (); 244 int consumed = outputbuffer_len () - ol;
245
247 avail -= consumed; 246 avail -= consumed;
248 rate_avail -= consumed; 247 rate_avail -= consumed;
248
249 ol = outputbuffer_len ();
250
251 if (!ix.ofs)
252 {
253 ixface.pop_back ();
254
255 if (ixface.empty ())
256 break;
257 }
249 } 258 }
250 } 259 }
251} 260}
252 261

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines