Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Cleaned socket.c to use flag.server when detecting inter-server connections.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12147 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2008-01-29 11:04:21 +00:00
parent 6eec5a3eb7
commit 96dfe6b827
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/socket.c
View File

@ -575,17 +575,9 @@ int realloc_writefifo(int fd, size_t addition)
while( session[fd]->wdata_size + addition > newsize ) newsize += newsize;
}
else
if( session[fd]->max_wdata >= FIFOSIZE_SERVERLINK)
{
//Inter-server adjust. [Skotlex]
if ((session[fd]->wdata_size+addition)*4 < session[fd]->max_wdata)
newsize = session[fd]->max_wdata / 2;
else
return 0; //No change
}
else
if( session[fd]->max_wdata > WFIFO_SIZE && (session[fd]->wdata_size+addition)*4 < session[fd]->max_wdata )
{ // shrink rule, shrink by 2 when only a quater of the fifo is used, don't shrink below 4*addition
if( session[fd]->max_wdata >= 2*(session[fd]->flag.server?FIFOSIZE_SERVERLINK:WFIFO_SIZE)
&& (session[fd]->wdata_size+addition)*4 < session[fd]->max_wdata )
{ // shrink rule, shrink by 2 when only a quarter of the fifo is used, don't shrink below nominal size.
newsize = session[fd]->max_wdata / 2;
}
else // no change
@ -648,13 +640,12 @@ int WFIFOSET(int fd, size_t len)
s->wdata_size += len;
//If the interserver has 200% of its normal size full, flush the data.
if(s->max_wdata >= FIFOSIZE_SERVERLINK &&
s->wdata_size >= 2*FIFOSIZE_SERVERLINK)
if( s->flag.server && s->wdata_size >= 2*FIFOSIZE_SERVERLINK )
flush_fifo(fd);
// always keep a WFIFO_SIZE reserve in the buffer
// For inter-server connections, let the reserve be 1/4th of the link size.
newreserve = s->wdata_size + (s->max_wdata >= FIFOSIZE_SERVERLINK ? FIFOSIZE_SERVERLINK / 4 : WFIFO_SIZE);
newreserve = s->wdata_size + ( s->flag.server ? FIFOSIZE_SERVERLINK / 4 : WFIFO_SIZE);
// readjust the buffer to the newly chosen size
realloc_writefifo(fd, newreserve);