Changeset 7524 for trunk/libtransmission/torrent.c

Timestamp:

Dec 29, 2008, 8:54:36 AM (14 years ago)

Author:

charles

Message:

(trunk libT) avoid some unnecessary memory fragmentation... for composited objects that have a tr_ptrArray, contain the tr_ptrArray directly rather than a pointer to one allocated elsewhere on the heap.

File:

• trunk/libtransmission/torrent.c (modified) (6 diffs)

trunk/libtransmission/torrent.c

@@ -1842 +1842 @@
         char * tmp;
         tr_ptrArrayInsertSorted( dirtyFolders, tr_strdup( dir ), vstrcmp );
+
         tmp = tr_dirname( dir );
         tr_free( dir );
@@ -1896 +1897 @@
     char ** s;
     tr_file_index_t f;
-    tr_ptrArray * torrentFiles = tr_ptrArrayNew( );
-    tr_ptrArray * folders = tr_ptrArrayNew( );
-    tr_ptrArray * dirtyFolders = tr_ptrArrayNew( ); /* dirty == contains non-torrent files */
+    tr_ptrArray torrentFiles = TR_PTR_ARRAY_INIT;
+    tr_ptrArray folders      = TR_PTR_ARRAY_INIT;
+    tr_ptrArray dirtyFolders = TR_PTR_ARRAY_INIT; /* dirty == contains non-torrent files */
 
     const char * firstFile = tor->info.files[0].name;
@@ -1906 +1907 @@
 
     for( f=0; f<tor->info.fileCount; ++f )
-        tr_ptrArrayInsertSorted( torrentFiles, tor->info.files[f].name, vstrcmp );
+        tr_ptrArrayInsertSorted( &torrentFiles, tor->info.files[f].name, vstrcmp );
 
     /* build the set of folders and dirtyFolders */
-    walkLocalData( tor, root, root, NULL, torrentFiles, folders, dirtyFolders );
+    walkLocalData( tor, root, root, NULL, &torrentFiles, &folders, &dirtyFolders );
 
     /* close all the files because we're about to delete them */
@@ -1919 +1920 @@
 
     /* try to remove entire folders first, so that the recycle bin will be tidy */
-    s = (char**) tr_ptrArrayPeek( folders, &n );
+    s = (char**) tr_ptrArrayPeek( &folders, &n );
     for( i=0; i<n; ++i )
-        if( tr_ptrArrayFindSorted( dirtyFolders, s[i], vstrcmp ) == NULL )
+        if( tr_ptrArrayFindSorted( &dirtyFolders, s[i], vstrcmp ) == NULL )
             fileFunc( s[i] );
 
-    /* now blow away any remaining torrent files, such torrent files in dirty folders */
+    /* now blow away any remaining torrent files, such as torrent files in dirty folders */
     for( f=0; f<tor->info.fileCount; ++f ) {
         char * path = tr_buildPath( tor->downloadDir, tor->info.files[f].name, NULL );
@@ -1935 +1936 @@
      * won't prevent the upper folders from being deleted */
     {
-        tr_ptrArray * cleanFolders = tr_ptrArrayNew( );
-        s = (char**) tr_ptrArrayPeek( folders, &n );
+        tr_ptrArray cleanFolders = TR_PTR_ARRAY_INIT;
+        s = (char**) tr_ptrArrayPeek( &folders, &n );
         for( i=0; i<n; ++i )
-            if( tr_ptrArrayFindSorted( dirtyFolders, s[i], vstrcmp ) == NULL )
-                tr_ptrArrayInsertSorted( cleanFolders, s[i], compareLongestFirst );
-        s = (char**) tr_ptrArrayPeek( cleanFolders, &n );
+            if( tr_ptrArrayFindSorted( &dirtyFolders, s[i], vstrcmp ) == NULL )
+                tr_ptrArrayInsertSorted( &cleanFolders, s[i], compareLongestFirst );
+        s = (char**) tr_ptrArrayPeek( &cleanFolders, &n );
         for( i=0; i<n; ++i )
             fileFunc( s[i] );
-        tr_ptrArrayFree( cleanFolders, NULL );
+        tr_ptrArrayDestruct( &cleanFolders, NULL );
     }
 
     /* cleanup */
-    tr_ptrArrayFree( dirtyFolders, tr_free );
-    tr_ptrArrayFree( folders, tr_free );
-    tr_ptrArrayFree( torrentFiles, NULL );
+    tr_ptrArrayDestruct( &dirtyFolders, tr_free );
+    tr_ptrArrayDestruct( &folders, tr_free );
+    tr_ptrArrayDestruct( &torrentFiles, NULL );
     tr_free( root );
     tr_free( tmp );
@@ -1963 +1964 @@
         deleteLocalData( tor, fileFunc );
     else {
+        /* torrent only has one file */
         char * path = tr_buildPath( tor->downloadDir, tor->info.files[0].name, NULL );
+        tr_fdFileClose( path );
         fileFunc( path );
         tr_free( path );