mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't let tr_torrentStop return until files are closed, so that the UI can trash them safely if requested (fixes #186)

This commit is contained in:
Eric Petit 2007-01-19 15:24:20 +00:00
parent 4a567871bb
commit da84461d9c
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libtransmission/internal.h
View File

@ -173,6 +173,7 @@ struct tr_torrent_s
volatile char die;
tr_thread_t thread;
tr_lock_t lock;
tr_cond_t cond;
tr_tracker_t * tracker;
tr_io_t * io;

40
libtransmission/torrent.c
View File

@ -130,6 +130,7 @@ static tr_torrent_t * torrentRealInit( tr_handle_t * h, tr_torrent_t * tor,
tor->completion = tr_cpInit( tor );
tr_lockInit( &tor->lock );
tr_condInit( &tor->cond );
tor->fdlimit = h->fdlimit;
tor->upload = tr_rcInit();
@ -219,6 +220,10 @@ void tr_torrentStop( tr_torrent_t * tor )
{
tr_lockLock( &tor->lock );
torrentStop( tor );
/* Don't return until the files are closed, so the UI can trash
* them if requested */
tr_condWait( &tor->cond, &tor->lock );
tr_lockUnlock( &tor->lock );
}
@ -491,7 +496,8 @@ void tr_torrentAmountFinished( tr_torrent_t * tor, float * tab, int size )
tr_lockUnlock( &tor->lock );
}
void tr_torrentRemoveSaved( tr_torrent_t * tor ) {
void tr_torrentRemoveSaved( tr_torrent_t * tor )
{
tr_metainfoRemoveSaved( tor->info.hashString );
}
@ -515,6 +521,7 @@ void tr_torrentClose( tr_handle_t * h, tr_torrent_t * tor )
h->torrentCount--;
tr_lockClose( &tor->lock );
tr_condClose( &tor->cond );
tr_cpClose( tor->completion );
tr_rcClose( tor->upload );
@ -578,14 +585,25 @@ static void downloadLoop( void * _tor )
tr_ioSync( tor->io );
}
/* Receive/send messages */
if( ( ret = tr_peerPulse( tor ) ) )
if( tor->status & TR_STATUS_STOPPING )
{
tr_err( "Fatal error, stopping download (%d)", ret );
torrentStop( tor );
tor->error = ret;
snprintf( tor->errorString, sizeof( tor->errorString ),
"%s", tr_errorString( ret ) );
if( tor->io )
{
tr_ioClose( tor->io ); tor->io = NULL;
tr_condSignal( &tor->cond );
}
}
else
{
/* Receive/send messages */
if( ( ret = tr_peerPulse( tor ) ) )
{
tr_err( "Fatal error, stopping download (%d)", ret );
torrentStop( tor );
tor->error = ret;
snprintf( tor->errorString, sizeof( tor->errorString ),
"%s", tr_errorString( ret ) );
}
}
/* Try to get new peers or to send a message to the tracker */
@ -613,7 +631,11 @@ static void downloadLoop( void * _tor )
tr_lockUnlock( &tor->lock );
tr_ioClose( tor->io );
if( tor->io )
{
tr_ioClose( tor->io ); tor->io = NULL;
tr_condSignal( &tor->cond );
}
tor->status = TR_STATUS_STOPPED;
}