Changeset 10798

Timestamp:

Jun 19, 2010, 2:25:11 PM (12 years ago)

Author:

charles

Message:

(trunk) #1521 "memory cache to reduce disk IO" -- commit block-cache-rc1.diff to trunk for the nightlies.

Location:

trunk

Files:

• daemon/remote.c (modified) (5 diffs)
• daemon/transmission-remote.1 (modified) (2 diffs)
• doc/rpc-spec.txt (modified) (2 diffs)
• gtk/my-valgrind.sh (modified) (1 diff)
• libtransmission/Makefile.am (modified) (2 diffs)
• libtransmission/cache.c (added)
• libtransmission/cache.h (added)
• libtransmission/inout.c (modified) (7 diffs)
• libtransmission/peer-mgr.c (modified) (2 diffs)
• libtransmission/peer-msgs.c (modified) (4 diffs)
• libtransmission/ptrarray.c (modified) (3 diffs)
• libtransmission/ptrarray.h (modified) (2 diffs)
• libtransmission/rpcimpl.c (modified) (2 diffs)
• libtransmission/session.c (modified) (8 diffs)
• libtransmission/session.h (modified) (2 diffs)
• libtransmission/torrent.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (2 diffs)

trunk/daemon/remote.c

@@ -208 +208 @@
     { 'd', "downlimit",              "Set the max download speed in KiB/s for the current torrent(s) or globally", "d", 1, "<speed>" },
     { 'D', "no-downlimit",           "Disable max download speed for the current torrent(s) or globally", "D", 0, NULL },
+    { 'e', "cache",                  "Set the maximum size of the session's memory cache (in MiB)", "e", 1, "<size>" },
     { 910, "encryption-required",    "Encrypt all peer connections", "er", 0, NULL },
     { 911, "encryption-preferred",   "Prefer encrypted peer connections", "ep", 0, NULL },
@@ -323 +324 @@
         case 'c': /* incomplete-dir */
         case 'C': /* no-incomplete-dir */
+        case 'e': /* cache */
         case 'm': /* portmap */
         case 'M': /* "no-portmap */
