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.20 by root, Sat Dec 16 03:08:26 2006 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 (©) 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 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>
22*/ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Main client/server loops. 26 * Main client/server loops.
27 * 27 *
28 * \date 2003-12-02 28 * \date 2003-12-02
29 * 29 *
30 * loop.c mainly deals with initialization and higher level socket 30 * loop.c mainly deals with initialization and higher level socket
31 * maintenance (checking for lost connections and if data has arrived.) 31 * maintanance (checking for lost connections and if data has arrived.)
32 * The reading of data is handled in ericserver.c
33 */ 32 */
34
35 33
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
… …
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
53//TODO: cannot use this, as it might ignore vital commands such as fire_stop
54#define MAX_QUEUE_BACKLOG 1e99 //TODO 52#define MAX_QUEUE_BACKLOG 3.
53
54void
55client::reset_state ()
56{
57 if (!pl)
58 return;
59
60 pl->run_on = 0;
61 pl->fire_on = 0;
62}
55 63
56void 64void
57client::queue_command (packet_type *handler, char *data, int datalen) 65client::queue_command (packet_type *handler, char *data, int datalen)
58{ 66{
59 tstamp stamp = now (); 67 tstamp stamp = NOW;
60 68
61 if (cmd_queue.size () >= MAX_QUEUE_DEPTH) 69 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
70 {
62 //TODO: just disconnect here? 71 //TODO: just disconnect here?
72 reset_state ();
63 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED); 73 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
64 else if (!cmd_queue.empty () && cmd_queue.front ().stamp + MAX_QUEUE_BACKLOG < stamp) 74 }
65 //TODO: do fire_stop and other things that might be necessary
66 send_packet_printf ("drawinfo %d too many commands in queue, ignoring.", NDI_RED);
67 else 75 else
76 {
68 cmd_queue.push_back (command ( 77 cmd_queue.push_back (command ());
69 stamp, handler, (char *)salloc (datalen, data), datalen 78 command &cmd = cmd_queue.back ();
70 )); 79 cmd.stamp = stamp;
80 cmd.handler = handler;
81 cmd.data = salloc<char> (datalen + 1, data);
82 cmd.datalen = datalen;
83 }
71} 84}
72 85
73bool 86bool
74client::handle_command () 87client::handle_command ()
75{ 88{
76 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0) 89 if (!cmd_queue.empty ()
90 && state == ST_PLAYING
91 && pl->ob->speed_left > 0.f)
92 {
93 command &cmd = cmd_queue.front ();
94
95 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
96 {
97 reset_state ();
98 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
99 }
100 else
101 execute (cmd.handler, cmd.data, cmd.datalen);
102
103 cmd_queue.pop_front ();
104 return true;
105 }
106 else
77 return false; 107 return false;
78
79 if (cmd_queue.empty ())
80 return false;
81
82 command &cmd = cmd_queue.front ();
83
84 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
85 //TODO: do fire_stop and other things that might be necessary
86 send_packet_printf ("drawinfo %d ignoring delayed command.", NDI_RED);
87 else
88 execute (cmd.handler, cmd.data, cmd.datalen);
89
90 sfree (cmd.data, cmd.datalen);
91 cmd_queue.pop_front ();
92
93 return true;
94} 108}
95 109
96void 110void
97flush_sockets (void) 111flush_sockets (void)
98{ 112{
99 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 113 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
100 if ((*i)->status != Ns_Dead)
101 (*i)->flush (); 114 (*i)->flush ();
102} 115}
103 116
104/** 117/**
105 * This checks the sockets for input, does the right thing. 118 * This checks the sockets for input, does the right thing.
106 * 119 *
… …
109 * 122 *
110 */ 123 */
111void 124void
112doeric_server (void) 125doeric_server (void)
113{ 126{
114#ifdef CS_LOGSTATS 127 //TODO: should not be done here, either
115 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 128 for (unsigned i = 0; i < clients.size (); ++i)
116 write_cs_stats (); 129 {
130 client *ns = clients [i];
131
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));
117#endif 200#endif
118 201
119 /* Go through the players. Let the loop set the next pl value, 202 bg_scrub = BG_SCRUB_RATE;
120 * since we may remove some
121 */
122 //TODO: must be handled cleanly elsewhere
123 for (player *pl = first_player; pl; )
124 {
125 player *npl = pl->next;
126 203
127 //TODO: must be handled cleanly elsewhere 204 while (avail > 0)
128 if (!pl->socket || pl->socket->status == Ns_Dead)
129 { 205 {
130 save_player (pl->ob, 0); 206 ixsend &ix = ixface.back ();
131 207
132 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 208 if (facedata *d = face_data (ix.idx, faceset))
133 { 209 {
134 terminate_all_pets (pl->ob); 210 if (fxix)
135 pl->ob->remove (); 211 {
212 // estimate the packet header overhead "ix " + idx + (new)ofs
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 }
136 } 240 }
241 else
242 ix.ofs = 0;
137 243
138 leave (pl, 1); 244 int consumed = outputbuffer_len () - ol;
139 final_free_player (pl); 245
246 avail -= consumed;
247 rate_avail -= consumed;
248
249 ol = outputbuffer_len ();
250
251 if (!ix.ofs)
252 {
253 ixface.pop_back ();
254
255 if (ixface.empty ())
256 break;
257 }
140 } 258 }
141
142 pl = npl;
143 }
144
145 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
146 { 259 }
147 client *s = *i;
148
149 if (s->status == Ns_Dead)
150 {
151 clients.erase (i);
152 delete s;
153 }
154 else
155 ++i;
156 }
157
158 /* We need to do some of the processing below regardless */
159
160 /* Check for any input on the sockets */
161 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
162 {
163 client *s = *i;
164 player *pl = s->pl;
165
166 s->handle_packet ();
167 s->handle_command ();
168
169 //TODO: should not be done here, either
170 if (s->status != Ns_Dead && pl)
171 {
172 /* Update the players stats once per tick. More efficient than
173 * sending them whenever they change, and probably just as useful
174 */
175 esrv_update_stats (pl);
176
177 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
178 {
179 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
180 if (pl->last_weight != WEIGHT (pl->ob))
181 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
182 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
183 }
184
185 draw_client_map (pl->ob);
186
187 if (s->update_look)
188 esrv_draw_look (pl->ob);
189 }
190 }
191} 260}
192 261

Diff Legend

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