Changeset 9051 for branches

Timestamp:

Sep 7, 2009, 6:19:26 AM (13 years ago)

Author:

charles

Message:

backport from trunk to 1.7x the fixes for tickets #2326, #2365, #2372, #2373, #2383, #2384, and unticketed change r9047

Location:

branches/1.7x

Files:

• configure.ac (modified) (1 diff)
• libtransmission/bencode.c (modified) (1 diff)
• libtransmission/peer-mgr.c (modified) (2 diffs)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/tracker.c (modified) (1 diff)
• libtransmission/verify.c (modified) (6 diffs)

branches/1.7x/configure.ac

@@ -26 +26 @@
     CXXFLAGS="$CXXFLAGS -g -O3 "
   fi
+  CPPFLAGS="$CPPFLAGS -NDEBUG"
 else
   supported_build=no

branches/1.7x/libtransmission/bencode.c

@@ -1340 +1340 @@
                     UTF32 *      u32 = &buf;
                     ConversionResult result = ConvertUTF8toUTF32( &tmp, end, &u32, &buf + 1, 0 );
-                    if( ( result != conversionOK ) && ( tmp == it ) )
-                        ++it; /* it's beyond help; skip it */
-                    else {
+                    if((( result==conversionOK ) || (result==targetExhausted)) && (tmp!=it)) { 
                         evbuffer_add_printf( data->out, "\\u%04x", (unsigned int)buf );
                         it = tmp - 1;

branches/1.7x/libtransmission/peer-mgr.c

@@ -2475 +2475 @@
 {
     int n = tr_ptrArraySize( &t->peers );
-    const int max = tr_sessionGetPeerLimitPerTorrent( t->tor->session );
+    const int max = tr_torrentGetPeerLimit( t->tor );
     if( n > max )
     {
@@ -2608 +2608 @@
     tor = NULL;
     while(( tor = tr_torrentNext( mgr->session, tor )))
-        if( tor->isRunning && (( tor->error == TR_STAT_TRACKER_ERROR ) || ( tor->error == TR_STAT_LOCAL_ERROR )))
+        if( tor->isRunning && ( tor->error == TR_STAT_LOCAL_ERROR )) 
             tr_torrentStop( tor );
 

branches/1.7x/libtransmission/torrent.c

@@ -720 +720 @@
     didParse = tr_metainfoParse( session, setmeInfo, metainfo );
     doFree = didParse && ( setmeInfo == &tmp );
+
+    if( !didParse )
+        result = TR_PARSE_ERR;
 
     if( didParse && !getBlockSize( setmeInfo->pieceSize ) )

branches/1.7x/libtransmission/tracker.c

@@ -525 +525 @@
                                       tr_webGetResponseStr( responseCode ) );
         tr_strlcpy( t->lastAnnounceStr, buf, sizeof( t->lastAnnounceStr ) );
-        publishWarning( t, buf );
+
+        /* if the repsonse may require intervention, notify the user; otherwise, just log it */ 
+        if( responseCode >= 400 ) 
+            publishWarning( t, buf ); 
+        tr_ninf( t->name, "%s", buf ); 
+
         tr_free( buf );
     }

branches/1.7x/libtransmission/verify.c

@@ -36 +36 @@
 ***/
 
+enum
+{
+    MSEC_TO_SLEEP_PER_SECOND_DURING_VERIFY = 200
+};
+
 /* #define STOPWATCH */
 
@@ -46 +51 @@
     tr_bool changed = 0;
     tr_bool hadPiece = 0;
+    time_t lastSleptAt = 0;
     uint32_t piecePos = 0;
     uint32_t pieceBytesRead = 0;
@@ -53 +59 @@
     uint8_t * buffer = tr_new( uint8_t, buflen );
 #ifdef STOPWATCH
-    time_t now = time( NULL );
+    const time_t begin = time( NULL );
 #endif
 
@@ -106 +112 @@
         if( leftInPiece == 0 )
         {
+            time_t now;
             tr_bool hasPiece;
             uint8_t hash[SHA_DIGEST_LENGTH];
@@ -122 +129 @@
             }
             tr_torrentSetPieceChecked( tor, pieceIndex, TRUE );
-            tor->anyDate = time( NULL );
-
-            /* going full-throttle on a verify can choke other processes'
-             * disk IO, so wait a fwe msec between pieces.
-             * The msec is arbitrary, and the "if" clause is to make sure we
-             * don't slow down verification of files that don't exist */
-            if( pieceBytesRead == tr_torPieceCountBytes( tor, pieceIndex ) )
-                tr_wait( 50 );
+            now = time( NULL );
+            tor->anyDate = now;
+
+            /* sleeping even just a few msec per second goes a long
+             * way towards reducing IO load... */
+            if( lastSleptAt != now ) {
+                lastSleptAt = now;
+                tr_wait( MSEC_TO_SLEEP_PER_SECOND_DURING_VERIFY );
+            }
 
             SHA1_Init( &sha );
@@ -154 +162 @@
 #ifdef STOPWATCH
 {
-    time_t now2 = time( NULL );
+    const time_t end = time( NULL );
     fprintf( stderr, "it took %d seconds to verify %"PRIu64" bytes (%"PRIu64" bytes per second)\n",
-             (int)(now2-now), tor->info.totalSize, (uint64_t)(tor->info.totalSize/(1+(now2-now))) );
+             (int)(end-begin), tor->info.totalSize, (uint64_t)(tor->info.totalSize/(1+(end-begin))) );
 }
 #endif