@@ -1330 +1332 @@
     if( ( tr_bencDictFindDict( top, "arguments", &args ) ) )
     {
+        double d;
         const char * str;
         int64_t      i;
         tr_bool      boolVal;
+        char buf[64];
 
         printf( "VERSION\n" );
@@ -1360 +1364 @@
         if( tr_bencDictFindStr( args,  TR_PREFS_KEY_ENCRYPTION, &str ) )
             printf( "  Encryption: %s\n", str );
+        if( tr_bencDictFindReal( args, TR_PREFS_KEY_MAX_CACHE_SIZE_MiB, &d ) )
+            printf( "  Maximum memory cache size: %s\n", strlsize( buf, d*MiB, sizeof( buf ) ) );
         printf( "\n" );
 
@@ -1817 +1823 @@
                 case 'C': tr_bencDictAddBool( args, TR_PREFS_KEY_INCOMPLETE_DIR_ENABLED, FALSE );
                           break;
+                case 'e': tr_bencDictAddReal( args, TR_PREFS_KEY_MAX_CACHE_SIZE_MiB, atof(optarg) );
+                          break;
                 case 910: tr_bencDictAddStr( args, TR_PREFS_KEY_ENCRYPTION, "required" );
                           break;

trunk/daemon/transmission-remote.1

@@ -22 +22 @@
 .Op Fl c Ar path | Fl C
 .Op Fl d Ar number | Fl D
+.Op Fl e Ar size
 .Op Fl er | ep | et
 .Op Fl f
@@ -125 +126 @@
 Disable download speed limits.
 If current torrent(s) are selected this operates on them.  Otherwise, it changes the global setting.
+.It Fl e Fl -cache Ar size
+Set the session's maximum memory cache size in MiB.  This cache is used to reduce disk IO.
 .It Fl er Fl -encryption-required
 Encrypt all peer connections.

trunk/doc/rpc-spec.txt

@@ -400 +400 @@
    "blocklist-enabled"           | boolean    true means enabled
    "blocklist-size"              | number     number of rules in the blocklist
+   "cache-size-MiB"              | number     size (in MiB) of the disk cache
    "config-dir"                  | string     location of transmission's configuration directory
    "download-dir"                | string     default path to download torrents
@@ -598 +599 @@
          | 2.00    | yes       | session-get    | new arg "start-added-torrents"
          | 2.00    | yes       | session-get    | new arg "trash-original-torrent-files"
+         | 2.00    | yes       | session-get    | new arg "cache-size-MiB"
          | 2.00    | yes       | torrent-get    | new arg "isFinished"

trunk/gtk/my-valgrind.sh

@@ -3 +3 @@
 export G_DEBUG=gc-friendly
 export GLIBCXX_FORCE_NEW=1
-valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=48 --log-file=x-valgrind --show-reachable=yes ./transmission -p 2>&1 | tee runlog
+valgrind --tool=cachegrind ./transmission -p -g /tmp/transmission-test/what 2>&1 | tee runlog
+#valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=48 --log-file=x-valgrind --show-reachable=yes ./transmission -p -g /tmp/transmission-test/what 2>&1 | tee runlog

trunk/libtransmission/Makefile.am

@@ -22 +22 @@
     bitfield.c \
     blocklist.c \
+    cache.c \
     clients.c \
     completion.c \
@@ -72 +73 @@
     bitset.h \
     blocklist.h \
+    cache.h \
     clients.h \
     ConvertUTF.h \

trunk/libtransmission/inout.c

@@ -27 +27 @@
 
 #include "transmission.h"
+#include "cache.h"
 #include "crypto.h"
 #include "fdlimit.h"
 #include "inout.h"
+#include "peer-common.h" /* MAX_BLOCK_SIZE */
 #include "platform.h"
 #include "stats.h"
@@ -84 +86 @@
     int             err = 0;
     const tr_bool doWrite = ioMode >= TR_IO_WRITE;
+
+if( doWrite )
+    fprintf( stderr, "in file %s at offset %zu, writing %zu bytes; file length is %zu\n", file->name, (size_t)fileOffset, buflen, (size_t)file->length );
 
     assert( fileIndex < info->fileCount );
@@ -224 +229 @@
     if( pieceIndex >= tor->info.pieceCount )
         return EINVAL;
-    if( pieceOffset + buflen > tr_torPieceCountBytes( tor, pieceIndex ) )
-        return EINVAL;
+    //if( pieceOffset + buflen > tr_torPieceCountBytes( tor, pieceIndex ) )
+    //    return EINVAL;
 
     tr_ioFindFileLocation( tor, pieceIndex, pieceOffset,
@@ -238 +243 @@
         buf += bytesThisPass;
         buflen -= bytesThisPass;
+//fprintf( stderr, "++fileIndex to %d\n", (int)fileIndex );
         ++fileIndex;
         fileOffset = 0;
@@ -296 +302 @@
     uint32_t offset = 0;
     tr_bool  success = TRUE;
-    uint8_t * buffer = tr_sessionGetBuffer( tor->session );
-    const size_t buflen = SESSION_BUFFER_SIZE;
+    const size_t buflen = MAX_BLOCK_SIZE;
+    uint8_t * buffer = tr_new( uint8_t, buflen );
     SHA_CTX  sha;
 
@@ -314 +320 @@
     {
         const int len = MIN( bytesLeft, buflen );
-        success = !tr_ioRead( tor, pieceIndex, offset, len, buffer );
+        success = !tr_cacheReadBlock( tor->session->cache, tor, pieceIndex, offset, len, buffer );
         if( !success )
             break;
@@ -325 +331 @@
         SHA1_Final( setme, &sha );
 
-    tr_sessionReleaseBuffer( tor->session );
+    tr_free( buffer );
     return success;
 }

trunk/libtransmission/peer-mgr.c

@@ -22 +22 @@
 #include "bencode.h"
 #include "blocklist.h"
+#include "cache.h"
 #include "clients.h"
 #include "completion.h"
@@ -1499 +1500 @@
                         for( fileIndex=0; fileIndex<tor->info.fileCount; ++fileIndex ) {
                             const tr_file * file = &tor->info.files[fileIndex];
-                            if( ( file->firstPiece <= p ) && ( p <= file->lastPiece ) )
-                                if( tr_cpFileIsComplete( &tor->completion, fileIndex ) )
+                            if( ( file->firstPiece <= p ) && ( p <= file->lastPiece ) ) {
+                                if( tr_cpFileIsComplete( &tor->completion, fileIndex ) ) {
+fprintf( stderr, "flushing complete file %d (%s)\n", fileIndex, tor->info.files[fileIndex].name );
+                                    tr_cacheFlushFile( tor->session->cache, tor, fileIndex );
                                     tr_torrentFileCompleted( tor, fileIndex );
+                                }
+                            }
                         }
 

trunk/libtransmission/peer-msgs.c

@@ -23 +23 @@
 #include "transmission.h"
 #include "bencode.h"
+#include "cache.h"
 #include "completion.h"
 #include "crypto.h"
-#include "inout.h"
 #ifdef WIN32
 #include "net.h" /* for ECONN */
@@ -1212 +1212 @@
     {
         const struct peer_request * req = msgs->peerAskedFor + i;
-        tr_ioPrefetch( msgs->torrent, req->index, req->offset, req->length );
+        tr_cachePrefetchBlock( getSession(msgs)->cache, msgs->torrent, req->index, req->offset, req->length );
         ++msgs->prefetchCount;
     }
@@ -1602 +1602 @@
     **/
 
-    if(( err = tr_ioWrite( tor, req->index, req->offset, req->length, data )))
+    if(( err = tr_cacheWriteBlock( getSession(msgs)->cache, tor, req->index, req->offset, req->length, data )))
         return err;
 
@@ -1914 +1914 @@
             tr_peerIoWriteUint32( io, out, req.offset );
 
-            err = tr_ioRead( msgs->torrent, req.index, req.offset, req.length, EVBUFFER_DATA(out)+EVBUFFER_LENGTH(out) );
+            err = tr_cacheReadBlock( getSession(msgs)->cache, msgs->torrent, req.index, req.offset, req.length, EVBUFFER_DATA(out)+EVBUFFER_LENGTH(out) );
             if( err )
             {

trunk/libtransmission/ptrarray.c

@@ -103 +103 @@
 }
 
-static void
+void
 tr_ptrArrayErase( tr_ptrArray * t,
                   int           begin,
@@ -124 +124 @@
 **/
 
-static int
+int
 tr_ptrArrayLowerBound( const tr_ptrArray *                t,
                        const void *                       ptr,
@@ -185 +185 @@
     const int ret = tr_ptrArrayInsert( t, ptr, pos );
 
-    assertSortedAndUnique( t, compare );
+    //assertSortedAndUnique( t, compare );
     return ret;
 }

trunk/libtransmission/ptrarray.h

@@ -66 +66 @@
 }
 
+void tr_ptrArrayErase( tr_ptrArray * t, int begin, int end );
+
+
 
 /** @brief Peek at the array pointer and its size, for easy iteration */
@@ -101 +104 @@
 }
 
+int tr_ptrArrayLowerBound( const tr_ptrArray * array,
+                           const void * key,
+                           int compare( const void * arrayItem, const void * key ),
+                           tr_bool * exact_match );
+
 /** @brief Insert a pointer into the array at the position determined by the sort function
     @return the index of the stored pointer */

trunk/libtransmission/rpcimpl.c

@@ -1185 +1185 @@
     assert( idle_data == NULL );
 
+    if( tr_bencDictFindReal( args_in, TR_PREFS_KEY_MAX_CACHE_SIZE_MiB, &d ) )
+        tr_sessionSetCacheLimit( session, d );
     if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_ALT_SPEED_UP, &i ) )
         tr_sessionSetAltSpeed( session, TR_UP, i );
