Changeset 7525

Timestamp:

Dec 29, 2008, 9:51:54 AM (12 years ago)

Author:

charles

Message:

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

Location:

trunk/libtransmission

Files:

• completion.c (modified) (10 diffs)
• torrent.c (modified) (7 diffs)
• torrent.h (modified) (2 diffs)
• utils.c (modified) (2 diffs)
• utils.h (modified) (2 diffs)

trunk/libtransmission/completion.c

@@ -39 +39 @@
 
     /* do we have this block? */
-    tr_bitfield *  blockBitfield;
+    tr_bitfield    blockBitfield;
 
     /* do we have this piece? */
-    tr_bitfield *  pieceBitfield;
+    tr_bitfield    pieceBitfield;
 
     /* a block is complete if and only if we have it */
@@ -64 +64 @@
 tr_cpReset( tr_completion * cp )
 {
-    tr_bitfieldClear( cp->pieceBitfield );
-    tr_bitfieldClear( cp->blockBitfield );
+    tr_bitfieldClear( &cp->pieceBitfield );
+    tr_bitfieldClear( &cp->blockBitfield );
     memset( cp->completeBlocks, 0,
             sizeof( uint16_t ) * cp->tor->info.pieceCount );
@@ -79 +79 @@
 
     cp->tor             = tor;
-    cp->blockBitfield   = tr_bitfieldNew( tor->blockCount );
-    cp->pieceBitfield   = tr_bitfieldNew( tor->info.pieceCount );
     cp->completeBlocks  = tr_new( uint16_t, tor->info.pieceCount );
+    tr_bitfieldConstruct( &cp->blockBitfield, tor->blockCount );
+    tr_bitfieldConstruct( &cp->pieceBitfield, tor->info.pieceCount );
     tr_cpReset( cp );
     return cp;
@@ -89 +89 @@
 tr_cpClose( tr_completion * cp )
 {
-    tr_free        ( cp->completeBlocks );
-    tr_bitfieldFree( cp->pieceBitfield );
-    tr_bitfieldFree( cp->blockBitfield );
+    tr_free( cp->completeBlocks );
+    tr_bitfieldDestruct( &cp->pieceBitfield );
+    tr_bitfieldDestruct( &cp->blockBitfield );
     tr_free        ( cp );
 }
@@ -156 +156 @@
 tr_cpPieceBitfield( const tr_completion * cp )
 {
-    return cp->pieceBitfield;
+    return &cp->pieceBitfield;
 }
 
@@ -194 +194 @@
     cp->haveValidIsDirty = 1;
     cp->completeBlocks[piece] = 0;
-    tr_bitfieldRemRange ( cp->blockBitfield, start, end );
-    tr_bitfieldRem( cp->pieceBitfield, piece );
+    tr_bitfieldRemRange ( &cp->blockBitfield, start, end );
+    tr_bitfieldRem( &cp->pieceBitfield, piece );
 }
 
@@ -202 +202 @@
                       tr_block_index_t      block )
 {
-    return tr_bitfieldHas( cp->blockBitfield, block );
+    return tr_bitfieldHas( &cp->blockBitfield, block );
 }
 
@@ -220 +220 @@
 
         if( tr_cpPieceIsComplete( cp, piece ) )
-            tr_bitfieldAdd( cp->pieceBitfield, piece );
-
-        tr_bitfieldAdd( cp->blockBitfield, block );
+            tr_bitfieldAdd( &cp->pieceBitfield, piece );
+
+        tr_bitfieldAdd( &cp->blockBitfield, block );
 
         cp->sizeNow += blockSize;
@@ -235 +235 @@
 {
     assert( cp );
-    assert( cp->blockBitfield );
-    assert( cp->blockBitfield->bits );
-    assert( cp->blockBitfield->bitCount );
-
-    return cp->blockBitfield;
+    assert( cp->blockBitfield.bits );
+    assert( cp->blockBitfield.bitCount );
+
+    return &cp->blockBitfield;
 }
 
@@ -250 +249 @@
     assert( cp );
     assert( bitfield );
-    assert( cp->blockBitfield );
 
     if( tr_bitfieldTestFast( bitfield, cp->tor->blockCount - 1 ) )

trunk/libtransmission/torrent.c

@@ -538 +538 @@
     tor->error   = 0;
 
-    tor->checkedPieces = tr_bitfieldNew( tor->info.pieceCount );
+    tr_bitfieldConstruct( &tor->checkedPieces, tor->info.pieceCount );
     tr_torrentUncheck( tor );
 
@@ -1064 +1064 @@
     tor->tracker = NULL;
 
-    tr_bitfieldFree( tor->checkedPieces );
+    tr_bitfieldDestruct( &tor->checkedPieces );
 
     tr_free( tor->downloadDir );
@@ -1602 +1602 @@
                           tr_piece_index_t   piece )
 {
-    return tr_bitfieldHas( tor->checkedPieces, piece );
+    return tr_bitfieldHas( &tor->checkedPieces, piece );
 }
 
@@ -1611 +1611 @@
 {
     if( isChecked )
-        tr_bitfieldAdd( tor->checkedPieces, piece );
+        tr_bitfieldAdd( &tor->checkedPieces, piece );
     else
-        tr_bitfieldRem( tor->checkedPieces, piece );
+        tr_bitfieldRem( &tor->checkedPieces, piece );
 }
 
@@ -1626 +1626 @@
 
     if( isChecked )
-        tr_bitfieldAddRange ( tor->checkedPieces, begin, end );
+        tr_bitfieldAddRange ( &tor->checkedPieces, begin, end );
     else
-        tr_bitfieldRemRange ( tor->checkedPieces, begin, end );
+        tr_bitfieldRemRange ( &tor->checkedPieces, begin, end );
 }
 
@@ -1651 +1651 @@
 tr_torrentUncheck( tr_torrent * tor )
 {
-    tr_bitfieldRemRange ( tor->checkedPieces, 0, tor->info.pieceCount );
+    tr_bitfieldRemRange ( &tor->checkedPieces, 0, tor->info.pieceCount );
 }
 
@@ -1657 +1657 @@
 tr_torrentCountUncheckedPieces( const tr_torrent * tor )
 {
-    return tor->info.pieceCount - tr_bitfieldCountTrueBits(
-               tor->checkedPieces );
+    return tor->info.pieceCount - tr_bitfieldCountTrueBits( &tor->checkedPieces );
 }
 

trunk/libtransmission/torrent.h

@@ -27 +27 @@
 #endif
 
+#include "utils.h" /* tr_bitfield */
+
 #ifndef TR_TORRENT_H
 #define TR_TORRENT_H 1
@@ -206 +208 @@
     struct tr_completion *     completion;
 
-    struct tr_bitfield *       checkedPieces;
+    struct tr_bitfield         checkedPieces;
     tr_completeness            completeness;
 

trunk/libtransmission/utils.c

@@ -747 +747 @@
 
 tr_bitfield*
+tr_bitfieldConstruct( tr_bitfield * b, size_t bitCount )
+{
+    b->bitCount = bitCount;
+    b->byteCount = ( bitCount + 7u ) / 8u;
+    b->bits = tr_new0( uint8_t, b->byteCount );
+    return b;
+}
+
+void
+tr_bitfieldDestruct( tr_bitfield * b )
+{
+    tr_free( b->bits );
+}
+
+tr_bitfield*
 tr_bitfieldNew( size_t bitCount )
 {
-    tr_bitfield * ret = tr_new0( tr_bitfield, 1 );
-
-    ret->bitCount = bitCount;
-    ret->byteCount = ( bitCount + 7u ) / 8u;
-    ret->bits = tr_new0( uint8_t, ret->byteCount );
-    return ret;
+    return tr_bitfieldConstruct( tr_new0( tr_bitfield, 1 ), bitCount );
 }
 
@@ -773 +783 @@
     if( bitfield )
     {
-        tr_free( bitfield->bits );
+        tr_bitfieldDestruct( bitfield );
         tr_free( bitfield );
     }

trunk/libtransmission/utils.h

@@ -300 +300 @@
 ***/
 
-struct tr_bitfield
+typedef struct tr_bitfield
 {
     uint8_t *  bits;
     size_t     bitCount;
     size_t     byteCount;
-};
-
-typedef struct tr_bitfield tr_bitfield;
+}
+tr_bitfield;
+
+tr_bitfield* tr_bitfieldConstruct( tr_bitfield*, size_t bitcount );
+
+void         tr_bitfieldDestruct( tr_bitfield* );
 
 tr_bitfield* tr_bitfieldNew( size_t bitcount ) TR_GNUC_MALLOC;
@@ -347 +350 @@
     start looping. */
 #define tr_bitfieldHasFast( bitfield, nth ) \
-    ( ( bitfield->bits[( nth ) >> 3u] << ( ( nth ) & 7u ) & 0x80 ) != 0 )
+    ( ( (bitfield)->bits[( nth ) >> 3u] << ( ( nth ) & 7u ) & 0x80 ) != 0 )
 
 /** @param high the highest nth bit you're going to access */