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.28 by root, Sun Dec 17 19:14:00 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 *
… …
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 * maintanance (checking for lost connections and if data has arrived.) 32 * maintanance (checking for lost connections and if data has arrived.)
32 */ 33 */
33 34
34
35#include <global.h> 35#include <global.h>
36#include <sproto.h> 36#include <sproto.h>
37#include <sockproto.h> 37#include <sockproto.h>
38 38
39#include <sys/types.h> 39#include <sys/types.h>
… …
45#include <unistd.h> 45#include <unistd.h>
46#include <arpa/inet.h> 46#include <arpa/inet.h>
47 47
48#include <loader.h> 48#include <loader.h>
49 49
50#define BG_SCRUB_RATE 4 // how often to send a face in the background
51
50#define MAX_QUEUE_DEPTH 500 //TODO 52#define MAX_QUEUE_DEPTH 500
51#define MAX_QUEUE_BACKLOG 5. //TODO 53#define MAX_QUEUE_BACKLOG 3.
52 54
53void 55void
54client::reset_state () 56client::reset_state ()
55{ 57{
56 if (!pl) 58 if (!pl)
… …
61} 63}
62 64
63void 65void
64client::queue_command (packet_type *handler, char *data, int datalen) 66client::queue_command (packet_type *handler, char *data, int datalen)
65{ 67{
66 tstamp stamp = now (); 68 tstamp stamp = NOW;
67 69
68 if (cmd_queue.size () >= MAX_QUEUE_DEPTH) 70 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
69 { 71 {
70 //TODO: just disconnect here? 72 //TODO: just disconnect here?
71 reset_state (); 73 reset_state ();
… …
83} 85}
84 86
85bool 87bool
86client::handle_command () 88client::handle_command ()
87{ 89{
88 bool skipping = false;
89
90 while (!cmd_queue.empty () 90 if (!cmd_queue.empty ()
91 && !(pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)) 91 && state == ST_PLAYING
92 && pl->ob->speed_left > 0.f)
92 { 93 {
93 command &cmd = cmd_queue.front (); 94 command &cmd = cmd_queue.front ();
94 95
95 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 96 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
96 { 97 {
97 if (!skipping)
98 {
99 skipping = true;
100 reset_state (); 98 reset_state ();
101 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); 99 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
102 }
103
104 cmd_queue.pop_front ();
105 } 100 }
106 else 101 else
107 {
108 execute (cmd.handler, cmd.data, cmd.datalen); 102 execute (cmd.handler, cmd.data, cmd.datalen);
103
109 cmd_queue.pop_front (); 104 cmd_queue.pop_front ();
110 return true; 105 return true;
111 }
112 } 106 }
113 107 else
114 return false; 108 return false;
115} 109}
116 110
117void 111void
118flush_sockets (void) 112flush_sockets (void)
119{ 113{
120 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 114 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
121 if ((*i)->status != Ns_Dead)
122 (*i)->flush (); 115 (*i)->flush ();
123} 116}
124 117
125/** 118/**
126 * This checks the sockets for input, does the right thing. 119 * This checks the sockets for input, does the right thing.
127 * 120 *
… …
130 * 123 *
131 */ 124 */
132void 125void
133doeric_server (void) 126doeric_server (void)
134{ 127{
135#ifdef CS_LOGSTATS 128 //TODO: should not be done here, either
136 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 129 for (unsigned i = 0; i < clients.size (); ++i)
137 write_cs_stats (); 130 {
138#endif 131 client *ns = clients [i];
139 132
140 /* Go through the players. Let the loop set the next pl value, 133 ns->tick ();
141 * 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
142 */ 146 */
143 //TODO: must be handled cleanly elsewhere 147 esrv_update_stats (pl);
144 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));
145 { 155 }
146 player *npl = pl->next;
147 156
148 //TODO: must be handled cleanly elsewhere 157 draw_client_map (pl);
149 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)
150 { 198 {
151 save_player (pl->ob, 0); 199 ixsend &ix = ixface.back ();
152 200
153 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 201 if (facedata *d = face_data (ix.idx, faceset))
154 { 202 {
155 terminate_all_pets (pl->ob); 203 if (fxix)
156 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 }
157 } 226 }
227 else
228 ix.ofs = 0;
158 229
159 leave (pl, 1); 230 int consumed = ol - outputbuffer_len ();
160 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 }
161 } 243 }
162
163 pl = npl;
164 }
165
166 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
167 { 244 }
168 client *s = *i;
169
170 if (s->status == Ns_Dead)
171 {
172 clients.erase (i);
173 delete s;
174 }
175 else
176 ++i;
177 }
178
179 /* We need to do some of the processing below regardless */
180
181 /* Check for any input on the sockets */
182 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
183 {
184 client *s = *i;
185 player *pl = s->pl;
186
187 //TODO: this could probably be nuked completely
188 s->handle_packet ();
189 s->handle_command ();
190
191 //TODO: should not be done here, either
192 if (s->status != Ns_Dead && pl)
193 {
194 /* Update the players stats once per tick. More efficient than
195 * sending them whenever they change, and probably just as useful
196 */
197 esrv_update_stats (pl);
198
199 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
200 {
201 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
202 if (pl->last_weight != WEIGHT (pl->ob))
203 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
204 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
205 }
206
207 draw_client_map (pl->ob);
208
209 if (s->update_look)
210 esrv_draw_look (pl->ob);
211 }
212 }
213} 245}
214 246

Diff Legend

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