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.32 by root, Fri Dec 22 16:34:00 2006 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team 5 * Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * any later version.
11 12 *
12 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
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * for more details.
16 17 *
17 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
18 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
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 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>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Main client/server loops. 27 * Main client/server loops.
27 * 28 *
29 * 30 *
30 * loop.c mainly deals with initialization and higher level socket 31 * loop.c mainly deals with initialization and higher level socket
31 * maintanance (checking for lost connections and if data has arrived.) 32 * maintanance (checking for lost connections and if data has arrived.)
32 */ 33 */
33 34
35#define BG_SCRUB_RATE 4 // how often to send a face in the background
34 36
35#include <global.h> 37#include <global.h>
36#include <sproto.h> 38#include <sproto.h>
37#include <sockproto.h> 39#include <sockproto.h>
38 40
46#include <arpa/inet.h> 48#include <arpa/inet.h>
47 49
48#include <loader.h> 50#include <loader.h>
49 51
50#define MAX_QUEUE_DEPTH 500 //TODO 52#define MAX_QUEUE_DEPTH 500 //TODO
51#define MAX_QUEUE_BACKLOG 5. //TODO 53#define MAX_QUEUE_BACKLOG 3. //TODO
52 54
53void 55void
54client::reset_state () 56client::reset_state ()
55{ 57{
56 if (!pl) 58 if (!pl)
83} 85}
84 86
85bool 87bool
86client::handle_command () 88client::handle_command ()
87{ 89{
88 bool skipping = false;
89
90 while (!cmd_queue.empty () 90 if (!cmd_queue.empty ()
91 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)) 91 && state == ST_PLAYING
92 && pl->ob->speed_left > 0.f)
92 { 93 {
93 command &cmd = cmd_queue.front (); 94 command &cmd = cmd_queue.front ();
94 95
95 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 96 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
96 { 97 {
97 if (!skipping)
98 {
99 skipping = true;
100 reset_state (); 98 reset_state ();
101 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); 99 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
102 }
103
104 cmd_queue.pop_front ();
105 } 100 }
106 else 101 else
107 {
108 execute (cmd.handler, cmd.data, cmd.datalen); 102 execute (cmd.handler, cmd.data, cmd.datalen);
103
109 cmd_queue.pop_front (); 104 cmd_queue.pop_front ();
110 return true; 105 return true;
111 }
112 } 106 }
113 107 else
114 return false; 108 return false;
115} 109}
116 110
117void 111void
118flush_sockets (void) 112flush_sockets (void)
119{ 113{
134#ifdef CS_LOGSTATS 128#ifdef CS_LOGSTATS
135 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 129 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
136 write_cs_stats (); 130 write_cs_stats ();
137#endif 131#endif
138 132
139 for (sockvec::iterator i = clients.begin (); i != clients.end (); ) 133 //TODO: should not be done here, either
134 for (unsigned i = 0; i < clients.size (); ++i)
135 {
136 client *ns = clients [i];
137
138 ns->tick ();
139 ns->refcnt_chk ();
140 { 140 }
141 client *s = *i; 141}
142 142
143 if (s->destroyed ()) 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)
144 { 202 {
145 clients.erase (i); 203 if (partial_face_ofs)
204 {
205 if (facedata *d = face_data (partial_face, faceset))
206 {
207 // 9 bytes is enough for fx_FFFOOO, 40 leaves some room
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;
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 {
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 }
146 delete s; 243 else
244 break;
245
246 int consumed = ol - outputbuffer_len ();
247 avail -= consumed;
248 rate_avail -= consumed;
147 } 249 }
148 else
149 ++i;
150 }
151
152 /* We need to do some of the processing below regardless */
153
154 /* Check for any input on the sockets */
155 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
156 { 250 }
157 client *s = *i;
158 player *pl = s->pl;
159
160 //TODO: should not be done here, either
161 if (!s->destroyed () && pl)
162 {
163 /* Update the players stats once per tick. More efficient than
164 * sending them whenever they change, and probably just as useful
165 */
166 esrv_update_stats (pl);
167
168 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
169 {
170 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
171 if (pl->last_weight != WEIGHT (pl->ob))
172 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
173 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
174 }
175
176 draw_client_map (pl->ob);
177
178 if (s->update_look)
179 esrv_draw_look (pl->ob);
180 }
181 }
182} 251}
183 252

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines