mirror of
https://github.com/transmission/transmission
synced 2025-02-02 20:43:51 +00:00
(trunk libT) remove dead code
This commit is contained in:
Charles Kerr
parent
4723b4a6e4
commit
5917436e60
1 changed files with 44 additions and 106 deletions
|
|
@ -62,7 +62,7 @@
|
|||
#include "fdlimit.h"
|
||||
#include "list.h"
|
||||
#include "net.h"
|
||||
#include "platform.h" /* tr_lock */
|
||||
#include "platform.h" /* MAX_PATH_LENGTH, TR_PATH_DELIMITER */
|
||||
#include "utils.h"
|
||||
|
||||
#define dbgmsg( ... ) \
|
||||
|
|
@ -95,11 +95,8 @@ struct tr_fd_s
|
|||
{
|
||||
int socketCount;
|
||||
int socketLimit;
|
||||
|
||||
struct tr_openfile * openFiles;
|
||||
int openFileLimit;
|
||||
|
||||
tr_lock * lock;
|
||||
struct tr_openfile * openFiles;
|
||||
};
|
||||
|
||||
static struct tr_fd_s * gFd = NULL;
|
||||
|
|
@ -291,12 +288,12 @@ TrOpenFile( int i,
|
|||
int flags;
|
||||
char * filename;
|
||||
struct stat sb;
|
||||
int alreadyExisted;
|
||||
tr_bool alreadyExisted;
|
||||
|
||||
/* confirm the parent folder exists */
|
||||
if( stat( folder, &sb ) || !S_ISDIR( sb.st_mode ) )
|
||||
{
|
||||
tr_err( _( "Couldn't create \"%1$s\": parent folder \"%2$s\" does not exist" ), torrentFile, folder );
|
||||
tr_err( _( "Couldn't create \"%1$s\": \"%2$s\" is not a folder" ), torrentFile, folder );
|
||||
return ENOENT;
|
||||
}
|
||||
|
||||
|
|
@ -354,6 +351,9 @@ TrOpenFile( int i,
|
|||
preallocateFileSparse( file->fd, desiredFileSize );
|
||||
|
||||
#ifdef HAVE_POSIX_FADVISE
|
||||
/* this doubles the OS level readahead buffer, which in practice
|
||||
* turns out to be a good thing, because many (most?) clients request
|
||||
* chunks of blocks in order */
|
||||
posix_fadvise( file->fd, 0, 0, POSIX_FADV_SEQUENTIAL );
|
||||
#endif
|
||||
|
||||
|
|
@ -361,24 +361,21 @@ TrOpenFile( int i,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
static TR_INLINE tr_bool
|
||||
fileIsOpen( const struct tr_openfile * o )
|
||||
{
|
||||
return o->fd >= 0;
|
||||
}
|
||||
|
||||
static void
|
||||
TrCloseFile( int i )
|
||||
TrCloseFile( struct tr_openfile * o )
|
||||
{
|
||||
struct tr_openfile * o = &gFd->openFiles[i];
|
||||
|
||||
assert( i >= 0 );
|
||||
assert( i < gFd->openFileLimit );
|
||||
assert( o != NULL );
|
||||
assert( fileIsOpen( o ) );
|
||||
|
||||
tr_close_file( o->fd );
|
||||
o->fd = -1;
|
||||
o->isCheckedOut = 0;
|
||||
o->isCheckedOut = FALSE;
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
@ -403,13 +400,11 @@ tr_fdFileCheckout( int torrentId,
|
|||
assert( torrentId > 0 );
|
||||
assert( folder && *folder );
|
||||
assert( torrentFile && *torrentFile );
|
||||
assert( doWrite == 0 || doWrite == 1 );
|
||||
assert( tr_isBool( doWrite ) );
|
||||
|
||||
tr_snprintf( filename, sizeof( filename ), "%s%c%s", folder, TR_PATH_DELIMITER, torrentFile );
|
||||
dbgmsg( "looking for file '%s', writable %c", filename, doWrite ? 'y' : 'n' );
|
||||
|
||||
tr_lockLock( gFd->lock );
|
||||
|
||||
/* is it already open? */
|
||||
for( i=0; i<gFd->openFileLimit; ++i )
|
||||
{
|
||||
|
|
@ -422,20 +417,12 @@ tr_fdFileCheckout( int torrentId,
|
|||
if( strcmp( filename, o->filename ) )
|
||||
continue;
|
||||
|
||||
if( fileIsCheckedOut( o ) )
|
||||
{
|
||||
dbgmsg( "found it! it's open, but checked out. waiting..." );
|
||||
tr_lockUnlock( gFd->lock );
|
||||
tr_wait( 200 );
|
||||
tr_lockLock( gFd->lock );
|
||||
i = -1; /* reloop */
|
||||
continue;
|
||||
}
|
||||
assert( !fileIsCheckedOut( o ) );
|
||||
|
||||
if( doWrite && !o->isWritable )
|
||||
{
|
||||
dbgmsg( "found it! it's open and available, but isn't writable. closing..." );
|
||||
TrCloseFile( i );
|
||||
TrCloseFile( o );
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -468,22 +455,12 @@ tr_fdFileCheckout( int torrentId,
|
|||
}
|
||||
}
|
||||
|
||||
if( winner >= 0 )
|
||||
assert( winner >= 0 );
|
||||
|
||||
if( fileIsOpen( &gFd->openFiles[winner] ) )
|
||||
{
|
||||
if( fileIsOpen( &gFd->openFiles[winner] ) )
|
||||
{
|
||||
dbgmsg( "closing file '%s', slot #%d",
|
||||
gFd->openFiles[winner].filename,
|
||||
winner );
|
||||
TrCloseFile( winner );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
dbgmsg( "everything's full! waiting for someone else to finish something" );
|
||||
tr_lockUnlock( gFd->lock );
|
||||
tr_wait( 200 );
|
||||
tr_lockLock( gFd->lock );
|
||||
dbgmsg( "closing file \"%s\"", gFd->openFiles[winner].filename );
|
||||
TrCloseFile( &gFd->openFiles[winner] );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -491,9 +468,9 @@ tr_fdFileCheckout( int torrentId,
|
|||
o = &gFd->openFiles[winner];
|
||||
if( !fileIsOpen( o ) )
|
||||
{
|
||||
const int err = TrOpenFile( winner, folder, torrentFile, doWrite, preallocationMode, desiredFileSize );
|
||||
const int err = TrOpenFile( winner, folder, torrentFile, doWrite,
|
||||
preallocationMode, desiredFileSize );
|
||||
if( err ) {
|
||||
tr_lockUnlock( gFd->lock );
|
||||
errno = err;
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -508,81 +485,59 @@ tr_fdFileCheckout( int torrentId,
|
|||
o->torrentId = torrentId;
|
||||
o->isCheckedOut = 1;
|
||||
o->date = tr_date( );
|
||||
tr_lockUnlock( gFd->lock );
|
||||
return o->fd;
|
||||
}
|
||||
|
||||
void
|
||||
tr_fdFileReturn( int fd )
|
||||
{
|
||||
int i;
|
||||
struct tr_openfile * o;
|
||||
const struct tr_openfile * end;
|
||||
|
||||
tr_lockLock( gFd->lock );
|
||||
|
||||
for( i = 0; i < gFd->openFileLimit; ++i )
|
||||
for( o=gFd->openFiles, end=o+gFd->openFileLimit; o!=end; ++o )
|
||||
{
|
||||
struct tr_openfile * o = &gFd->openFiles[i];
|
||||
if( o->fd != fd )
|
||||
continue;
|
||||
|
||||
dbgmsg( "releasing file '%s' in slot #%d", o->filename, i );
|
||||
o->isCheckedOut = 0;
|
||||
|
||||
dbgmsg( "releasing file \"%s\"", o->filename );
|
||||
o->isCheckedOut = FALSE;
|
||||
break;
|
||||
}
|
||||
|
||||
tr_lockUnlock( gFd->lock );
|
||||
}
|
||||
|
||||
void
|
||||
tr_fdFileClose( const char * filename )
|
||||
{
|
||||
int i;
|
||||
tr_lockLock( gFd->lock );
|
||||
struct tr_openfile * o;
|
||||
const struct tr_openfile * end;
|
||||
|
||||
for( i=0; i<gFd->openFileLimit; ++i )
|
||||
for( o=gFd->openFiles, end=o+gFd->openFileLimit; o!=end; ++o )
|
||||
{
|
||||
struct tr_openfile * o = &gFd->openFiles[i];
|
||||
if( !fileIsOpen( o ) || strcmp( filename, o->filename ) )
|
||||
continue;
|
||||
|
||||
dbgmsg( "tr_fdFileClose closing '%s'", filename );
|
||||
|
||||
dbgmsg( "tr_fdFileClose closing \"%s\"", filename );
|
||||
assert( !o->isCheckedOut && "this is a test assertion... I *think* this is always true now" );
|
||||
|
||||
TrCloseFile( i );
|
||||
TrCloseFile( o );
|
||||
}
|
||||
|
||||
tr_lockUnlock( gFd->lock );
|
||||
}
|
||||
|
||||
void
|
||||
tr_fdTorrentClose( int torrentId )
|
||||
{
|
||||
int i;
|
||||
tr_lockLock( gFd->lock );
|
||||
|
||||
for( i=0; i<gFd->openFileLimit; ++i )
|
||||
{
|
||||
struct tr_openfile * o = &gFd->openFiles[i];
|
||||
|
||||
assert( !o->isCheckedOut && "this is a test assertion... I *think* this is always true now" );
|
||||
struct tr_openfile * o;
|
||||
const struct tr_openfile * end;
|
||||
|
||||
for( o=gFd->openFiles, end=o+gFd->openFileLimit; o!=end; ++o )
|
||||
if( fileIsOpen( o ) && o->torrentId == torrentId )
|
||||
TrCloseFile( i );
|
||||
}
|
||||
|
||||
tr_lockUnlock( gFd->lock );
|
||||
TrCloseFile( o );
|
||||
}
|
||||
|
||||
|
||||
/***
|
||||
****
|
||||
**** Sockets
|
||||
****
|
||||
***/
|
||||
|
||||
static int
|
||||
static TR_INLINE int
|
||||
getSocketMax( struct tr_fd_s * gFd )
|
||||
{
|
||||
return gFd->socketLimit;
|
||||
|
|
@ -593,8 +548,6 @@ tr_fdSocketCreate( int domain, int type )
|
|||
{
|
||||
int s = -1;
|
||||
|
||||
tr_lockLock( gFd->lock );
|
||||
|
||||
if( gFd->socketCount < getSocketMax( gFd ) )
|
||||
if( ( s = socket( domain, type, 0 ) ) < 0 )
|
||||
{
|
||||
|
|
@ -611,7 +564,6 @@ tr_fdSocketCreate( int domain, int type )
|
|||
|
||||
assert( gFd->socketCount >= 0 );
|
||||
|
||||
tr_lockUnlock( gFd->lock );
|
||||
return s;
|
||||
}
|
||||
|
||||
|
|
@ -623,7 +575,6 @@ tr_fdSocketAccept( int b,
|
|||
int s;
|
||||
unsigned int len;
|
||||
struct sockaddr_storage sock;
|
||||
tr_lockLock( gFd->lock );
|
||||
|
||||
assert( addr );
|
||||
assert( port );
|
||||
|
|
@ -664,30 +615,19 @@ tr_fdSocketAccept( int b,
|
|||
++gFd->socketCount;
|
||||
}
|
||||
|
||||
tr_lockUnlock( gFd->lock );
|
||||
return s;
|
||||
}
|
||||
|
||||
static void
|
||||
socketClose( int fd )
|
||||
{
|
||||
EVUTIL_CLOSESOCKET( fd );
|
||||
}
|
||||
|
||||
void
|
||||
tr_fdSocketClose( int s )
|
||||
tr_fdSocketClose( int fd )
|
||||
{
|
||||
tr_lockLock( gFd->lock );
|
||||
|
||||
if( s >= 0 )
|
||||
if( fd >= 0 )
|
||||
{
|
||||
socketClose( s );
|
||||
EVUTIL_CLOSESOCKET( fd );
|
||||
--gFd->socketCount;
|
||||
}
|
||||
|
||||
assert( gFd->socketCount >= 0 );
|
||||
|
||||
tr_lockUnlock( gFd->lock );
|
||||
}
|
||||
|
||||
/***
|
||||
|
|
@ -705,7 +645,6 @@ tr_fdInit( size_t openFileLimit, size_t socketLimit )
|
|||
gFd = tr_new0( struct tr_fd_s, 1 );
|
||||
gFd->openFiles = tr_new0( struct tr_openfile, openFileLimit );
|
||||
gFd->openFileLimit = openFileLimit;
|
||||
gFd->lock = tr_lockNew( );
|
||||
|
||||
#ifdef HAVE_GETRLIMIT
|
||||
{
|
||||
|
|
@ -729,13 +668,12 @@ tr_fdInit( size_t openFileLimit, size_t socketLimit )
|
|||
void
|
||||
tr_fdClose( void )
|
||||
{
|
||||
int i = 0;
|
||||
struct tr_openfile * o;
|
||||
const struct tr_openfile * end;
|
||||
|
||||
for( i = 0; i < gFd->openFileLimit; ++i )
|
||||
if( fileIsOpen( &gFd->openFiles[i] ) )
|
||||
TrCloseFile( i );
|
||||
|
||||
tr_lockFree( gFd->lock );
|
||||
for( o=gFd->openFiles, end=o+gFd->openFileLimit; o!=end; ++o )
|
||||
if( fileIsOpen( o ) )
|
||||
TrCloseFile( o );
|
||||
|
||||
tr_free( gFd->openFiles );
|
||||
tr_free( gFd );
|
||||
|
|
|
|||
Loading…
Reference in a new issue