Changeset 7578 for trunk/libtransmission/torrent.c

Timestamp:

Jan 2, 2009, 5:01:55 PM (14 years ago)

Author:

charles

Message:

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

File:

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

trunk/libtransmission/torrent.c

@@ -88 +88 @@
 }
 
-tr_bool
-tr_torrentExists( const tr_session * session, const uint8_t *   torrentHash )
-{
-    return tr_torrentFindFromHash( (tr_session*)session, torrentHash ) != NULL;
-}
-
 tr_torrent*
 tr_torrentFindFromHash( tr_session * session, const uint8_t * torrentHash )
@@ -119 +113 @@
 
     return NULL;
-}
-
-/***
-****  LOCKS
-***/
-
-void
-tr_torrentLock( const tr_torrent * tor )
-{
-    tr_globalLock( tor->session );
-}
-
-void
-tr_torrentUnlock( const tr_torrent * tor )
-{
-    tr_globalUnlock( tor->session );
 }
 
@@ -520 +498 @@
     assert( t == (uint64_t)tor->blockCount );
 
-    tor->completion = tr_cpInit( tor );
+    tr_cpConstruct( &tor->completion, tor );
 
     tr_torrentInitFilePieces( tor );
@@ -557 +535 @@
     }
 
-    tor->completeness = tr_cpGetStatus( tor->completion );
+    tor->completeness = tr_cpGetStatus( &tor->completion );
 
     tor->tracker = tr_trackerNew( tor );
@@ -803 +781 @@
     usableSeeds += tor->info.webseedCount;
 
-    s->percentComplete = tr_cpPercentComplete ( tor->completion );
-
-    s->percentDone = tr_cpPercentDone( tor->completion );
-    s->leftUntilDone = tr_cpLeftUntilDone( tor->completion );
-    s->sizeWhenDone = tr_cpSizeWhenDone( tor->completion );
+    s->percentComplete = tr_cpPercentComplete ( &tor->completion );
+
+    s->percentDone   = tr_cpPercentDone  ( &tor->completion );
+    s->leftUntilDone = tr_cpLeftUntilDone( &tor->completion );
+    s->sizeWhenDone  = tr_cpSizeWhenDone ( &tor->completion );
 
     s->recheckProgress = s->activity == TR_STATUS_CHECK
@@ -825 +803 @@
     s->downloadedEver  = tor->downloadedCur + tor->downloadedPrev;
     s->uploadedEver    = tor->uploadedCur   + tor->uploadedPrev;
-    s->haveValid       = tr_cpHaveValid( tor->completion );
-    s->haveUnchecked   = tr_cpHaveTotal( tor->completion ) - s->haveValid;
+    s->haveValid       = tr_cpHaveValid( &tor->completion );
+    s->haveUnchecked   = tr_cpHaveTotal( &tor->completion ) - s->haveValid;
 
 
@@ -847 +825 @@
         for( i = 0; i < tor->info.pieceCount; ++i )
             if( !tor->info.pieces[i].dnd && tr_bitfieldHas( peerPieces, i ) )
-                s->desiredAvailable += tr_cpMissingBlocksInPiece(
-                    tor->completion, i );
+                s->desiredAvailable += tr_cpMissingBlocksInPiece( &tor->completion, i );
         s->desiredAvailable *= tor->blockSize;
         tr_bitfieldFree( peerPieces );
@@ -904 +881 @@
     if( firstBlock == lastBlock )
     {
-        if( tr_cpBlockIsComplete( tor->completion, firstBlock ) )
+        if( tr_cpBlockIsComplete( &tor->completion, firstBlock ) )
             haveBytes += lastBlockOffset + 1 - firstBlockOffset;
     }
@@ -911 +888 @@
         tr_block_index_t i;
 
-        if( tr_cpBlockIsComplete( tor->completion, firstBlock ) )
+        if( tr_cpBlockIsComplete( &tor->completion, firstBlock ) )
             haveBytes += tor->blockSize - firstBlockOffset;
 
         for( i = firstBlock + 1; i < lastBlock; ++i )
-            if( tr_cpBlockIsComplete( tor->completion, i ) )
+            if( tr_cpBlockIsComplete( &tor->completion, i ) )
                 haveBytes += tor->blockSize;
 
-        if( tr_cpBlockIsComplete( tor->completion, lastBlock ) )
+        if( tr_cpBlockIsComplete( &tor->completion, lastBlock ) )
             haveBytes += lastBlockOffset + 1;
     }
@@ -1001 +978 @@
 {
     tr_torrentLock( tor );
-    tr_cpGetAmountDone( tor->completion, tab, size );
+    tr_cpGetAmountDone( &tor->completion, tab, size );
     tr_torrentUnlock( tor );
 }
@@ -1031 +1008 @@
 
     if( has )
-        tr_cpPieceAdd( tor->completion, pieceIndex );
+        tr_cpPieceAdd( &tor->completion, pieceIndex );
     else
-        tr_cpPieceRem( tor->completion, pieceIndex );
+        tr_cpPieceRem( &tor->completion, pieceIndex );
 
     tr_torrentUnlock( tor );
@@ -1056 +1033 @@
     tr_peerMgrRemoveTorrent( session->peerMgr, tor->info.hash );
 
-    tr_cpClose( tor->completion );
+    tr_cpDestruct( &tor->completion );
 
     tr_rcClose( tor->swarmSpeed );
@@ -1103 +1080 @@
     *tor->errorString = '\0';
     tr_torrentResetTransferStats( tor );
-    tor->completeness = tr_cpGetStatus( tor->completion );
+    tor->completeness = tr_cpGetStatus( &tor->completion );
     tr_torrentSaveResume( tor );
     tor->startDate = time( NULL );
@@ -1307 +1284 @@
     tr_torrentLock( tor );
 
-    completeness = tr_cpGetStatus( tor->completion );
+    completeness = tr_cpGetStatus( &tor->completion );
 
     if( completeness != tor->completeness )
@@ -1500 +1477 @@
     for( i = 0; i < fileCount; ++i )
         setFileDND( tor, files[i], doDownload );
-    tr_cpInvalidateDND ( tor->completion );
+    tr_cpInvalidateDND ( &tor->completion );
 
     tr_torrentUnlock( tor );