[ViewVC] Diff of: cvs/deliantra/server/socket/loop.C

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.64 by root, Sat Jul 28 00:45:05 2007 UTC vs.
Revision 1.71 by root, Sun Jan 13 12:39:29 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team	5	* Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* 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
10	* the Free Software Foundation, either version 3 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* 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,
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* 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
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/**	24	/**
25	* \file	25	* \file
26	* Main client/server loops.	26	* Main client/server loops.
…		…
46		46
47	#include <loader.h>	47	#include <loader.h>
48		48
49	#define BG_SCRUB_RATE 4 // how often to send a face in the background	49	#define BG_SCRUB_RATE 4 // how often to send a face in the background
50		50
51	#define MAX_QUEUE_DEPTH 500	51	#define MAX_QUEUE_DEPTH 50
52	#define MAX_QUEUE_BACKLOG 3.	52	#define MAX_QUEUE_BACKLOG 3.
		53
		54	// disconnect a socket after this many seconds without an ack
		55	#define SOCKET_TIMEOUT 8.
53		56
54	void	57	void
55	client::reset_state ()	58	client::reset_state ()
56	{	59	{
57	if (!pl)	60	if (!pl)
…		…
72	reset_state ();	75	reset_state ();
73	send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);	76	send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
74	}	77	}
75	else	78	else
76	{	79	{
77	cmd_queue.push_back (command ());	80	cmd_queue.resize (cmd_queue.size () + 1);
78	command &cmd = cmd_queue.back ();	81	command &cmd = cmd_queue.back ();
79	cmd.stamp = stamp;	82	cmd.stamp = stamp;
80	cmd.handler = handler;	83	cmd.handler = handler;
81	cmd.data = salloc<char> (datalen + 1, data);	84	cmd.data = salloc<char> (datalen + 1, data);
82	cmd.datalen = datalen;	85	cmd.datalen = datalen;
…		…
98	send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);	101	send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
99	}	102	}
100	else	103	else
101	execute (cmd.handler, cmd.data, cmd.datalen);	104	execute (cmd.handler, cmd.data, cmd.datalen);
102		105
		106	sfree<char> (cmd.data, cmd.datalen + 1);
103	cmd_queue.pop_front ();	107	cmd_queue.pop_front ();
104	return true;	108	return true;
105	}	109	}
106	else	110	else
107	return false;	111	return false;
108	}
109
110	void
111	flush_sockets (void)
112	{
113	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
114	(*i)->flush ();
115	}
116
117	/**
118	* This checks the sockets for input, does the right thing.
119	*
120	* A bit of this code is grabbed out of socket.c
121	* There are 2 lists we need to look through - init_sockets is a list
122	*
123	*/
124	void
125	doeric_server (void)
126	{
127	//TODO: should not be done here, either
128	for (unsigned i = 0; i < clients.size (); ++i)
129	{
130	client *ns = clients [i];
131
132	ns->tick ();
133	ns->refcnt_chk ();
134	}
135	}	112	}
136		113
137	void	114	void
138	client::tick ()	115	client::tick ()
139	{	116	{
…		…
156	draw_client_map (pl);	133	draw_client_map (pl);
157		134
158	if (update_look)	135	if (update_look)
159	esrv_draw_look (pl);	136	esrv_draw_look (pl);
160		137
161	bool overload = false;	138	mapinfo_queue_run ();
162		139
163	#if HAVE_TCP_INFO	140	#if HAVE_TCP_INFO
164	// do bandwidth checking	141	// check time of last ack, and, if too old, kill connection
165	if (tcpi.tcpi_unacked + 1 > max (4, tcpi.tcpi_snd_cwnd))	142	socklen_t len = sizeof (tcpi);
		143
		144	if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
166	{	145	{
167	overload = true;	146	if (tcpi.tcpi_snd_mss)
168	if (next_rate_adjust <= NOW)	147	mss = tcpi.tcpi_snd_mss;
		148
		149	#if 0
		150	fprintf (stderr, "uack %d ack %d lost %d ret %d fack %d sst %d cwnd %d mss %d pmtu %d advmss %d EXC %d\n",
		151	tcpi.tcpi_unacked,
		152	tcpi.tcpi_sacked,
		153	tcpi.tcpi_lost,
		154	tcpi.tcpi_retrans,
		155	tcpi.tcpi_fackets,
		156	tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss,
		157
		158	tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
		159	#endif
		160
		161	// fast-time-out a player by checking for missign acks
		162	// do this only when player is active
		163	if (pl && pl->active
		164	&& tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
169	{	165	{
170	next_rate_adjust = NOW + 2;	166	send_msg (NDI_RED \| NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
171	max_rate = max (max_rate >> 1, int (5000 * TICK));	167	write_outputbuffer ();
172	LOG (llevDebug, "tcp %s overloaded (%d + 1 > 4 \| %d), rate now %d\n",	168
173	host, (int)tcpi.tcpi_unacked, (int)tcpi.tcpi_snd_cwnd, int (max_rate / TICK));//D	169	LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
174	send_packet_printf ("drawinfo %d Due to possible network congestion, your output-rate has been reduced to %dbps.",	170	(unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked);
175	NDI_RED, int (max_rate / TICK));	171	destroy ();
176	}	172	}
177	}	173	}
178	#endif	174	#endif
179		175
180	if (!overload)	176	rate_avail = min (max_rate + mss, rate_avail + max_rate);
181	{	177
		178	int max_send = rate_avail;
		179
		180	#if HAVE_TCP_INFO
		181	// further restrict the available bandwidth by the excess bandwidth available
		182	max_send = min (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss);
		183	#endif
		184
		185	// if we can split images, round to next-lowest mss
		186	if (fxix) max_send -= max_send % mss;
		187
182	if (ixface.empty ())	188	if (ixface.empty ())
		189	{
		190	// regularly send a new face when queue is empty
		191	if (bg_scrub && !--bg_scrub && enable_bg_scrub)
		192	while (scrub_idx < faces.size () - 1)
		193	{
		194	++scrub_idx;
		195
		196	if (!faces_sent [scrub_idx])
		197	if (faceinfo *f = face_info (scrub_idx))
		198	if (f->type == FT_FACE \|\| f->type == FT_SOUND) // only scrub faces and sounds for now
		199	{
		200	send_face (scrub_idx, -120);
		201	flush_fx ();
		202
		203	bg_scrub = 1; // send up to one fx per tick, unless an image was requested
		204	break;
		205	}
		206	}
		207	}
		208	else
		209	{
		210	bg_scrub = BG_SCRUB_RATE;
		211
		212	for (;;)
183	{	213	{
184	// regularly send a new face when queue is empty
185	if (bg_scrub && !--bg_scrub && enable_bg_scrub)
186	while (scrub_idx < faces.size () - 1)
187	{
188	++scrub_idx;
189
190	if (!faces_sent [scrub_idx])
191	if (faceinfo *f = face_info (scrub_idx))
192	if (f->type == FT_FACE) // only scrub faces for now
193	{
194	send_face (scrub_idx, -120);
195	flush_fx ();
196
197	bg_scrub = 1; // send up to one face per tick, unless an image was requested
198	break;
199	}
200	}
201
202	rate_avail = max_rate - outputbuffer_len ();	214	int avail = max_send - outputbuffer_len ();
203	}
204	else
205	{
206	int ol = outputbuffer_len ();
207		215
208	rate_avail = min (max_rate, rate_avail + max_rate);
209	rate_avail -= ol;
210
211	int avail = rate_avail;
212
213	// if we can split images, transfer up to mss-sized packets if possible
214	// but never 768 bytes more.
215	if (fxix) avail += min (768, mss - (ol % mss));
216
217	bg_scrub = BG_SCRUB_RATE;
218
219	while (avail > 0)	216	if (avail <= 0)
		217	break;
		218
		219	ixsend &ix = ixface.back ();
		220
		221	if (facedata *d = face_data (ix.idx, faceset))
220	{	222	{
221	ixsend &ix = ixface.back ();	223	if (fxix)
222
223	if (facedata *d = face_data (ix.idx, faceset))
224	{	224	{
225	if (fxix)	225	// estimate the packet header overhead "ix " + idx + (new)ofs
226	{	226	int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
		227	int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
		228
227	// only transfer something if the amount of data transferred	229	// only transfer something if the amount of data transferred
228	// has a healthy relation to the header overhead	230	// has a healthy relation to the header overhead
229	if (avail <= 40)	231	if (chunk < 64)
230	break;	232	break;
231		233
232	// 9 bytes is enough for fx_FFFOOO	234	chunk = min (chunk, (int)ix.ofs);
233	int chunk = min (min (avail, MAXSOCKBUF - 9), (int)ix.ofs);
234		235
235	if (chunk <= 0)
236	break;
237
238	ix.ofs -= chunk;	236	ix.ofs -= chunk;
239		237
240	//fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D	238	//fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
241		239
242	packet sl ("ix");	240	packet sl ("ix");
243		241
244	sl << ber32 (ix.idx)	242	sl << ber32 (ix.idx)
245	<< ber32 (ix.ofs)	243	<< ber32 (ix.ofs)
246	<< data (d->data.data () + ix.ofs, chunk);	244	<< data (d->data.data () + ix.ofs, chunk);
247		245
248	send_packet (sl);	246	send_packet (sl);
249	}
250	else
251	{
252	send_image (ix.idx);
253	ix.ofs = 0;
254	}
255	}	247	}
256	else	248	else
257	ix.ofs = 0;
258
259	int consumed = outputbuffer_len () - ol;
260
261	avail -= consumed;
262	rate_avail -= consumed;
263
264	ol = outputbuffer_len ();
265
266	if (!ix.ofs)
267	{	249	{
268	ixface.pop_back ();	250	send_image (ix.idx);
269		251	ix.ofs = 0;
270	if (ixface.empty ())
271	break;
272	}	252	}
273	}	253	}
		254	else
		255	ix.ofs = 0;
		256
		257	if (!ix.ofs)
		258	{
		259	ixface.pop_back ();
		260
		261	if (ixface.empty ())
		262	break;
		263	}
274	}	264	}
275	}	265	}
276	}
277		266
		267	rate_avail -= outputbuffer_len ();
		268	}
		269
		270	void
		271	client::flush_sockets (void)
		272	{
		273	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
		274	(*i)->flush ();
		275	}
		276
		277	void
		278	client::clock (void)
		279	{
		280	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
		281	(*i)->tick ();
		282
		283	// give them all the same chances
		284	flush_sockets ();
		285
		286	//TODO: should not be done here, either
		287	for (unsigned i = 0; i < clients.size (); ++i)
		288	clients[i]->refcnt_chk ();
		289	}
		290

Diff Legend

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

Comparing deliantra/server/socket/loop.C (file contents): Revision 1.64 by root, Sat Jul 28 00:45:05 2007 UTC vs. Revision 1.71 by root, Sun Jan 13 12:39:29 2008 UTC

Diff Legend

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.64 by root, Sat Jul 28 00:45:05 2007 UTC vs.
Revision 1.71 by root, Sun Jan 13 12:39:29 2008 UTC