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.24 by root, Sat Dec 16 18:39:26 2006 UTC vs.
Revision 1.59 by root, Fri Jul 6 03:52:51 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 500
52#define MAX_QUEUE_BACKLOG 5. //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 ();
73 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED); 73 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
74 }
75 else if (!cmd_queue.empty () && cmd_queue.front ().stamp + MAX_QUEUE_BACKLOG < stamp)
76 {
77 reset_state ();
78 send_packet_printf ("drawinfo %d too many commands in queue, ignoring.", NDI_RED);
79 } 74 }
80 else 75 else
81 { 76 {
82 cmd_queue.push_back (command ()); 77 cmd_queue.push_back (command ());
83 command &cmd = cmd_queue.back (); 78 command &cmd = cmd_queue.back ();
84 cmd.stamp = stamp; 79 cmd.stamp = stamp;
85 cmd.handler = handler; 80 cmd.handler = handler;
86 cmd.data = (char *)salloc (datalen + 1, data); 81 cmd.data = salloc<char> (datalen + 1, data);
87 cmd.datalen = datalen; 82 cmd.datalen = datalen;
88 } 83 }
89} 84}
90 85
91bool 86bool
92client::handle_command () 87client::handle_command ()
93{ 88{
94 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
95 return false; 107 return false;
96
97 if (cmd_queue.empty ())
98 return false;
99
100 command &cmd = cmd_queue.front ();
101
102 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
103 {
104 reset_state ();
105 send_packet_printf ("drawinfo %d ignoring delayed command.", NDI_RED);
106 }
107 else
108 execute (cmd.handler, cmd.data, cmd.datalen);
109
110 cmd_queue.pop_front ();
111
112 return true;
113} 108}
114 109
115void 110void
116flush_sockets (void) 111flush_sockets (void)
117{ 112{
118 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 113 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
119 if ((*i)->status != Ns_Dead)
120 (*i)->flush (); 114 (*i)->flush ();
121} 115}
122 116
123/** 117/**
124 * This checks the sockets for input, does the right thing. 118 * This checks the sockets for input, does the right thing.
125 * 119 *
… …
128 * 122 *
129 */ 123 */
130void 124void
131doeric_server (void) 125doeric_server (void)
132{ 126{
133#ifdef CS_LOGSTATS 127 //TODO: should not be done here, either
134 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 128 for (unsigned i = 0; i < clients.size (); ++i)
135 write_cs_stats (); 129 {
136#endif 130 client *ns = clients [i];
137 131
138 /* Go through the players. Let the loop set the next pl value, 132 ns->tick ();
139 * since we may remove some 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
140 */ 145 */
141 //TODO: must be handled cleanly elsewhere 146 esrv_update_stats (pl);
142 for (player *pl = first_player; 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));
143 { 154 }
144 player *npl = pl->next;
145 155
146 //TODO: must be handled cleanly elsewhere 156 draw_client_map (pl);
147 if (!pl->socket || pl->socket->status == Ns_Dead) 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 {
171 send_face (scrub_idx);
172 flush_fx ();
173
174 bg_scrub = 1; // send up to one face per tick, unless an image was requested
175 break;
176 }
177 }
178
179 rate_avail = max_rate - outputbuffer_len ();
180 }
181 else
182 {
183 int ol = outputbuffer_len ();
184
185 rate_avail = min (max_rate, rate_avail + max_rate);
186 rate_avail -= ol;
187
188 int avail = rate_avail;
189
190 // if we can split images, transfer up to mss-sized packets if possible
191 // but never 768 bytes more.
192 if (fxix) avail += min (768, mss - (ol % mss));
193
194 bg_scrub = BG_SCRUB_RATE;
195
196 while (avail > 0)
148 { 197 {
149 save_player (pl->ob, 0); 198 ixsend &ix = ixface.back ();
150 199
151 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 200 if (facedata *d = face_data (ix.idx, faceset))
152 { 201 {
153 terminate_all_pets (pl->ob); 202 if (fxix)
154 pl->ob->remove (); 203 {
204 // only transfer something if the amount of data transferred
205 // has a healthy relation to the header overhead
206 if (avail <= 40)
207 break;
208
209 // 9 bytes is enough for fx_FFFOOO
210 int chunk = min (min (avail, MAXSOCKBUF - 9), (int)ix.ofs);
211
212 if (chunk <= 0)
213 break;
214
215 ix.ofs -= chunk;
216
217 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
218
219 packet sl ("ix");
220
221 sl << ber32 (ix.idx)
222 << ber32 (ix.ofs)
223 << data (d->data.data () + ix.ofs, chunk);
224
225 send_packet (sl);
226 }
227 else
228 {
229 send_image (ix.idx);
230 ix.ofs = 0;
231 }
155 } 232 }
233 else
234 ix.ofs = 0;
156 235
157 leave (pl, 1); 236 int consumed = outputbuffer_len () - ol;
158 final_free_player (pl); 237
238 avail -= consumed;
239 rate_avail -= consumed;
240
241 ol = outputbuffer_len ();
242
243 if (!ix.ofs)
244 {
245 ixface.pop_back ();
246
247 if (ixface.empty ())
248 break;
249 }
159 } 250 }
160
161 pl = npl;
162 }
163
164 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
165 { 251 }
166 client *s = *i;
167
168 if (s->status == Ns_Dead)
169 {
170 clients.erase (i);
171 delete s;
172 }
173 else
174 ++i;
175 }
176
177 /* We need to do some of the processing below regardless */
178
179 /* Check for any input on the sockets */
180 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
181 {
182 client *s = *i;
183 player *pl = s->pl;
184
185 s->handle_packet ();
186 s->handle_command ();
187
188 //TODO: should not be done here, either
189 if (s->status != Ns_Dead && pl)
190 {
191 /* Update the players stats once per tick. More efficient than
192 * sending them whenever they change, and probably just as useful
193 */
194 esrv_update_stats (pl);
195
196 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
197 {
198 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
199 if (pl->last_weight != WEIGHT (pl->ob))
200 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
201 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
202 }
203
204 draw_client_map (pl->ob);
205
206 if (s->update_look)
207 esrv_draw_look (pl->ob);
208 }
209 }
210} 252}
211 253

Diff Legend

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