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.44 by root, Mon Apr 2 19:56:11 2007 UTC vs.
Revision 1.64 by root, Sat Jul 28 00:45:05 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team 5 * Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) 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, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License 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 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author 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/**
26 * \file 25 * \file
27 * Main client/server loops. 26 * Main client/server loops.
… …
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 500
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 ();
… …
85} 84}
86 85
87bool 86bool
88client::handle_command () 87client::handle_command ()
89{ 88{
90 bool skipping = false;
91
92 while (!cmd_queue.empty () 89 if (!cmd_queue.empty ()
93 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0)) 90 && state == ST_PLAYING
91 && pl->ob->speed_left > 0.f)
94 { 92 {
95 command &cmd = cmd_queue.front (); 93 command &cmd = cmd_queue.front ();
96 94
97 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 95 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
98 {
99 if (!skipping)
100 { 96 {
101 skipping = true;
102 reset_state (); 97 reset_state ();
103 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); 98 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
104 }
105
106 cmd_queue.pop_front ();
107 } 99 }
108 else 100 else
109 {
110 execute (cmd.handler, cmd.data, cmd.datalen); 101 execute (cmd.handler, cmd.data, cmd.datalen);
102
111 cmd_queue.pop_front (); 103 cmd_queue.pop_front ();
112 return true; 104 return true;
113 }
114 } 105 }
115 106 else
116 return false; 107 return false;
117} 108}
118 109
119void 110void
120flush_sockets (void) 111flush_sockets (void)
121{ 112{
… …
131 * 122 *
132 */ 123 */
133void 124void
134doeric_server (void) 125doeric_server (void)
135{ 126{
136#ifdef CS_LOGSTATS
137 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
138 write_cs_stats ();
139#endif
140
141 //TODO: should not be done here, either 127 //TODO: should not be done here, either
142 for (unsigned i = 0; i < clients.size (); ++i) 128 for (unsigned i = 0; i < clients.size (); ++i)
143 { 129 {
144 client *ns = clients [i]; 130 client *ns = clients [i];
145 131
… …
165 if (last_weight != WEIGHT (pl->ob)) 151 if (last_weight != WEIGHT (pl->ob))
166 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", 152 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
167 (unsigned long) last_weight, WEIGHT (pl->ob)); 153 (unsigned long) last_weight, WEIGHT (pl->ob));
168 } 154 }
169 155
170 draw_client_map (pl->ob); 156 draw_client_map (pl);
171 157
172 if (update_look) 158 if (update_look)
173 esrv_draw_look (pl->ob); 159 esrv_draw_look (pl);
174 160
161 bool overload = false;
162
163#if HAVE_TCP_INFO
164 // do bandwidth checking
165 if (tcpi.tcpi_unacked + 1 > max (4, tcpi.tcpi_snd_cwnd))
166 {
167 overload = true;
168 if (next_rate_adjust <= NOW)
169 {
170 next_rate_adjust = NOW + 2;
171 max_rate = max (max_rate >> 1, int (5000 * TICK));
172 LOG (llevDebug, "tcp %s overloaded (%d + 1 > 4 | %d), rate now %d\n",
173 host, (int)tcpi.tcpi_unacked, (int)tcpi.tcpi_snd_cwnd, int (max_rate / TICK));//D
174 send_packet_printf ("drawinfo %d Due to possible network congestion, your output-rate has been reduced to %dbps.",
175 NDI_RED, int (max_rate / TICK));
176 }
177 }
178#endif
179
180 if (!overload)
181 {
175 if (askface.empty ()) 182 if (ixface.empty ())
176 { 183 {
177 // regularly send a new face when queue is empty 184 // regularly send a new face when queue is empty
178 if (bg_scrub && !--bg_scrub && enable_bg_scrub) 185 if (bg_scrub && !--bg_scrub && enable_bg_scrub)
179 while (scrub_idx < faces.size () - 1) 186 while (scrub_idx < faces.size () - 1)
180 {
181 ++scrub_idx;
182 if (!faces_sent [scrub_idx])
183 { 187 {
188 ++scrub_idx;
189
190 if (!faces_sent [scrub_idx])
191 if (faceinfo *f = face_info (scrub_idx))
192 if (f->type == FT_FACE) // only scrub faces for now
193 {
184 send_face (scrub_idx); 194 send_face (scrub_idx, -120);
195 flush_fx ();
196
185 bg_scrub = 1; // send up to one face per tick, unless an image was requested 197 bg_scrub = 1; // send up to one face per tick, unless an image was requested
186 break; 198 break;
199 }
187 } 200 }
188 }
189 201
190 rate_avail = max_rate - outputbuffer_len (); 202 rate_avail = max_rate - outputbuffer_len ();
191 } 203 }
192 else 204 else
193 { 205 {
194 int ol = outputbuffer_len (); 206 int ol = outputbuffer_len ();
195 207
196 rate_avail = min (max_rate, rate_avail + max_rate); 208 rate_avail = min (max_rate, rate_avail + max_rate);
197 rate_avail -= ol; 209 rate_avail -= ol;
198 210
199 int avail = rate_avail; 211 int avail = rate_avail;
200 212
201 // if we can split images, transfer up to mss packets if possible 213 // if we can split images, transfer up to mss-sized packets if possible
214 // but never 768 bytes more.
202 if (fxix) avail += mss - (ol % mss); 215 if (fxix) avail += min (768, mss - (ol % mss));
203
204 fprintf (stderr, "ra %6d a %6d ", rate_avail, avail);
205
206 while (!askface.empty () && avail > 0)
207 {
208 // use a lifo to send most recently requested images
209 faceidx face = askface.back ();
210 askface.pop_back ();
211
212 send_image (face);
213 216
214 bg_scrub = BG_SCRUB_RATE; 217 bg_scrub = BG_SCRUB_RATE;
215 218
219 while (avail > 0)
220 {
221 ixsend &ix = ixface.back ();
222
223 if (facedata *d = face_data (ix.idx, faceset))
224 {
225 if (fxix)
226 {
227 // only transfer something if the amount of data transferred
228 // has a healthy relation to the header overhead
229 if (avail <= 40)
230 break;
231
232 // 9 bytes is enough for fx_FFFOOO
233 int chunk = min (min (avail, MAXSOCKBUF - 9), (int)ix.ofs);
234
235 if (chunk <= 0)
236 break;
237
238 ix.ofs -= chunk;
239
240 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
241
242 packet sl ("ix");
243
244 sl << ber32 (ix.idx)
245 << ber32 (ix.ofs)
246 << data (d->data.data () + ix.ofs, chunk);
247
248 send_packet (sl);
249 }
250 else
251 {
252 send_image (ix.idx);
253 ix.ofs = 0;
254 }
255 }
256 else
257 ix.ofs = 0;
258
216 int consumed = ol - outputbuffer_len (); 259 int consumed = outputbuffer_len () - ol;
260
217 avail -= consumed; 261 avail -= consumed;
218 rate_avail -= consumed; 262 rate_avail -= consumed;
263
264 ol = outputbuffer_len ();
265
266 if (!ix.ofs)
267 {
268 ixface.pop_back ();
269
270 if (ixface.empty ())
271 break;
272 }
219 } 273 }
220 274 }
221 fprintf (stderr, "ra %6d a %6d\n", rate_avail, avail);
222
223 } 275 }
224} 276}
225 277

Diff Legend

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