Changeset 1207

Timestamp:

Dec 14, 2006, 4:25:35 AM (16 years ago)

Author:

titer

Message:

Properly release files when checking hashes

Location:

branches/io/libtransmission

Files:

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

branches/io/libtransmission/fdlimit.c

@@ -199 +199 @@
 
 open:
-    tr_dbg( "Opening %s in %s", name, folder );
+    tr_dbg( "Opening %s in %s (%d)", name, folder, write );
     asprintf( &path, "%s/%s", folder, name );
     f->open[winner].file = open( path, write ? ( O_RDWR | O_CREAT ) :
@@ -362 +362 @@
 static void CloseFile( tr_fd_t * f, int i )
 {
-    if( !( f->open[i].status & STATUS_UNUSED ) )
+    tr_openFile_t * file = &f->open[i];
+    if( !( file->status & STATUS_UNUSED ) )
     {
         tr_err( "CloseFile: status is %d, should be %d",
-                f->open[i].status, STATUS_UNUSED );
-    }
-    tr_dbg( "Closing %s in %s", f->open[i].name, f->open[i].folder );
-    f->open[i].status = STATUS_CLOSING;
-    tr_lockUnlock( &f->lock );
-    close( f->open[i].file );
-    tr_lockLock( &f->lock );
-    f->open[i].status = STATUS_INVALID;
+                file->status, STATUS_UNUSED );
+    }
+    tr_dbg( "Closing %s in %s (%d)", file->name, file->folder, file->write );
+    file->status = STATUS_CLOSING;
+    tr_lockUnlock( &f->lock );
+    close( file->file );
+    tr_lockLock( &f->lock );
+    file->status = STATUS_INVALID;
     tr_condSignal( &f->cond );
 }

branches/io/libtransmission/inout.c

@@ -382 +382 @@
             if( lseek( file, offset, SEEK_SET ) < 0 )
             {
+                tr_fdFileRelease( tor->fdlimit, file );
                 goto fail;
             }
@@ -388 +389 @@
             if( readOrWrite( file, buf, cur ) != cur )
             {
+                tr_fdFileRelease( tor->fdlimit, file );
                 goto fail;
             }