@@ -1324 +1326 @@
     tr_bencDictAddBool( d, TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED, tr_sessionUsesAltSpeedTime(s) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED, tr_blocklistIsEnabled( s ) );
+    tr_bencDictAddReal( d, TR_PREFS_KEY_MAX_CACHE_SIZE_MiB, tr_sessionGetCacheLimit( s ) );
     tr_bencDictAddInt ( d, "blocklist-size", tr_blocklistGetRuleCount( s ) );
     tr_bencDictAddStr ( d, "config-dir", tr_sessionGetConfigDir( s ) );

trunk/libtransmission/session.c

@@ -29 +29 @@
 #include "bencode.h"
 #include "blocklist.h"
+#include "cache.h"
 #include "crypto.h"
 #include "fdlimit.h"
@@ -52 +53 @@
 enum
 {
-    SAVE_INTERVAL_SECS = 120
+    SAVE_INTERVAL_SECS = 120,
+
+    DEFAULT_CACHE_SIZE_MiB = 2 /* 2 MiB */
 };
 
@@ -243 +246 @@
     assert( tr_bencIsDict( d ) );
 
-    tr_bencDictReserve( d, 35 );
+    tr_bencDictReserve( d, 60 );
     tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED,        FALSE );
+    tr_bencDictAddReal( d, TR_PREFS_KEY_MAX_CACHE_SIZE_MiB,       DEFAULT_CACHE_SIZE_MiB );
     tr_bencDictAddBool( d, TR_PREFS_KEY_DHT_ENABLED,              TRUE );
     tr_bencDictAddBool( d, TR_PREFS_KEY_LPD_ENABLED,              FALSE );
@@ -308 +312 @@
     assert( tr_bencIsDict( d ) );
 
-    tr_bencDictReserve( d, 30 );
+    tr_bencDictReserve( d, 60 );
     tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED,        tr_blocklistIsEnabled( s ) );
