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.38 by root, Sun Jan 14 21:20:51 2007 UTC vs.
Revision 1.47 by root, Sat May 12 22:04:20 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team 5 * Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
23*/ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Main client/server loops. 27 * Main client/server loops.
28 * 28 *
… …
30 * 30 *
31 * loop.c mainly deals with initialization and higher level socket 31 * loop.c mainly deals with initialization and higher level socket
32 * maintanance (checking for lost connections and if data has arrived.) 32 * maintanance (checking for lost connections and if data has arrived.)
33 */ 33 */
34 34
35#define BG_SCRUB_RATE 4 // how often to send a face in the background
35 36
36#include <global.h> 37#include <global.h>
37#include <sproto.h> 38#include <sproto.h>
38#include <sockproto.h> 39#include <sockproto.h>
39 40
… …
87client::handle_command () 88client::handle_command ()
88{ 89{
89 bool skipping = false; 90 bool skipping = false;
90 91
91 while (!cmd_queue.empty () 92 while (!cmd_queue.empty ()
92 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0)) 93 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0.f))
93 { 94 {
94 command &cmd = cmd_queue.front (); 95 command &cmd = cmd_queue.front ();
95 96
96 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 97 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
97 { 98 {
… …
136 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 137 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
137 write_cs_stats (); 138 write_cs_stats ();
138#endif 139#endif
139 140
140 //TODO: should not be done here, either 141 //TODO: should not be done here, either
141 for (int i = 0; i < clients.size (); ++i) 142 for (unsigned i = 0; i < clients.size (); ++i)
142 { 143 {
143 client *s = clients [i]; 144 client *ns = clients [i];
144 player *pl = s->pl;
145 145
146 if (pl && pl->ns && !pl->ns->destroyed ()) 146 ns->tick ();
147 ns->refcnt_chk ();
148 }
149}
150
151void
152client::tick ()
153{
154 if (!pl || destroyed ())
155 return;
156
157 /* Update the players stats once per tick. More efficient than
158 * sending them whenever they change, and probably just as useful
159 */
160 esrv_update_stats (pl);
161
162 if (last_weight != -1 && last_weight != WEIGHT (pl->ob))
163 {
164 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
165 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",
167 (unsigned long) last_weight, WEIGHT (pl->ob));
168 }
169
170 draw_client_map (pl->ob);
171
172 if (update_look)
173 esrv_draw_look (pl->ob);
174
175 if (askface.empty () && !partial_face_ofs)
176 {
177 // regularly send a new face when queue is empty
178 if (bg_scrub && !--bg_scrub && enable_bg_scrub)
179 while (scrub_idx < faces.size () - 1)
180 {
181 ++scrub_idx;
182 if (!faces_sent [scrub_idx])
183 {
184 send_face (scrub_idx);
185 flush_fx ();
186
187 bg_scrub = 1; // send up to one face per tick, unless an image was requested
188 break;
189 }
190 }
191
192 rate_avail = max_rate - outputbuffer_len ();
193 }
194 else
195 {
196 int ol = outputbuffer_len ();
197
198 rate_avail = min (max_rate, rate_avail + max_rate);
199 rate_avail -= ol;
200
201 int avail = rate_avail;
202
203 // if we can split images, transfer up to mss packets if possible
204 // but never more 768 bytes more.
205 if (fxix) avail += min (768, mss - (ol % mss));
206
207 bg_scrub = BG_SCRUB_RATE;
208
209 while (avail > 0)
147 { 210 {
148 client *ns = pl->ns; 211 if (partial_face_ofs)
149
150 /* Update the players stats once per tick. More efficient than
151 * sending them whenever they change, and probably just as useful
152 */
153 esrv_update_stats (pl);
154
155 if (ns->last_weight != -1 && ns->last_weight != WEIGHT (pl->ob))
156 { 212 {
157 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 213 if (facedata *d = face_data (partial_face, faceset))
158 if (ns->last_weight != WEIGHT (pl->ob)) 214 {
159 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", 215 // 9 bytes is enough for fx_FFFOOO, 40 leaves some room
160 (unsigned long) ns->last_weight, WEIGHT (pl->ob)); 216 int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs);
217
218 if (chunk <= 0)
219 break;
220
221 partial_face_ofs -= chunk;
222
223 packet sl ("ix");
224
225 sl << ber32 (partial_face)
226 << ber32 (partial_face_ofs)
227 << data (d->data.data () + partial_face_ofs, chunk);
228
229 send_packet (sl);
230 }
231 else
232 partial_face_ofs = 0;
161 } 233 }
234 else if (!askface.empty ())
235 {
236 // use a lifo to send most recently requested images
237 faceidx facenum = askface.back ();
238 askface.pop_back ();
162 239
163 draw_client_map (pl->ob); 240 if (fxix)
241 {
242 if (facedata *d = face_data (facenum, faceset))
243 {
244 partial_face = facenum;
245 partial_face_ofs = d->data.size ();
246 }
247 }
248 else
249 send_image (facenum);
250 }
251 else
252 break;
164 253
165 if (s->update_look) 254 int consumed = ol - outputbuffer_len ();
166 esrv_draw_look (pl->ob); 255 avail -= consumed;
256 rate_avail -= consumed;
167 } 257 }
168
169 s->refcnt_chk ();
170 } 258 }
171} 259}
172 260

Diff Legend

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