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.41 by root, Wed Mar 14 15:44:47 2007 UTC vs.
Revision 1.65 by root, Sun Jul 29 02:24:34 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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
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 3 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, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Main client/server loops. 26 * Main client/server loops.
… …
30 * 29 *
31 * loop.c mainly deals with initialization and higher level socket 30 * loop.c mainly deals with initialization and higher level socket
32 * maintanance (checking for lost connections and if data has arrived.) 31 * maintanance (checking for lost connections and if data has arrived.)
33 */ 32 */
34 33
35
36#include <global.h> 34#include <global.h>
37#include <sproto.h> 35#include <sproto.h>
38#include <sockproto.h> 36#include <sockproto.h>
39 37
40#include <sys/types.h> 38#include <sys/types.h>
… …
46#include <unistd.h> 44#include <unistd.h>
47#include <arpa/inet.h> 45#include <arpa/inet.h>
48 46
49#include <loader.h> 47#include <loader.h>
50 48
49#define BG_SCRUB_RATE 4 // how often to send a face in the background
50
51#define MAX_QUEUE_DEPTH 500 //TODO 51#define MAX_QUEUE_DEPTH 50
52#define MAX_QUEUE_BACKLOG 3. //TODO 52#define MAX_QUEUE_BACKLOG 3.
53 53
54void 54void
55client::reset_state () 55client::reset_state ()
56{ 56{
57 if (!pl) 57 if (!pl)
… …
62} 62}
63 63
64void 64void
65client::queue_command (packet_type *handler, char *data, int datalen) 65client::queue_command (packet_type *handler, char *data, int datalen)
66{ 66{
67 tstamp stamp = now (); 67 tstamp stamp = NOW;
68 68
69 if (cmd_queue.size () >= MAX_QUEUE_DEPTH) 69 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
70 { 70 {
71 //TODO: just disconnect here? 71 //TODO: just disconnect here?
72 reset_state (); 72 reset_state ();
… …
84} 84}
85 85
86bool 86bool
87client::handle_command () 87client::handle_command ()
88{ 88{
89 bool skipping = false;
90
91 while (!cmd_queue.empty () 89 if (!cmd_queue.empty ()
92 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0)) 90 && state == ST_PLAYING
91 && pl->ob->speed_left > 0.f)
93 { 92 {
94 command &cmd = cmd_queue.front (); 93 command &cmd = cmd_queue.front ();
95 94
96 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 95 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
97 { 96 {
98 if (!skipping)
99 {
100 skipping = true;
101 reset_state (); 97 reset_state ();
102 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); 98 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
103 }
104
105 cmd_queue.pop_front ();
106 } 99 }
107 else 100 else
108 {
109 execute (cmd.handler, cmd.data, cmd.datalen); 101 execute (cmd.handler, cmd.data, cmd.datalen);
102
110 cmd_queue.pop_front (); 103 cmd_queue.pop_front ();
111 return true; 104 return true;
112 }
113 } 105 }
114 106 else
115 return false; 107 return false;
116} 108}
117 109
118void 110void
119flush_sockets (void) 111flush_sockets (void)
120{ 112{
… …
130 * 122 *
131 */ 123 */
132void 124void
133doeric_server (void) 125doeric_server (void)
134{ 126{
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 127 //TODO: should not be done here, either
141 for (unsigned i = 0; i < clients.size (); ++i) 128 for (unsigned i = 0; i < clients.size (); ++i)
142 { 129 {
143 client *s = clients [i]; 130 client *ns = clients [i];
144 player *pl = s->pl;
145 131
146 if (pl && pl->ns && !pl->ns->destroyed ()) 132 ns->tick ();
133 ns->refcnt_chk ();
134 }
135}
136
137void
138client::tick ()
139{
140 if (!pl || destroyed ())
141 return;
142
143 /* Update the players stats once per tick. More efficient than
144 * sending them whenever they change, and probably just as useful
145 */
146 esrv_update_stats (pl);
147
148 if (last_weight != -1 && last_weight != WEIGHT (pl->ob))
149 {
150 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
151 if (last_weight != WEIGHT (pl->ob))
152 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
153 (unsigned long) last_weight, WEIGHT (pl->ob));
154 }
155
156 draw_client_map (pl);
157
158 if (update_look)
159 esrv_draw_look (pl);
160
161 if (ixface.empty ())
162 {
163 // regularly send a new face when queue is empty
164 if (bg_scrub && !--bg_scrub && enable_bg_scrub)
165 while (scrub_idx < faces.size () - 1)
166 {
167 ++scrub_idx;
168
169 if (!faces_sent [scrub_idx])
170 if (faceinfo *f = face_info (scrub_idx))
171 if (f->type == FT_FACE) // only scrub faces for now
172 {
173 send_face (scrub_idx, -120);
174 flush_fx ();
175
176 bg_scrub = 1; // send up to one face per tick, unless an image was requested
177 break;
178 }
179 }
180
181 rate_avail = max_rate - outputbuffer_len ();
182 }
183 else
184 {
185 int ol = outputbuffer_len ();
186
187 rate_avail = min (max_rate + mss, rate_avail + max_rate);
188
189 int avail = rate_avail;
190
191 // if we can split images, round to next-lowest mss
192 if (fxix) avail -= avail % mss;
193
194 rate_avail -= ol;
195 avail -= ol;
196
197#if HAVE_TCP_INFO
198 // further restrict the available bandwidth by the excess bandwidth available
199 avail = max (0, min (avail, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss));
200#endif
201
202 bg_scrub = BG_SCRUB_RATE;
203
204 while (avail > 0)
147 { 205 {
148 client *ns = pl->ns; 206 ixsend &ix = ixface.back ();
149 207
150 /* Update the players stats once per tick. More efficient than 208 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 { 209 {
157 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 210 if (fxix)
158 if (ns->last_weight != WEIGHT (pl->ob)) 211 {
159 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", 212 // estimate the packet header overhead "ix " + idx + (new)ofs
160 (unsigned long) ns->last_weight, WEIGHT (pl->ob)); 213 int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
214 int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
215
216 // only transfer something if the amount of data transferred
217 // has a healthy relation to the header overhead
218 if (chunk < 64)
219 break;
220
221 chunk = min (chunk, (int)ix.ofs);
222
223 ix.ofs -= chunk;
224
225 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
226
227 packet sl ("ix");
228
229 sl << ber32 (ix.idx)
230 << ber32 (ix.ofs)
231 << data (d->data.data () + ix.ofs, chunk);
232
233 send_packet (sl);
234 }
235 else
236 {
237 send_image (ix.idx);
238 ix.ofs = 0;
239 }
161 } 240 }
241 else
242 ix.ofs = 0;
162 243
163 draw_client_map (pl->ob); 244 int consumed = outputbuffer_len () - ol;
164 245
165 if (s->update_look) 246 avail -= consumed;
166 esrv_draw_look (pl->ob); 247 rate_avail -= consumed;
167 248
168 while (!ns->askface.empty () && ns->outputbuffer_len () < ns->max_rate) 249 ol = outputbuffer_len ();
250
251 if (!ix.ofs)
169 { 252 {
170 // use a lifo to send most recently requested images
171 faceidx face = ns->askface.back ();
172 ns->askface.pop_back (); 253 ixface.pop_back ();
173 254
174 ns->send_image (face); 255 if (ixface.empty ())
256 break;
175 } 257 }
176 } 258 }
177
178 s->refcnt_chk ();
179 } 259 }
180} 260}
181 261

Diff Legend

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