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.41 by root, Wed Mar 14 15:44:47 2007 UTC vs.
Revision 1.44 by root, Mon Apr 2 19:56:11 2007 UTC

30 * 30 *
31 * loop.c mainly deals with initialization and higher level socket 31 * loop.c mainly deals with initialization and higher level socket
32 * maintanance (checking for lost connections and if data has arrived.) 32 * maintanance (checking for lost connections and if data has arrived.)
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
138#endif 139#endif
139 140
140 //TODO: should not be done here, either 141 //TODO: should not be done here, either
141 for (unsigned i = 0; i < clients.size (); ++i) 142 for (unsigned i = 0; i < clients.size (); ++i)
142 { 143 {
143 client *s = clients [i]; 144 client *ns = clients [i];
144 player *pl = s->pl;
145 145
146 if (pl && pl->ns && !pl->ns->destroyed ()) 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
159 */
160 esrv_update_stats (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));
168 }
169
170 draw_client_map (pl->ob);
171
172 if (update_look)
173 esrv_draw_look (pl->ob);
174
175 if (askface.empty ())
176 {
177 // regularly send a new face when queue is empty
178 if (bg_scrub && !--bg_scrub && enable_bg_scrub)
179 while (scrub_idx < faces.size () - 1)
180 {
181 ++scrub_idx;
182 if (!faces_sent [scrub_idx])
183 {
184 send_face (scrub_idx);
185 bg_scrub = 1; // send up to one face per tick, unless an image was requested
186 break;
187 }
188 }
189
190 rate_avail = max_rate - outputbuffer_len ();
191 }
192 else
193 {
194 int ol = outputbuffer_len ();
195
196 rate_avail = min (max_rate, rate_avail + max_rate);
197 rate_avail -= ol;
198
199 int avail = rate_avail;
200
201 // if we can split images, transfer up to mss packets if possible
202 if (fxix) avail += mss - (ol % mss);
203
204 fprintf (stderr, "ra %6d a %6d ", rate_avail, avail);
205
206 while (!askface.empty () && avail > 0)
147 { 207 {
148 client *ns = pl->ns;
149
150 /* Update the players stats once per tick. More efficient than
151 * sending them whenever they change, and probably just as useful
152 */
153 esrv_update_stats (pl);
154
155 if (ns->last_weight != -1 && ns->last_weight != WEIGHT (pl->ob))
156 {
157 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
158 if (ns->last_weight != WEIGHT (pl->ob))
159 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
160 (unsigned long) ns->last_weight, WEIGHT (pl->ob));
161 }
162
163 draw_client_map (pl->ob);
164
165 if (s->update_look)
166 esrv_draw_look (pl->ob);
167
168 while (!ns->askface.empty () && ns->outputbuffer_len () < ns->max_rate)
169 {
170 // use a lifo to send most recently requested images 208 // use a lifo to send most recently requested images
171 faceidx face = ns->askface.back (); 209 faceidx face = askface.back ();
172 ns->askface.pop_back (); 210 askface.pop_back ();
173 211
174 ns->send_image (face); 212 send_image (face);
175 } 213
214 bg_scrub = BG_SCRUB_RATE;
215
216 int consumed = ol - outputbuffer_len ();
217 avail -= consumed;
218 rate_avail -= consumed;
176 } 219 }
177 220
178 s->refcnt_chk (); 221 fprintf (stderr, "ra %6d a %6d\n", rate_avail, avail);
179 }
180}
181 222
223 }
224}
225

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines