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.43 by root, Fri Mar 16 02:37:54 2007 UTC vs.
Revision 1.60 by root, Thu Jul 12 19:36:58 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 { 96 {
99 if (!skipping)
100 {
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
175 if (askface.empty ()) 161 if (ixface.empty ())
176 { 162 {
163 // regularly send a new face when queue is empty
177 if (bg_scrub && !--bg_scrub && enable_bg_scrub) 164 if (bg_scrub && !--bg_scrub && enable_bg_scrub)
178 while (scrub_idx < faces.size () - 1) 165 while (scrub_idx < faces.size () - 1)
179 { 166 {
180 ++scrub_idx; 167 ++scrub_idx;
168
181 if (!faces_sent [scrub_idx]) 169 if (!faces_sent [scrub_idx])
182 { 170 {
183 send_face (scrub_idx); 171 send_face (scrub_idx);
172 flush_fx ();
173
184 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
185 break; 175 break;
186 } 176 }
187 } 177 }
178
179 rate_avail = max_rate - outputbuffer_len ();
188 } 180 }
189 else 181 else if (!outq) // only send when bandwidht allows it
190 while (!askface.empty () && outputbuffer_len () < max_rate)
191 { 182 {
192 // use a lifo to send most recently requested images 183 int ol = outputbuffer_len ();
193 faceidx face = askface.back ();
194 askface.pop_back ();
195 184
196 send_image (face); 185 rate_avail = min (max_rate, rate_avail + max_rate);
186 rate_avail -= ol;
197 187
188 int avail = rate_avail;
189
190 // if we can split images, transfer up to mss-sized packets if possible
191 // but never 768 bytes more.
192 if (fxix) avail += min (768, mss - (ol % mss));
193
198 bg_scrub = BG_SCRUB_RATE; 194 bg_scrub = BG_SCRUB_RATE;
195
196 while (avail > 0)
197 {
198 ixsend &ix = ixface.back ();
199
200 if (facedata *d = face_data (ix.idx, faceset))
201 {
202 if (fxix)
203 {
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
210 int chunk = min (min (avail, MAXSOCKBUF - 9), (int)ix.ofs);
211
212 if (chunk <= 0)
213 break;
214
215 ix.ofs -= chunk;
216
217 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
218
219 packet sl ("ix");
220
221 sl << ber32 (ix.idx)
222 << ber32 (ix.ofs)
223 << data (d->data.data () + ix.ofs, chunk);
224
225 send_packet (sl);
226 }
227 else
228 {
229 send_image (ix.idx);
230 ix.ofs = 0;
231 }
232 }
233 else
234 ix.ofs = 0;
235
236 int consumed = outputbuffer_len () - ol;
237
238 avail -= consumed;
239 rate_avail -= consumed;
240
241 ol = outputbuffer_len ();
242
243 if (!ix.ofs)
244 {
245 ixface.pop_back ();
246
247 if (ixface.empty ())
248 break;
249 }
199 } 250 }
251 }
200} 252}
201 253

Diff Legend

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