Changeset 2531 for trunk/libtransmission/peerparse.h

Timestamp:

Jul 28, 2007, 3:43:34 PM (15 years ago)

Author:

charles

Message:

a nice patch that makes the three most CPU-hogging functions (as reported by Shark) essentially free and reduces memory overhead by 8 bytes per piece per torrent. Lots of asserts for extra testing fun.

File:

• trunk/libtransmission/peerparse.h (modified) (4 diffs)

trunk/libtransmission/peerparse.h

@@ -224 +224 @@
         return TR_ERROR_ASSERT;
     }
-    if( tr_pieceSize( index ) < begin + length )
+    if( tr_torPieceCountBytes( tor, index ) < begin + length )
     {
         peer_dbg( "GET  request, invalid begin/length" );
@@ -302 +302 @@
         return TR_ERROR_ASSERT;
     }
-    if( tr_pieceSize( index ) < begin + len - 8 )
+    if( tr_torPieceCountBytes( tor, index ) < begin + len - 8 )
     {
         peer_dbg( "GET  piece, invalid begin/length" );
@@ -316 +316 @@
 
     /* Sanity checks */
-    if( len - 8 != tr_blockSize( block ) )
-    {
-        peer_dbg( "wrong size (expecting %d)", tr_blockSize( block ) );
+    if( len - 8 != tr_torBlockCountBytes( tor, block ) )
+    {
+        peer_dbg( "wrong size (expecting %d)", tr_torBlockCountBytes( tor, block ) );
         return TR_ERROR_ASSERT;
     }
@@ -406 +406 @@
         return TR_ERROR_ASSERT;
     }
-    if( tr_pieceSize( index ) < begin + length )
+    if( tr_torPieceCountBytes( tor, index ) < begin + length )
     {
         peer_dbg( "GET  cancel, invalid begin/length" );