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.45 by root, Tue Apr 3 00:21:38 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team 5 * Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author 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 34
35#define BG_SCRUB_RATE 4 // how often to send a face in the background
35 36
36#include <global.h> 37#include <global.h>
37#include <sproto.h> 38#include <sproto.h>
38#include <sockproto.h> 39#include <sockproto.h>
39 40
… …
47#include <arpa/inet.h> 48#include <arpa/inet.h>
48 49
49#include <loader.h> 50#include <loader.h>
50 51
51#define MAX_QUEUE_DEPTH 500 //TODO 52#define MAX_QUEUE_DEPTH 500 //TODO
52#define MAX_QUEUE_BACKLOG 5. //TODO 53#define MAX_QUEUE_BACKLOG 3. //TODO
53 54
54void 55void
55client::reset_state () 56client::reset_state ()
56{ 57{
57 if (!pl) 58 if (!pl)
… …
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 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 } 75 }
80 else 76 else
81 { 77 {
82 cmd_queue.push_back (command ()); 78 cmd_queue.push_back (command ());
83 command &cmd = cmd_queue.back (); 79 command &cmd = cmd_queue.back ();
84 cmd.stamp = stamp; 80 cmd.stamp = stamp;
85 cmd.handler = handler; 81 cmd.handler = handler;
86 cmd.data = (char *)salloc (datalen + 1, data); 82 cmd.data = salloc<char> (datalen + 1, data);
87 cmd.datalen = datalen; 83 cmd.datalen = datalen;
88 } 84 }
89} 85}
90 86
91bool 87bool
92client::handle_command () 88client::handle_command ()
93{ 89{
94 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0) 90 bool skipping = false;
95 return false;
96 91
97 if (cmd_queue.empty ()) 92 while (!cmd_queue.empty ()
98 return false; 93 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0))
99 94 {
100 command &cmd = cmd_queue.front (); 95 command &cmd = cmd_queue.front ();
101 96
102 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 97 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
103 { 98 {
99 if (!skipping)
100 {
101 skipping = true;
104 reset_state (); 102 reset_state ();
105 send_packet_printf ("drawinfo %d ignoring delayed command.", NDI_RED); 103 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
106 } 104 }
105
106 cmd_queue.pop_front ();
107 }
107 else 108 else
109 {
108 execute (cmd.handler, cmd.data, cmd.datalen); 110 execute (cmd.handler, cmd.data, cmd.datalen);
109
110 cmd_queue.pop_front (); 111 cmd_queue.pop_front ();
111
112 return true; 112 return true;
113 }
114 }
115
116 return false;
113} 117}
114 118
115void 119void
116flush_sockets (void) 120flush_sockets (void)
117{ 121{
118 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 122 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
119 if ((*i)->status != Ns_Dead)
120 (*i)->flush (); 123 (*i)->flush ();
121} 124}
122 125
123/** 126/**
124 * This checks the sockets for input, does the right thing. 127 * This checks the sockets for input, does the right thing.
125 * 128 *
… …
133#ifdef CS_LOGSTATS 136#ifdef CS_LOGSTATS
134 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 137 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
135 write_cs_stats (); 138 write_cs_stats ();
136#endif 139#endif
137 140
138 /* Go through the players. Let the loop set the next pl value, 141 //TODO: should not be done here, either
139 * since we may remove some 142 for (unsigned i = 0; i < clients.size (); ++i)
143 {
144 client *ns = clients [i];
145
146 ns->tick ();
147 ns->refcnt_chk ();
148 }
149}
150
151void
152client::tick ()
153{
154 if (!pl || destroyed ())
155 return;
156
157 /* Update the players stats once per tick. More efficient than
158 * sending them whenever they change, and probably just as useful
140 */ 159 */
141 //TODO: must be handled cleanly elsewhere 160 esrv_update_stats (pl);
142 for (player *pl = first_player; pl; ) 161
162 if (last_weight != -1 && last_weight != WEIGHT (pl->ob))
163 {
164 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
165 if (last_weight != WEIGHT (pl->ob))
166 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
167 (unsigned long) last_weight, WEIGHT (pl->ob));
143 { 168 }
144 player *npl = pl->next;
145 169
146 //TODO: must be handled cleanly elsewhere 170 draw_client_map (pl->ob);
147 if (!pl->socket || pl->socket->status == Ns_Dead) 171
172 if (update_look)
173 esrv_draw_look (pl->ob);
174
175 if (partial_face_ofs)
176 {
177 }
178
179 if (partial_face_ofs)
180 {
181 // one hell of a big thing that must be
182 }
183 else if (askface.empty ())
184 {
185 // regularly send a new face when queue is empty
186 if (bg_scrub && !--bg_scrub && enable_bg_scrub)
187 while (scrub_idx < faces.size () - 1)
188 {
189 ++scrub_idx;
190 if (!faces_sent [scrub_idx])
191 {
192 send_face (scrub_idx);
193 flush_fx ();
194
195 bg_scrub = 1; // send up to one face per tick, unless an image was requested
196 break;
197 }
198 }
199
200 rate_avail = max_rate - outputbuffer_len ();
201 }
202 else
203 {
204 int ol = outputbuffer_len ();
205
206 rate_avail = min (max_rate, rate_avail + max_rate);
207 rate_avail -= ol;
208
209 int avail = rate_avail;
210
211 // if we can split images, transfer up to mss packets if possible
212 if (fxix) avail += mss - (ol % mss);
213
214 while (!askface.empty () && avail > 0)
148 { 215 {
149 save_player (pl->ob, 0); 216 // use a lifo to send most recently requested images
217 faceidx facenum = askface.back ();
218 askface.pop_back ();
150 219
151 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 220 if (fxix && 0)
152 { 221 {
153 terminate_all_pets (pl->ob);
154 pl->ob->remove ();
155 } 222 }
223 else
224 send_image (facenum);
156 225
157 leave (pl, 1); 226 int consumed = ol - outputbuffer_len ();
158 final_free_player (pl); 227 avail -= consumed;
228 rate_avail -= consumed;
229
230 bg_scrub = BG_SCRUB_RATE;
159 } 231 }
160
161 pl = npl;
162 }
163
164 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
165 { 232 }
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} 233}
211 234

Diff Legend

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