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.49 by root, Mon May 28 21:22:26 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
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 it
9 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 (at your option) any later version. 11 * 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, but
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 GNU General Public License for more details. 16 * 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 along
19 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 *
22 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors 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
… …
84} 85}
85 86
86bool 87bool
87client::handle_command () 88client::handle_command ()
88{ 89{
89 bool skipping = false;
90
91 while (!cmd_queue.empty () 90 if (!cmd_queue.empty ()
92 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0)) 91 && state == ST_PLAYING
92 && pl->ob->speed_left > 0.f)
93 { 93 {
94 command &cmd = cmd_queue.front (); 94 command &cmd = cmd_queue.front ();
95 95
96 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 96 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
97 { 97 {
98 if (!skipping)
99 {
100 skipping = true;
101 reset_state (); 98 reset_state ();
102 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); 99 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
103 }
104
105 cmd_queue.pop_front ();
106 } 100 }
107 else 101 else
108 {
109 execute (cmd.handler, cmd.data, cmd.datalen); 102 execute (cmd.handler, cmd.data, cmd.datalen);
103
110 cmd_queue.pop_front (); 104 cmd_queue.pop_front ();
111 return true; 105 return true;
112 }
113 } 106 }
114 107 else
115 return false; 108 return false;
116} 109}
117 110
118void 111void
119flush_sockets (void) 112flush_sockets (void)
120{ 113{
… …
136 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 129 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
137 write_cs_stats (); 130 write_cs_stats ();
138#endif 131#endif
139 132
140 //TODO: should not be done here, either 133 //TODO: should not be done here, either
141 for (int i = 0; i < clients.size (); ++i) 134 for (unsigned i = 0; i < clients.size (); ++i)
142 { 135 {
143 client *s = clients [i]; 136 client *ns = clients [i];
144 player *pl = s->pl;
145 137
146 if (pl && pl->ns && !pl->ns->destroyed ()) 138 ns->tick ();
139 ns->refcnt_chk ();
140 }
141}
142
143void
144client::tick ()
145{
146 if (!pl || destroyed ())
147 return;
148
149 /* Update the players stats once per tick. More efficient than
150 * sending them whenever they change, and probably just as useful
151 */
152 esrv_update_stats (pl);
153
154 if (last_weight != -1 && last_weight != WEIGHT (pl->ob))
155 {
156 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
157 if (last_weight != WEIGHT (pl->ob))
158 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
159 (unsigned long) last_weight, WEIGHT (pl->ob));
160 }
161
162 draw_client_map (pl->ob);
163
164 if (update_look)
165 esrv_draw_look (pl->ob);
166
167 if (askface.empty () && !partial_face_ofs)
168 {
169 // regularly send a new face when queue is empty
170 if (bg_scrub && !--bg_scrub && enable_bg_scrub)
171 while (scrub_idx < faces.size () - 1)
172 {
173 ++scrub_idx;
174 if (!faces_sent [scrub_idx])
175 {
176 send_face (scrub_idx);
177 flush_fx ();
178
179 bg_scrub = 1; // send up to one face per tick, unless an image was requested
180 break;
181 }
182 }
183
184 rate_avail = max_rate - outputbuffer_len ();
185 }
186 else
187 {
188 int ol = outputbuffer_len ();
189
190 rate_avail = min (max_rate, rate_avail + max_rate);
191 rate_avail -= ol;
192
193 int avail = rate_avail;
194
195 // if we can split images, transfer up to mss packets if possible
196 // but never more 768 bytes more.
197 if (fxix) avail += min (768, mss - (ol % mss));
198
199 bg_scrub = BG_SCRUB_RATE;
200
201 while (avail > 0)
147 { 202 {
148 client *ns = pl->ns; 203 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 { 204 {
157 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 205 if (facedata *d = face_data (partial_face, faceset))
158 if (ns->last_weight != WEIGHT (pl->ob)) 206 {
159 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", 207 // 9 bytes is enough for fx_FFFOOO, 40 leaves some room
160 (unsigned long) ns->last_weight, WEIGHT (pl->ob)); 208 int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs);
209
210 if (chunk <= 0)
211 break;
212
213 partial_face_ofs -= chunk;
214
215 packet sl ("ix");
216
217 sl << ber32 (partial_face)
218 << ber32 (partial_face_ofs)
219 << data (d->data.data () + partial_face_ofs, chunk);
220
221 send_packet (sl);
222 }
223 else
224 partial_face_ofs = 0;
161 } 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 ();
162 231
163 draw_client_map (pl->ob); 232 if (fxix)
233 {
234 if (facedata *d = face_data (facenum, faceset))
235 {
236 partial_face = facenum;
237 partial_face_ofs = d->data.size ();
238 }
239 }
240 else
241 send_image (facenum);
242 }
243 else
244 break;
164 245
165 if (s->update_look) 246 int consumed = ol - outputbuffer_len ();
166 esrv_draw_look (pl->ob); 247 avail -= consumed;
248 rate_avail -= consumed;
167 } 249 }
168
169 s->refcnt_chk ();
170 } 250 }
171} 251}
172 252

Diff Legend

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