Changeset 10593 for branches/1.9x/libtransmission/session.c

Timestamp:

May 1, 2010, 1:40:42 PM (12 years ago)

Author:

charles

Message:

(1.9x libT) backport r10352 and r10366 for #3026 "Speed Limit mode not honoring limits on other days"

File:

• branches/1.9x/libtransmission/session.c (modified) (9 diffs)

branches/1.9x/libtransmission/session.c

@@ -521 +521 @@
 }
 
-static void turtleCheckClock( tr_session * session, struct tr_turtle_info * t, tr_bool byUser );
+static void turtleCheckClock( tr_session * s, struct tr_turtle_info * t );
 
 static void
@@ -545 +545 @@
     /* tr_session things to do once per second */
     tr_timeUpdate( tv.tv_sec );
-    turtleCheckClock( session, &session->turtle, FALSE );
+    if( session->turtle.isClockEnabled )
+        turtleCheckClock( session, &session->turtle );
 }
 
@@ -1098 +1099 @@
 }
 
-static void
-turtleFindNextChange( struct tr_turtle_info * t )
+enum
+{
+    MINUTES_PER_HOUR = 60,
+    MINUTES_PER_DAY = MINUTES_PER_HOUR * 24,
+    MINUTES_PER_WEEK = MINUTES_PER_DAY * 7
+};
+
+static void
+turtleUpdateTable( struct tr_turtle_info * t )
 {
     int day;
-    struct tm tm;
-    time_t today_began_at;
-    time_t next_begin;
-    time_t next_end;
-    const time_t now = tr_time( );
-    const int SECONDS_PER_DAY = 86400;
-
-    tr_localtime_r( &now, &tm );
-    tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-    today_began_at = mktime( &tm );
-
-    next_begin = today_began_at + ( t->beginMinute * 60 );
-    if( next_begin <= now )
-        next_begin += SECONDS_PER_DAY;
-
-    next_end = today_began_at + ( t->endMinute * 60 );
-    if( next_end <= now )
-        next_end += SECONDS_PER_DAY;
-
-    if( next_begin < next_end ) {
-        t->_nextChangeAt = next_begin;
-        t->_nextChangeValue = TRUE;
-    } else {
-        t->_nextChangeAt = next_end;
-        t->_nextChangeValue = FALSE;
-    }
-
-    /* if the next change is today, look for today in t->days.
-       if the next change is tomorrow to turn limits OFF, look for today in t->days.
-       if the next change is tomorrow to turn limits ON, look for tomorrow in t->days. */
-    if( t->_nextChangeValue && (( t->_nextChangeAt >= today_began_at + SECONDS_PER_DAY )))
-        day = ( tm.tm_wday + 1 ) % 7;
-    else
-        day = tm.tm_wday;
-    t->_nextChangeAllowed = ( t->days & (1<<day) ) != 0;
-
-    if( t->isClockEnabled && t->_nextChangeAllowed ) {
-        char buf[128];
-        tr_localtime_r( &t->_nextChangeAt, &tm );
-        strftime( buf, sizeof( buf ), "%a %b %d %T %Y", &tm );
-        tr_inf( "Turtle clock updated: at %s we'll turn limits %s", buf, (t->_nextChangeValue?"on":"off") );
+    tr_bitfield * b = &t->minutes;
+
+    tr_bitfieldClear( b );
+
+    for( day=0; day<7; ++day )
+    {
+        if( t->days & (1<<day) )
+        {
+            int i;
+            const time_t begin = t->beginMinute;
+            time_t end = t->endMinute;
+
+            if( end <= begin )
+                end += MINUTES_PER_DAY;
+
+            for( i=begin; i<end; ++i )
+                tr_bitfieldAdd( b, (i+day*MINUTES_PER_DAY) % MINUTES_PER_WEEK );
+        }
     }
 }
@@ -1156 +1141 @@
     updateBandwidth( session, TR_UP );
     updateBandwidth( session, TR_DOWN );
-    turtleFindNextChange( t );
 
     if( t->callback != NULL )
@@ -1163 +1147 @@
 
 static void
-useAltSpeed( tr_session * s, struct tr_turtle_info * t, tr_bool enabled, tr_bool byUser )
+useAltSpeed( tr_session * s, struct tr_turtle_info * t,
+             tr_bool enabled, tr_bool byUser )
 {
     assert( tr_isSession( s ) );
@@ -1178 +1163 @@
 }
 
-static void
-turtleCheckClock( tr_session * session, struct tr_turtle_info * t, tr_bool byUser )
-{
+/**
+ * @param enabled whether turtle should be on/off according to the scheduler
+ * @param changed whether that's different from the previous minute
+ */
+static void
+testTurtleTime( const struct tr_turtle_info * t,
+                tr_bool * enabled,
+                tr_bool * changed )
+{
+    tr_bool e;
+    struct tm tm;
+    size_t minute_of_the_week;
     const time_t now = tr_time( );
-    const tr_bool hit = ( t->testedAt < t->_nextChangeAt ) && ( t->_nextChangeAt <= tr_time( ));
-
-    t->testedAt = now;
-
-    if( hit )
-    {
-        const tr_bool enabled = t->_nextChangeValue;
-
-        if( t->isClockEnabled && t->_nextChangeAllowed )
-        {
-            tr_inf( "Time to turn %s turtle mode!", (enabled?"on":"off") );
-            useAltSpeed( session, t, enabled, byUser );
-        }
-
-        turtleFindNextChange( t );
+
+    tr_localtime_r( &now, &tm );
+
+    minute_of_the_week = tm.tm_wday * MINUTES_PER_DAY
+                       + tm.tm_hour * MINUTES_PER_HOUR
+                       + tm.tm_min;
+    if( minute_of_the_week >= MINUTES_PER_WEEK ) /* leap minutes? */
+        minute_of_the_week = MINUTES_PER_WEEK - 1;
+
+    e = tr_bitfieldHasFast( &t->minutes, minute_of_the_week );
+    if( enabled != NULL )
+        *enabled = e;
+
+    if( changed != NULL )
+    {
+        const size_t prev = minute_of_the_week > 0 ? minute_of_the_week - 1
+                                                   : MINUTES_PER_WEEK - 1;
+        *changed = e != tr_bitfieldHasFast( &t->minutes, prev );
+    }
+}
+
+static void
+turtleCheckClock( tr_session * s, struct tr_turtle_info * t )
+{
+    tr_bool enabled;
+    tr_bool changed;
+
+    assert( t->isClockEnabled );
+
+    testTurtleTime( t, &enabled, &changed );
+
+    if( changed )
+    {
+        tr_inf( "Time to turn %s turtle mode!", (enabled?"on":"off") );
+        useAltSpeed( s, t, enabled, FALSE );
     }
 }
@@ -1206 +1220 @@
 turtleBootstrap( tr_session * session, struct tr_turtle_info * turtle )
 {
-    turtleFindNextChange( turtle );
-
     turtle->changedByUser = FALSE;
 
+    tr_bitfieldConstruct( &turtle->minutes, MINUTES_PER_WEEK );
+
+    turtleUpdateTable( turtle );
+
     if( turtle->isClockEnabled )
-        turtle->isEnabled = !turtle->_nextChangeValue;
+        testTurtleTime( turtle, &turtle->isEnabled, NULL );
 
     altSpeedToggled( session );
@@ -1292 +1308 @@
     tr_dbg( "Refreshing the turtle mode clock due to user changes" );
 
-    t->testedAt = 0;
-    turtleFindNextChange( t );
-
-    if( t->isClockEnabled && t->_nextChangeAllowed )
-        useAltSpeed( s, t, !t->_nextChangeValue, TRUE );
+    turtleUpdateTable( t );
+
+    if( t->isClockEnabled )
+    {
+        tr_bool enabled, changed;
+        testTurtleTime( t, &enabled, &changed );
+        useAltSpeed( s, t, enabled, TRUE );
+    }
 }
 
@@ -1596 +1615 @@
     tr_bencFree( &session->removedTorrents );
     tr_bandwidthFree( session->bandwidth );
+    tr_bitfieldDestruct( &session->turtle.minutes );
     tr_lockFree( session->lock );
     if( session->metainfoLookup ) {