Changeset 8477

Timestamp:

May 22, 2009, 4:03:12 AM (14 years ago)

Author:

charles

Message:

(1.6x libT) backport r8465, which defers building the hash-to-torrent-filename lookup table until someone asks for it

Location:

branches/1.6x/libtransmission

Files:

• metainfo.c (modified) (1 diff)
• session.c (modified) (7 diffs)
• session.h (modified) (1 diff)

branches/1.6x/libtransmission/metainfo.c

@@ -75 +75 @@
 }
 
+/* this is for really old versions of T and will probably be removed someday */
 void
 tr_metainfoMigrate( tr_session * session,

branches/1.6x/libtransmission/session.c

@@ -51 +51 @@
             tr_deepLog( __FILE__, __LINE__, NULL, __VA_ARGS__ ); \
     } while( 0 )
+
+struct tr_metainfo_lookup
+{
+    char    hashString[2 * SHA_DIGEST_LENGTH + 1]; 
+    char *  filename;
+};
 
 static tr_port
@@ -446 +452 @@
 }
 
-static void metainfoLookupRescan( tr_session * );
 static void tr_sessionInitImpl( void * );
 static void onAltTimer( int, short, void* );
@@ -757 +762 @@
     tr_statsInit( session );
     session->web = tr_webInit( session );
-    metainfoLookupRescan( session );
     session->isWaiting = FALSE;
     dbgmsg( "returning session %p; session->tracker is %p", session, session->tracker );
@@ -1686 +1690 @@
 
     return strcmp( a, b->hashString );
-}
-
-const char*
-tr_sessionFindTorrentFile( const tr_session * session,
-                           const char       * hashStr )
-{
-    struct tr_metainfo_lookup * l = bsearch( hashStr,
-                                             session->metainfoLookup,
-                                             session->metainfoLookupCount,
-                                             sizeof( struct tr_metainfo_lookup ),
-                                             compareHashStringToLookupEntry );
-
-    return l ? l->filename : NULL;
 }
 
@@ -1759 +1750 @@
 }
 
+static struct tr_metainfo_lookup *
+metainfoLookup( const tr_session * session, const char * hashString )
+{
+    /* because only the mac client uses metainfoLookup, and because building
+     * the lookup is expensive, we hold off on building it until the client
+     * actually asks to look up a hash... */
+    if( !session->metainfoLookupCount )
+        metainfoLookupRescan( (tr_session*)session );
+
+    return bsearch( hashString,
+                    session->metainfoLookup,
+                    session->metainfoLookupCount,
+                    sizeof( struct tr_metainfo_lookup ),
+                    compareHashStringToLookupEntry );
+}
+
+const char*
+tr_sessionFindTorrentFile( const tr_session  * session,
+                           const char        * hashString )
+{
+    const struct tr_metainfo_lookup * l = metainfoLookup( session, hashString );
+
+    return l ? l->filename : NULL;
+}
+
 void
 tr_sessionSetTorrentFile( tr_session * session,
@@ -1764 +1780 @@
                           const char * filename )
 {
-    struct tr_metainfo_lookup * l = bsearch( hashString,
-                                             session->metainfoLookup,
-                                             session->metainfoLookupCount,
-                                             sizeof( struct tr_metainfo_lookup ),
-                                             compareHashStringToLookupEntry );
-
+    struct tr_metainfo_lookup * l;
+
+    /* since we walk session->configDir/torrents/ to build the lookup table,
+     * and tr_sessionSetTorrentFile() is just to tell us there's a new file
+     * in that same directory, we don't need to do anything here if the
+     * lookup table hasn't been built yet */
+    if( session->metainfoLookup == NULL )
+        return;
+
+    l = metainfoLookup( session, hashString );
     if( l )
     {
@@ -1943 +1963 @@
     return tr_rpcGetBindAddress( session->rpcServer );
 }
-
-/***
-****
-***/
-
-tr_bool
-tr_sessionIsProxyEnabled( const tr_session * session )
-{
-    assert( tr_isSession( session ) );
-
-    return session->isProxyEnabled;
-}
-
-void
 tr_sessionSetProxyEnabled( tr_session * session,
                            tr_bool      isEnabled )

branches/1.6x/libtransmission/session.h

@@ -48 +48 @@
 const uint8_t* tr_getPeerId( void );
 
-struct tr_metainfo_lookup
-{
-    char    hashString[2 * SHA_DIGEST_LENGTH + 1];
-    char *  filename;
-};
-
 struct tr_address;
 struct tr_bandwidth;
+struct tr_metainfo_lookup;
 
 struct tr_session