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.45 by root, Tue Apr 3 00:21:38 2007 UTC vs.
Revision 1.54 by root, Sun Jul 1 04:08:14 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.
… …
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
36
37#include <global.h> 35#include <global.h>
38#include <sproto.h> 36#include <sproto.h>
39#include <sockproto.h> 37#include <sockproto.h>
40 38
41#include <sys/types.h> 39#include <sys/types.h>
… …
47#include <unistd.h> 45#include <unistd.h>
48#include <arpa/inet.h> 46#include <arpa/inet.h>
49 47
50#include <loader.h> 48#include <loader.h>
51 49
50#define BG_SCRUB_RATE 4 // how often to send a face in the background
51
52#define MAX_QUEUE_DEPTH 500 //TODO 52#define MAX_QUEUE_DEPTH 500
53#define MAX_QUEUE_BACKLOG 3. //TODO 53#define MAX_QUEUE_BACKLOG 3.
54 54
55void 55void
56client::reset_state () 56client::reset_state ()
57{ 57{
58 if (!pl) 58 if (!pl)
… …
63} 63}
64 64
65void 65void
66client::queue_command (packet_type *handler, char *data, int datalen) 66client::queue_command (packet_type *handler, char *data, int datalen)
67{ 67{
68 tstamp stamp = now (); 68 tstamp stamp = NOW;
69 69
70 if (cmd_queue.size () >= MAX_QUEUE_DEPTH) 70 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
71 { 71 {
72 //TODO: just disconnect here? 72 //TODO: just disconnect here?
73 reset_state (); 73 reset_state ();
… …
85} 85}
86 86
87bool 87bool
88client::handle_command () 88client::handle_command ()
89{ 89{
90 bool skipping = false;
91
92 while (!cmd_queue.empty () 90 if (!cmd_queue.empty ()
93 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0)) 91 && state == ST_PLAYING
92 && pl->ob->speed_left > 0.f)
94 { 93 {
95 command &cmd = cmd_queue.front (); 94 command &cmd = cmd_queue.front ();
96 95
97 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 96 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
98 { 97 {
99 if (!skipping)
100 {
101 skipping = true;
102 reset_state (); 98 reset_state ();
103 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); 99 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
104 }
105
106 cmd_queue.pop_front ();
107 } 100 }
108 else 101 else
109 {
110 execute (cmd.handler, cmd.data, cmd.datalen); 102 execute (cmd.handler, cmd.data, cmd.datalen);
103
111 cmd_queue.pop_front (); 104 cmd_queue.pop_front ();
112 return true; 105 return true;
113 }
114 } 106 }
115 107 else
116 return false; 108 return false;
117} 109}
118 110
119void 111void
120flush_sockets (void) 112flush_sockets (void)
121{ 113{
… …
131 * 123 *
132 */ 124 */
133void 125void
134doeric_server (void) 126doeric_server (void)
135{ 127{
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 128 //TODO: should not be done here, either
142 for (unsigned i = 0; i < clients.size (); ++i) 129 for (unsigned i = 0; i < clients.size (); ++i)
143 { 130 {
144 client *ns = clients [i]; 131 client *ns = clients [i];
145 132
… …
165 if (last_weight != WEIGHT (pl->ob)) 152 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", 153 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)); 154 (unsigned long) last_weight, WEIGHT (pl->ob));
168 } 155 }
169 156
170 draw_client_map (pl->ob); 157 draw_client_map (pl);
171 158
172 if (update_look) 159 if (update_look)
173 esrv_draw_look (pl->ob); 160 esrv_draw_look (pl);
174 161
175 if (partial_face_ofs)
176 {
177 }
178
179 if (partial_face_ofs)
180 {
181 // one hell of a big thing that must be
182 }
183 else if (askface.empty ()) 162 if (ixface.empty ())
184 { 163 {
185 // regularly send a new face when queue is empty 164 // regularly send a new face when queue is empty
186 if (bg_scrub && !--bg_scrub && enable_bg_scrub) 165 if (bg_scrub && !--bg_scrub && enable_bg_scrub)
187 while (scrub_idx < faces.size () - 1) 166 while (scrub_idx < faces.size () - 1)
188 { 167 {
189 ++scrub_idx; 168 ++scrub_idx;
169
190 if (!faces_sent [scrub_idx]) 170 if (!faces_sent [scrub_idx])
191 { 171 {
192 send_face (scrub_idx); 172 send_face (scrub_idx);
193 flush_fx (); 173 flush_fx ();
194 174
… …
205 185
206 rate_avail = min (max_rate, rate_avail + max_rate); 186 rate_avail = min (max_rate, rate_avail + max_rate);
207 rate_avail -= ol; 187 rate_avail -= ol;
208 188
209 int avail = rate_avail; 189 int avail = rate_avail;
210 190
211 // if we can split images, transfer up to mss packets if possible 191 // if we can split images, transfer up to mss-sized packets if possible
192 // but never 768 bytes more.
212 if (fxix) avail += mss - (ol % mss); 193 if (fxix) avail += min (768, mss - (ol % mss));
213 194
214 while (!askface.empty () && avail > 0) 195 bg_scrub = BG_SCRUB_RATE;
196
197 while (avail > 0)
215 { 198 {
216 // use a lifo to send most recently requested images 199 ixsend &ix = ixface.back ();
217 faceidx facenum = askface.back ();
218 askface.pop_back ();
219 200
220 if (fxix && 0) 201 if (facedata *d = face_data (ix.idx, faceset))
221 { 202 {
203 if (fxix)
204 {
205 // 9 bytes is enough for fx_FFFOOO, 40 leaves some room for image data
206 int chunk = min (min (avail - 40, MAXSOCKBUF - 9), ix.ofs);
207
208 if (chunk <= 0)
209 break;
210
211 ix.ofs -= chunk;
212
213 packet sl ("ix");
214
215 sl << ber32 (ix.idx)
216 << ber32 (ix.ofs)
217 << data (d->data.data () + ix.ofs, chunk);
218
219 send_packet (sl);
220 }
221 else
222 {
223 send_image (ix.idx);
224 ix.ofs = 0;
225 }
222 } 226 }
223 else 227 else
224 send_image (facenum); 228 ix.ofs = 0;
225 229
226 int consumed = ol - outputbuffer_len (); 230 int consumed = ol - outputbuffer_len ();
231
227 avail -= consumed; 232 avail -= consumed;
228 rate_avail -= consumed; 233 rate_avail -= consumed;
229 234
230 bg_scrub = BG_SCRUB_RATE; 235 ol = outputbuffer_len ();
236
237 if (!ix.ofs)
238 {
239 ixface.pop_back ();
240 if (ixface.empty ())
241 break;
242 }
231 } 243 }
232 } 244 }
233} 245}
234 246

Diff Legend

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