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

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.54 by root, Sun Jul 1 04:08:14 2007 UTC vs.
Revision 1.64 by root, Sat Jul 28 00:45:05 2007 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.	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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 it	8	* Crossfire TRT is free software: you can redistribute it and/or modify
9	* under the terms of the GNU General Public License as published by the Free	9	* it under the terms of the GNU General Public License as published by
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* the Free Software Foundation, either version 3 of the License, or
11	* 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, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* 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 along	18	* You should have received a copy of the GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	20	*
22	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/**	24	/**
157	draw_client_map (pl);	156	draw_client_map (pl);
158		157
159	if (update_look)	158	if (update_look)
160	esrv_draw_look (pl);	159	esrv_draw_look (pl);
161		160
		161	bool overload = false;
		162
		163	#if HAVE_TCP_INFO
		164	// do bandwidth checking
		165	if (tcpi.tcpi_unacked + 1 > max (4, tcpi.tcpi_snd_cwnd))
		166	{
		167	overload = true;
		168	if (next_rate_adjust <= NOW)
		169	{
		170	next_rate_adjust = NOW + 2;
		171	max_rate = max (max_rate >> 1, int (5000 * TICK));
		172	LOG (llevDebug, "tcp %s overloaded (%d + 1 > 4 \| %d), rate now %d\n",
		173	host, (int)tcpi.tcpi_unacked, (int)tcpi.tcpi_snd_cwnd, int (max_rate / TICK));//D
		174	send_packet_printf ("drawinfo %d Due to possible network congestion, your output-rate has been reduced to %dbps.",
		175	NDI_RED, int (max_rate / TICK));
		176	}
		177	}
		178	#endif
		179
		180	if (!overload)
		181	{
162	if (ixface.empty ())	182	if (ixface.empty ())
163	{	183	{
164	// regularly send a new face when queue is empty	184	// regularly send a new face when queue is empty
165	if (bg_scrub && !--bg_scrub && enable_bg_scrub)	185	if (bg_scrub && !--bg_scrub && enable_bg_scrub)
166	while (scrub_idx < faces.size () - 1)	186	while (scrub_idx < faces.size () - 1)
167	{
168	++scrub_idx;
169
170	if (!faces_sent [scrub_idx])
171	{	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	{
172	send_face (scrub_idx);	194	send_face (scrub_idx, -120);
173	flush_fx ();	195	flush_fx ();
174		196
175	bg_scrub = 1; // send up to one face per tick, unless an image was requested	197	bg_scrub = 1; // send up to one face per tick, unless an image was requested
176	break;	198	break;
		199	}
177	}	200	}
178	}
179		201
180	rate_avail = max_rate - outputbuffer_len ();	202	rate_avail = max_rate - outputbuffer_len ();
181	}	203	}
182	else	204	else
183	{	205	{
184	int ol = outputbuffer_len ();	206	int ol = outputbuffer_len ();
185		207
186	rate_avail = min (max_rate, rate_avail + max_rate);	208	rate_avail = min (max_rate, rate_avail + max_rate);
187	rate_avail -= ol;	209	rate_avail -= ol;
188		210
189	int avail = rate_avail;	211	int avail = rate_avail;
190		212
191	// if we can split images, transfer up to mss-sized packets if possible	213	// if we can split images, transfer up to mss-sized packets if possible
192	// but never 768 bytes more.	214	// but never 768 bytes more.
193	if (fxix) avail += min (768, mss - (ol % mss));	215	if (fxix) avail += min (768, mss - (ol % mss));
194		216
195	bg_scrub = BG_SCRUB_RATE;	217	bg_scrub = BG_SCRUB_RATE;
196		218
197	while (avail > 0)	219	while (avail > 0)
198	{
199	ixsend &ix = ixface.back ();
200
201	if (facedata *d = face_data (ix.idx, faceset))
202	{	220	{
203	if (fxix)	221	ixsend &ix = ixface.back ();
		222
		223	if (facedata *d = face_data (ix.idx, faceset))
204	{	224	{
205	// 9 bytes is enough for fx_FFFOOO, 40 leaves some room for image data	225	if (fxix)
		226	{
		227	// only transfer something if the amount of data transferred
		228	// has a healthy relation to the header overhead
		229	if (avail <= 40)
		230	break;
		231
		232	// 9 bytes is enough for fx_FFFOOO
206	int chunk = min (min (avail - 40, MAXSOCKBUF - 9), ix.ofs);	233	int chunk = min (min (avail, MAXSOCKBUF - 9), (int)ix.ofs);
207		234
208	if (chunk <= 0)	235	if (chunk <= 0)
209	break;	236	break;
210		237
211	ix.ofs -= chunk;	238	ix.ofs -= chunk;
212		239
		240	//fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
		241
213	packet sl ("ix");	242	packet sl ("ix");
214		243
215	sl << ber32 (ix.idx)	244	sl << ber32 (ix.idx)
216	<< ber32 (ix.ofs)	245	<< ber32 (ix.ofs)
217	<< data (d->data.data () + ix.ofs, chunk);	246	<< data (d->data.data () + ix.ofs, chunk);
218		247
219	send_packet (sl);	248	send_packet (sl);
		249	}
		250	else
		251	{
		252	send_image (ix.idx);
		253	ix.ofs = 0;
		254	}
220	}	255	}
221	else	256	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)
222	{	267	{
223	send_image (ix.idx);	268	ixface.pop_back ();
224	ix.ofs = 0;	269
		270	if (ixface.empty ())
		271	break;
225	}	272	}
226	}	273	}
227	else
228	ix.ofs = 0;
229
230	int consumed = ol - outputbuffer_len ();
231
232	avail -= consumed;
233	rate_avail -= consumed;
234
235	ol = outputbuffer_len ();
236
237	if (!ix.ofs)
238	{
239	ixface.pop_back ();
240	if (ixface.empty ())
241	break;
242	}	274	}
243	}
244	}	275	}
245	}	276	}
246		277

Diff Legend

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

Comparing deliantra/server/socket/loop.C (file contents): Revision 1.54 by root, Sun Jul 1 04:08:14 2007 UTC vs. Revision 1.64 by root, Sat Jul 28 00:45:05 2007 UTC

Diff Legend

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.54 by root, Sun Jul 1 04:08:14 2007 UTC vs.
Revision 1.64 by root, Sat Jul 28 00:45:05 2007 UTC