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.37 by root, Mon Jan 8 18:18:36 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.
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
36#include <global.h> 35#include <global.h>
37#include <sproto.h> 36#include <sproto.h>
38#include <sockproto.h> 37#include <sockproto.h>
39 38
40#include <sys/types.h> 39#include <sys/types.h>
… …
46#include <unistd.h> 45#include <unistd.h>
47#include <arpa/inet.h> 46#include <arpa/inet.h>
48 47
49#include <loader.h> 48#include <loader.h>
50 49
50#define BG_SCRUB_RATE 4 // how often to send a face in the background
51
51#define MAX_QUEUE_DEPTH 500 //TODO 52#define MAX_QUEUE_DEPTH 500
52#define MAX_QUEUE_BACKLOG 3. //TODO 53#define MAX_QUEUE_BACKLOG 3.
53 54
54void 55void
55client::reset_state () 56client::reset_state ()
56{ 57{
57 if (!pl) 58 if (!pl)
… …
62} 63}
63 64
64void 65void
65client::queue_command (packet_type *handler, char *data, int datalen) 66client::queue_command (packet_type *handler, char *data, int datalen)
66{ 67{
67 tstamp stamp = now (); 68 tstamp stamp = NOW;
68 69
69 if (cmd_queue.size () >= MAX_QUEUE_DEPTH) 70 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
70 { 71 {
71 //TODO: just disconnect here? 72 //TODO: just disconnect here?
72 reset_state (); 73 reset_state ();
… …
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{
… …
130 * 123 *
131 */ 124 */
132void 125void
133doeric_server (void) 126doeric_server (void)
134{ 127{
135#ifdef CS_LOGSTATS
136 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
137 write_cs_stats ();
138#endif
139
140 //TODO: should not be done here, either 128 //TODO: should not be done here, either
141 for (int i = 0; i < clients.size (); ++i) 129 for (unsigned i = 0; i < clients.size (); ++i)
142 { 130 {
143 client *s = clients [i]; 131 client *ns = clients [i];
144 player *pl = s->pl;
145 132
146 if (pl && pl->ns && !pl->ns->destroyed ()) 133 ns->tick ();
134 ns->refcnt_chk ();
135 }
136}
137
138void
139client::tick ()
140{
141 if (!pl || destroyed ())
142 return;
143
144 /* Update the players stats once per tick. More efficient than
145 * sending them whenever they change, and probably just as useful
146 */
147 esrv_update_stats (pl);
148
149 if (last_weight != -1 && last_weight != WEIGHT (pl->ob))
150 {
151 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
152 if (last_weight != WEIGHT (pl->ob))
153 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
154 (unsigned long) last_weight, WEIGHT (pl->ob));
155 }
156
157 draw_client_map (pl);
158
159 if (update_look)
160 esrv_draw_look (pl);
161
162 if (ixface.empty ())
163 {
164 // regularly send a new face when queue is empty
165 if (bg_scrub && !--bg_scrub && enable_bg_scrub)
166 while (scrub_idx < faces.size () - 1)
167 {
168 ++scrub_idx;
169
170 if (!faces_sent [scrub_idx])
171 {
172 send_face (scrub_idx);
173 flush_fx ();
174
175 bg_scrub = 1; // send up to one face per tick, unless an image was requested
176 break;
177 }
178 }
179
180 rate_avail = max_rate - outputbuffer_len ();
181 }
182 else
183 {
184 int ol = outputbuffer_len ();
185
186 rate_avail = min (max_rate, rate_avail + max_rate);
187 rate_avail -= ol;
188
189 int avail = rate_avail;
190
191 // if we can split images, transfer up to mss-sized packets if possible
192 // but never 768 bytes more.
193 if (fxix) avail += min (768, mss - (ol % mss));
194
195 bg_scrub = BG_SCRUB_RATE;
196
197 while (avail > 0)
147 { 198 {
148 client *ns = pl->ns; 199 ixsend &ix = ixface.back ();
149 200
150 /* Update the players stats once per tick. More efficient than 201 if (facedata *d = face_data (ix.idx, faceset))
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 { 202 {
157 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 203 if (fxix)
158 if (ns->last_weight != WEIGHT (pl->ob)) 204 {
159 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", 205 // 9 bytes is enough for fx_FFFOOO, 40 leaves some room for image data
160 (unsigned long) ns->last_weight, WEIGHT (pl->ob)); 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 }
161 } 226 }
227 else
228 ix.ofs = 0;
162 229
163 draw_client_map (pl->ob); 230 int consumed = ol - outputbuffer_len ();
164 231
165 if (s->update_look) 232 avail -= consumed;
166 esrv_draw_look (pl->ob); 233 rate_avail -= consumed;
234
235 ol = outputbuffer_len ();
236
237 if (!ix.ofs)
238 {
239 ixface.pop_back ();
240 if (ixface.empty ())
241 break;
242 }
167 } 243 }
168
169 s->refcnt_chk ();
170 } 244 }
171} 245}
172 246

Diff Legend

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