+    tr_bencDictAddReal( d, TR_PREFS_KEY_MAX_CACHE_SIZE_MiB,       tr_cacheGetLimit( s->cache ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_DHT_ENABLED,              s->isDHTEnabled );
     tr_bencDictAddBool( d, TR_PREFS_KEY_LPD_ENABLED,              s->isLPDEnabled );
@@ -507 +512 @@
     session->bandwidth = tr_bandwidthNew( session, NULL );
     session->lock = tr_lockNew( );
+    session->cache = tr_cacheNew( DEFAULT_CACHE_SIZE_MiB );
     session->tag = tr_strdup( tag );
     session->magicNumber = SESSION_MAGIC_NUMBER;
@@ -672 +678 @@
 
     /* misc features */
+    if( tr_bencDictFindReal( settings, TR_PREFS_KEY_MAX_CACHE_SIZE_MiB, &d ) )
+        tr_sessionSetCacheLimit( session, d );
     if( tr_bencDictFindBool( settings, TR_PREFS_KEY_LAZY_BITFIELD, &boolVal ) )
         tr_sessionSetLazyBitfieldEnabled( session, boolVal );
@@ -1606 +1614 @@
     tr_free( torrents );
 
+    tr_cacheFree( session->cache );
+    session->cache = NULL;
     tr_announcerClose( session );
     tr_statsClose( session );
@@ -1833 +1843 @@
 {
     return tr_sessionIsLPDEnabled( session );
+}
+
+/***
+****
+***/
+
+void
+tr_sessionSetCacheLimit( tr_session * session, double maxMiB )
+{
+    assert( tr_isSession( session ) );
+
+    tr_cacheSetLimit( session->cache, maxMiB );
+}
+
+double
+tr_sessionGetCacheLimit( const tr_session * session )
+{
+    assert( tr_isSession( session ) );
+
+    return tr_cacheGetLimit( session->cache );
 }
 

trunk/libtransmission/session.h

@@ -41 +41 @@
 struct tr_bandwidth;
 struct tr_bindsockets;
+struct tr_cache;
 struct tr_fdInfo;
 
@@ -150 +151 @@
     struct tr_shared *           shared;
 
+    struct tr_cache *            cache;
+
     struct tr_lock *             lock;
 

trunk/libtransmission/torrent.c

@@ -30 +30 @@
 #include "bandwidth.h"
 #include "bencode.h"
+#include "cache.h"
 #include "completion.h"
 #include "crypto.h" /* for tr_sha1 */
@@ -1517 +1518 @@
     tr_peerMgrStopTorrent( tor );
     tr_announcerTorrentStopped( tor );
+    tr_cacheFlushTorrent( tor->session->cache, tor );
 
     tr_fdTorrentClose( tor->session, tor->uniqueId );

trunk/libtransmission/transmission.h

@@ -164 +164 @@
 #define TR_PREFS_KEY_BIND_ADDRESS_IPV6             "bind-address-ipv6"
 #define TR_PREFS_KEY_BLOCKLIST_ENABLED             "blocklist-enabled"
+#define TR_PREFS_KEY_MAX_CACHE_SIZE_MiB            "cache-size-MiB"
 #define TR_PREFS_KEY_DHT_ENABLED                   "dht-enabled"
 #define TR_PREFS_KEY_LPD_ENABLED                   "lpd-enabled"
@@ -587 +588 @@
  * In public torrents, PEX is enabled by default.
  */
-void tr_sessionSetPexEnabled( tr_session  * session, tr_bool isEnabled );
-
-tr_bool            tr_sessionIsPexEnabled( const tr_session * session );
-
-tr_bool            tr_sessionIsDHTEnabled( const tr_session * session );
-
-void               tr_sessionSetDHTEnabled( tr_session * session, tr_bool );
-
-tr_bool            tr_sessionIsLPDEnabled( const tr_session * session );
-
-void               tr_sessionSetLPDEnabled( tr_session * session, tr_bool enabled );
-
-void               tr_sessionSetLazyBitfieldEnabled( tr_session * session,
-                                                     tr_bool       enabled );
-
-tr_bool            tr_sessionIsLazyBitfieldEnabled( const tr_session * session );
+void     tr_sessionSetPexEnabled( tr_session  * session, tr_bool isEnabled );
+tr_bool  tr_sessionIsPexEnabled( const tr_session * session );
+
+tr_bool  tr_sessionIsDHTEnabled( const tr_session * session );
+void     tr_sessionSetDHTEnabled( tr_session * session, tr_bool );
+
+tr_bool  tr_sessionIsLPDEnabled( const tr_session * session );
+void     tr_sessionSetLPDEnabled( tr_session * session, tr_bool enabled );
+
+void     tr_sessionSetCacheLimit( tr_session * session, double MiB );
+double   tr_sessionGetCacheLimit( const tr_session * session );
+
+void     tr_sessionSetLazyBitfieldEnabled( tr_session * session, tr_bool enabled );
+tr_bool  tr_sessionIsLazyBitfieldEnabled( const tr_session * session );
 
 tr_encryption_mode tr_sessionGetEncryption( tr_session * session );
-
-void               tr_sessionSetEncryption( tr_session          * session,
+void               tr_sessionSetEncryption( tr_session * session,
                                             tr_encryption_mode    mode );