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.38 by root, Sun Jan 14 21:20:51 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
… …
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 35
36#include <global.h> 36#include <global.h>
37#include <sproto.h> 37#include <sproto.h>
… …
47#include <arpa/inet.h> 47#include <arpa/inet.h>
48 48
49#include <loader.h> 49#include <loader.h>
50 50
51#define MAX_QUEUE_DEPTH 500 //TODO 51#define MAX_QUEUE_DEPTH 500 //TODO
52#define MAX_QUEUE_BACKLOG 2 //TODO 52#define MAX_QUEUE_BACKLOG 3. //TODO
53 53
54void 54void
55client::reset_state () 55client::reset_state ()
56{ 56{
57 if (!pl) 57 if (!pl)
… …
70 { 70 {
71 //TODO: just disconnect here? 71 //TODO: just disconnect here?
72 reset_state (); 72 reset_state ();
73 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED); 73 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
74 } 74 }
75 else if (!cmd_queue.empty () && cmd_queue.front ().stamp + MAX_QUEUE_BACKLOG < stamp) 75 else
76 { 76 {
77 reset_state (); 77 cmd_queue.push_back (command ());
78 send_packet_printf ("drawinfo %d too many commands in queue, ignoring.", NDI_RED); 78 command &cmd = cmd_queue.back ();
79 cmd.stamp = stamp;
80 cmd.handler = handler;
81 cmd.data = salloc<char> (datalen + 1, data);
82 cmd.datalen = datalen;
79 } 83 }
80 else
81 cmd_queue.push_back (command (
82 stamp, handler, (char *)salloc (datalen + 1, data), datalen
83 ));
84} 84}
85 85
86bool 86bool
87client::handle_command () 87client::handle_command ()
88{ 88{
89 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0) 89 bool skipping = false;
90 return false;
91 90
92 if (cmd_queue.empty ()) 91 while (!cmd_queue.empty ()
93 return false; 92 && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0))
93 {
94 command &cmd = cmd_queue.front ();
94 95
95 command &cmd = cmd_queue.front (); 96 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
97 {
98 if (!skipping)
99 {
100 skipping = true;
101 reset_state ();
102 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
103 }
96 104
97 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) 105 cmd_queue.pop_front ();
98 { 106 }
99 reset_state (); 107 else
100 send_packet_printf ("drawinfo %d ignoring delayed command.", NDI_RED); 108 {
109 execute (cmd.handler, cmd.data, cmd.datalen);
110 cmd_queue.pop_front ();
111 return true;
112 }
101 } 113 }
102 else
103 execute (cmd.handler, cmd.data, cmd.datalen);
104 114
105 sfree (cmd.data, cmd.datalen);
106 cmd_queue.pop_front ();
107
108 return true; 115 return false;
109} 116}
110 117
111void 118void
112flush_sockets (void) 119flush_sockets (void)
113{ 120{
114 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 121 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
115 if ((*i)->status != Ns_Dead)
116 (*i)->flush (); 122 (*i)->flush ();
117} 123}
118 124
119/** 125/**
120 * This checks the sockets for input, does the right thing. 126 * This checks the sockets for input, does the right thing.
121 * 127 *
… …
129#ifdef CS_LOGSTATS 135#ifdef CS_LOGSTATS
130 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 136 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
131 write_cs_stats (); 137 write_cs_stats ();
132#endif 138#endif
133 139
134 /* Go through the players. Let the loop set the next pl value, 140 //TODO: should not be done here, either
135 * since we may remove some 141 for (int i = 0; i < clients.size (); ++i)
136 */
137 //TODO: must be handled cleanly elsewhere
138 for (player *pl = first_player; pl; )
139 { 142 {
140 player *npl = pl->next;
141
142 //TODO: must be handled cleanly elsewhere
143 if (!pl->socket || pl->socket->status == Ns_Dead)
144 {
145 save_player (pl->ob, 0);
146
147 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
148 {
149 terminate_all_pets (pl->ob);
150 pl->ob->remove ();
151 }
152
153 leave (pl, 1);
154 final_free_player (pl);
155 }
156
157 pl = npl;
158 }
159
160 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
161 {
162 client *s = *i; 143 client *s = clients [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; 144 player *pl = s->pl;
180 145
181 s->handle_packet (); 146 if (pl && pl->ns && !pl->ns->destroyed ())
182 s->handle_command (); 147 {
148 client *ns = pl->ns;
183 149
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 150 /* Update the players stats once per tick. More efficient than
188 * sending them whenever they change, and probably just as useful 151 * sending them whenever they change, and probably just as useful
189 */ 152 */
190 esrv_update_stats (pl); 153 esrv_update_stats (pl);
191 154
192 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) 155 if (ns->last_weight != -1 && ns->last_weight != WEIGHT (pl->ob))
193 { 156 {
194 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 157 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
195 if (pl->last_weight != WEIGHT (pl->ob)) 158 if (ns->last_weight != WEIGHT (pl->ob))
196 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", 159 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)); 160 (unsigned long) ns->last_weight, WEIGHT (pl->ob));
198 } 161 }
199 162
200 draw_client_map (pl->ob); 163 draw_client_map (pl->ob);
201 164
202 if (s->update_look) 165 if (s->update_look)
203 esrv_draw_look (pl->ob); 166 esrv_draw_look (pl->ob);
204 } 167 }
168
169 s->refcnt_chk ();
205 } 170 }
206} 171}
207 172

Diff Legend

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