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.22 by root, Sat Dec 16 12:23:52 2006 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 (©) 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 it
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 along
18 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
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 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>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Main client/server loops. 27 * Main client/server loops.
27 * 28 *
28 * \date 2003-12-02 29 * \date 2003-12-02
29 * 30 *
30 * loop.c mainly deals with initialization and higher level socket 31 * loop.c mainly deals with initialization and higher level socket
31 * maintenance (checking for lost connections and if data has arrived.) 32 * maintanance (checking for lost connections and if data has arrived.)
32 * The reading of data is handled in ericserver.c
33 */ 33 */
34
35 34
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
… …
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 2 //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 ();
73 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED); 74 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
74 } 75 }
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 }
80 else 76 else
77 {
81 cmd_queue.push_back (command ( 78 cmd_queue.push_back (command ());
82 stamp, handler, (char *)salloc (datalen + 1, data), datalen 79 command &cmd = cmd_queue.back ();
83 )); 80 cmd.stamp = stamp;
81 cmd.handler = handler;
82 cmd.data = salloc<char> (datalen + 1, data);
83 cmd.datalen = datalen;
84 }
84} 85}
85 86
86bool 87bool
87client::handle_command () 88client::handle_command ()
88{ 89{
89 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0) 90 if (!cmd_queue.empty ()
91 && state == ST_PLAYING
92 && pl->ob->speed_left > 0.f)
93 {
94 command &cmd = cmd_queue.front ();
95
96 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
97 {
98 reset_state ();
99 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
100 }
101 else
102 execute (cmd.handler, cmd.data, cmd.datalen);
103
104 cmd_queue.pop_front ();
105 return true;
106 }
107 else
90 return false; 108 return false;
91
92 if (cmd_queue.empty ())
93 return false;
94
95 command &cmd = cmd_queue.front ();
96
97 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
98 {
99 reset_state ();
100 send_packet_printf ("drawinfo %d ignoring delayed command.", NDI_RED);
101 }
102 else
103 execute (cmd.handler, cmd.data, cmd.datalen);
104
105 sfree (cmd.data, cmd.datalen);
106 cmd_queue.pop_front ();
107
108 return true;
109} 109}
110 110
111void 111void
112flush_sockets (void) 112flush_sockets (void)
113{ 113{
114 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 114 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
115 if ((*i)->status != Ns_Dead)
116 (*i)->flush (); 115 (*i)->flush ();
117} 116}
118 117
119/** 118/**
120 * This checks the sockets for input, does the right thing. 119 * This checks the sockets for input, does the right thing.
121 * 120 *
… …
124 * 123 *
125 */ 124 */
126void 125void
127doeric_server (void) 126doeric_server (void)
128{ 127{
129#ifdef CS_LOGSTATS 128 //TODO: should not be done here, either
130 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 129 for (unsigned i = 0; i < clients.size (); ++i)
131 write_cs_stats (); 130 {
132#endif 131 client *ns = clients [i];
133 132
134 /* Go through the players. Let the loop set the next pl value, 133 ns->tick ();
135 * since we may remove some 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
136 */ 146 */
137 //TODO: must be handled cleanly elsewhere 147 esrv_update_stats (pl);
138 for (player *pl = first_player; 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));
139 { 155 }
140 player *npl = pl->next;
141 156
142 //TODO: must be handled cleanly elsewhere 157 draw_client_map (pl);
143 if (!pl->socket || pl->socket->status == Ns_Dead) 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)
144 { 198 {
145 save_player (pl->ob, 0); 199 ixsend &ix = ixface.back ();
146 200
147 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 201 if (facedata *d = face_data (ix.idx, faceset))
148 { 202 {
149 terminate_all_pets (pl->ob); 203 if (fxix)
150 pl->ob->remove (); 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 }
151 } 226 }
227 else
228 ix.ofs = 0;
152 229
153 leave (pl, 1); 230 int consumed = ol - outputbuffer_len ();
154 final_free_player (pl); 231
232 avail -= consumed;
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 }
155 } 243 }
156
157 pl = npl;
158 }
159
160 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
161 { 244 }
162 client *s = *i;
163
164 if (s->status == Ns_Dead)
165 {
166 clients.erase (i);
167 delete s;
168 }
169 else
170 ++i;
171 }
172
173 /* We need to do some of the processing below regardless */
174
175 /* Check for any input on the sockets */
176 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
177 {
178 client *s = *i;
179 player *pl = s->pl;
180
181 s->handle_packet ();
182 s->handle_command ();
183
184 //TODO: should not be done here, either
185 if (s->status != Ns_Dead && pl)
186 {
187 /* Update the players stats once per tick. More efficient than
188 * sending them whenever they change, and probably just as useful
189 */
190 esrv_update_stats (pl);
191
192 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
193 {
194 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
195 if (pl->last_weight != WEIGHT (pl->ob))
196 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
197 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
198 }
199
200 draw_client_map (pl->ob);
201
202 if (s->update_look)
203 esrv_draw_look (pl->ob);
204 }
205 }
206} 245}
207 246

Diff Legend

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