mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-27 01:57:52 +00:00
Code Issues Releases Wiki Activity

(trunk libT) #2874 "Since 10094 The Schedule Speed Limit Not Working" -- fixed regression reported by bebbo

Browse source
This commit is contained in:
Charles Kerr 2010-02-08 19:21:07 +00:00
parent 43dc275579
commit 5a3f55c7dc
1 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libtransmission/session.c
View file

@ -626,7 +626,7 @@ tr_sessionInitImpl( void * vdata )
data->done = TRUE; data->done = TRUE;
} }
static void turtleBootstrap( tr_session *, struct tr_turtle_info *, tr_bool isEnabled ); static void turtleBootstrap( tr_session *, struct tr_turtle_info * );
static void static void
sessionSetImpl( void * vdata ) sessionSetImpl( void * vdata )
@ -778,10 +778,7 @@ sessionSetImpl( void * vdata )
turtle->days = i; turtle->days = i;
if( tr_bencDictFindBool( settings, TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED, &boolVal ) ) if( tr_bencDictFindBool( settings, TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED, &boolVal ) )
turtle->isClockEnabled = boolVal; turtle->isClockEnabled = boolVal;
turtleBootstrap( session, turtle );
if( !tr_bencDictFindBool( settings, TR_PREFS_KEY_ALT_SPEED_ENABLED, &boolVal ) )
boolVal = FALSE;
turtleBootstrap( session, turtle, boolVal );
data->done = TRUE; data->done = TRUE;
} }
@ -1153,28 +1150,18 @@ useAltSpeed( tr_session * s, struct tr_turtle_info * t, tr_bool enabled, tr_bool
} }
} }
static tr_bool
turtleTestClock( struct tr_turtle_info * t, tr_bool * enabled )
{
tr_bool hit;
if(( hit = ( t->testedAt < t->_nextChangeAt ) && ( t->_nextChangeAt <= tr_time( ))))
*enabled = t->_nextChangeValue;
return hit;
}
static void static void
turtleCheckClock( tr_session * session, struct tr_turtle_info * t, tr_bool byUser ) turtleCheckClock( tr_session * session, struct tr_turtle_info * t, tr_bool byUser )
{ {
tr_bool enabled;
const time_t now = tr_time( ); const time_t now = tr_time( );
const tr_bool hit = turtleTestClock( t, &enabled ); const tr_bool hit = ( t->testedAt < t->_nextChangeAt ) && ( t->_nextChangeAt <= tr_time( ));
t->testedAt = now; t->testedAt = now;
if( hit ) if( hit )
{ {
const tr_bool enabled = t->_nextChangeValue;
if( t->isClockEnabled && t->_nextChangeAllowed ) if( t->isClockEnabled && t->_nextChangeAllowed )
{ {
tr_inf( "Time to turn %s turtle mode!", (enabled?"on":"off") ); tr_inf( "Time to turn %s turtle mode!", (enabled?"on":"off") );
@ -1189,13 +1176,12 @@ turtleCheckClock( tr_session * session, struct tr_turtle_info * t, tr_bool byUse
* It initializes the implementation fields * It initializes the implementation fields
* and turns on turtle mode if the clock settings say to. */ * and turns on turtle mode if the clock settings say to. */
static void static void
turtleBootstrap( tr_session * session, struct tr_turtle_info * turtle, tr_bool isEnabled ) turtleBootstrap( tr_session * session, struct tr_turtle_info * turtle )
{ {
tr_bool isEnabled;
turtleFindNextChange( turtle ); turtleFindNextChange( turtle );
isEnabled = turtle->isClockEnabled && !turtle->_nextChangeValue;
if( !isEnabled )
turtleTestClock( turtle, &isEnabled );
useAltSpeed( session, turtle, isEnabled, FALSE ); useAltSpeed( session, turtle, isEnabled, FALSE );
} }