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.29 by root, Tue Dec 19 04:58:05 2006 UTC vs.
Revision 1.55 by root, Sun Jul 1 05:00:20 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 *
… …
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 * maintanance (checking for lost connections and if data has arrived.) 31 * maintanance (checking for lost connections and if data has arrived.)
32 */ 32 */
33 33
34
35#include <global.h> 34#include <global.h>
36#include <sproto.h> 35#include <sproto.h>
37#include <sockproto.h> 36#include <sockproto.h>
38 37
39#include <sys/types.h> 38#include <sys/types.h>
… …
45#include <unistd.h> 44#include <unistd.h>
46#include <arpa/inet.h> 45#include <arpa/inet.h>
47 46
48#include <loader.h> 47#include <loader.h>
49 48
49#define BG_SCRUB_RATE 4 // how often to send a face in the background
50
50#define MAX_QUEUE_DEPTH 500 //TODO 51#define MAX_QUEUE_DEPTH 500
51#define MAX_QUEUE_BACKLOG 5. //TODO 52#define MAX_QUEUE_BACKLOG 3.
52 53
53void 54void
54client::reset_state () 55client::reset_state ()
55{ 56{
56 if (!pl) 57 if (!pl)
… …
61} 62}
62 63
63void 64void
64client::queue_command (packet_type *handler, char *data, int datalen) 65client::queue_command (packet_type *handler, char *data, int datalen)
65{ 66{
66 tstamp stamp = now (); 67 tstamp stamp = NOW;
67 68
68 if (cmd_queue.size () >= MAX_QUEUE_DEPTH) 69 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
69 { 70 {
70 //TODO: just disconnect here? 71 //TODO: just disconnect here?
71 reset_state (); 72 reset_state ();
… …
83} 84}
84 85
85bool 86bool
86client::handle_command () 87client::handle_command ()
87{ 88{
88 bool skipping = false;
89
90 while (!cmd_queue.empty () 89 if (!cmd_queue.empty ()
91 && !(pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)) 90 && state == ST_PLAYING
91 && pl->ob->speed_left > 0.f)
92 { 92 {
93 command &cmd = cmd_queue.front (); 93 command &cmd = cmd_queue.front ();
94 94
95 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 95 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
96 { 96 {
97 if (!skipping)
98 {
99 skipping = true;
100 reset_state (); 97 reset_state ();
101 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); 98 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
102 }
103
104 cmd_queue.pop_front ();
105 } 99 }
106 else 100 else
107 {
108 execute (cmd.handler, cmd.data, cmd.datalen); 101 execute (cmd.handler, cmd.data, cmd.datalen);
102
109 cmd_queue.pop_front (); 103 cmd_queue.pop_front ();
110 return true; 104 return true;
111 }
112 } 105 }
113 106 else
114 return false; 107 return false;
115} 108}
116 109
117void 110void
118flush_sockets (void) 111flush_sockets (void)
119{ 112{
120 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 113 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
121 if ((*i)->status != Ns_Dead)
122 (*i)->flush (); 114 (*i)->flush ();
123} 115}
124 116
125/** 117/**
126 * This checks the sockets for input, does the right thing. 118 * This checks the sockets for input, does the right thing.
127 * 119 *
… …
130 * 122 *
131 */ 123 */
132void 124void
133doeric_server (void) 125doeric_server (void)
134{ 126{
135#ifdef CS_LOGSTATS 127 //TODO: should not be done here, either
136 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 128 for (unsigned i = 0; i < clients.size (); ++i)
137 write_cs_stats (); 129 {
138#endif 130 client *ns = clients [i];
139 131
140 /* Go through the players. Let the loop set the next pl value, 132 ns->tick ();
141 * 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
142 */ 145 */
143 //TODO: must be handled cleanly elsewhere 146 esrv_update_stats (pl);
144 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));
145 { 154 }
146 player *npl = pl->next;
147 155
148 //TODO: must be handled cleanly elsewhere 156 draw_client_map (pl);
149 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)
150 { 197 {
151 save_player (pl->ob, 0); 198 ixsend &ix = ixface.back ();
152 199
153 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 200 if (facedata *d = face_data (ix.idx, faceset))
154 { 201 {
155 terminate_all_pets (pl->ob); 202 if (fxix)
156 pl->ob->remove (); 203 {
204 // 9 bytes is enough for fx_FFFOOO, 40 leaves some room for image data
205 int chunk = min (min (avail - 40, MAXSOCKBUF - 9), ix.ofs);
206
207 if (chunk <= 0)
208 break;
209
210 ix.ofs -= chunk;
211
212 packet sl ("ix");
213
214 sl << ber32 (ix.idx)
215 << ber32 (ix.ofs)
216 << data (d->data.data () + ix.ofs, chunk);
217
218 send_packet (sl);
219 }
220 else
221 {
222 send_image (ix.idx);
223 ix.ofs = 0;
224 }
157 } 225 }
226 else
227 ix.ofs = 0;
158 228
159 leave (pl, 1); 229 int consumed = ol - outputbuffer_len ();
160 final_free_player (pl); 230
231 avail -= consumed;
232 rate_avail -= consumed;
233
234 ol = outputbuffer_len ();
235
236 if (!ix.ofs)
237 {
238 ixface.pop_back ();
239 if (ixface.empty ())
240 break;
241 }
161 } 242 }
162
163 pl = npl;
164 }
165
166 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
167 { 243 }
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: should not be done here, either
188 if (s->status != Ns_Dead && pl)
189 {
190 /* Update the players stats once per tick. More efficient than
191 * sending them whenever they change, and probably just as useful
192 */
193 esrv_update_stats (pl);
194
195 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
196 {
197 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
198 if (pl->last_weight != WEIGHT (pl->ob))
199 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
200 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
201 }
202
203 draw_client_map (pl->ob);
204
205 if (s->update_look)
206 esrv_draw_look (pl->ob);
207 }
208 }
209} 244}
210 245

Diff Legend

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