Changeset 9066

Timestamp:

Sep 8, 2009, 6:25:40 AM (13 years ago)

Author:

charles

Message:

add better logging to track down tr_ioRead() error messages reported by Rabbitbunny

Location:

trunk/libtransmission

Files:

• fdlimit.c (modified) (1 diff)
• inout.c (modified) (2 diffs)

trunk/libtransmission/fdlimit.c

@@ -353 +353 @@
     /* 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 );
+     * chunks of blocks in order.
+     * It's okay for this to fail silently, so don't let it affect errno */
+    {
+        const int err = errno;
+        posix_fadvise( file->fd, 0, 0, POSIX_FADV_SEQUENTIAL );
+        errno = err;
+    }
 #endif
 

trunk/libtransmission/inout.c

@@ -101 +101 @@
 
     if( ( ioMode == TR_IO_READ ) && !fileExists ) /* does file exist? */
+        err = ENOENT;
+    else if( ( fd = tr_fdFileCheckout( tor->uniqueId, tor->downloadDir, file->name, ioMode == TR_IO_WRITE, preallocationMode, file->length ) ) < 0 ) {
         err = errno;
-    else if( ( fd = tr_fdFileCheckout ( tor->uniqueId, tor->downloadDir, file->name, ioMode == TR_IO_WRITE, preallocationMode, file->length ) ) < 0 )
+        tr_torerr( tor, "tr_fdFileCheckout failed for \"%s\": %s", file->name, tr_strerror( err ) );
+    }
+    else if( tr_lseek( fd, (int64_t)fileOffset, SEEK_SET ) == -1 ) {
         err = errno;
-    else if( tr_lseek( fd, (int64_t)fileOffset, SEEK_SET ) == -1 )
+        tr_torerr( tor, "tr_lseek failed for \"%s\": %s", file->name, tr_strerror( err ) );
+    }
+    else if( func( fd, buf, buflen ) != buflen ) {
         err = errno;
-    else if( func( fd, buf, buflen ) != buflen )
-        err = errno;
+        tr_torerr( tor, "read/write failed for \"%s\": %s", file->name, tr_strerror( err ) );
+    }
     else
         err = 0;
@@ -176 +182 @@
     {
         const tr_file * file = &info->files[fileIndex];
-        const uint64_t  bytesThisPass = MIN( buflen, file->length - fileOffset );
+        const uint64_t bytesThisPass = MIN( buflen, file->length - fileOffset );
 
         err = readOrWriteBytes( tor, ioMode, fileIndex, fileOffset, buf, bytesThisPass );