Changeset 8122

Timestamp:

Apr 2, 2009, 5:30:29 PM (14 years ago)

Author:

charles

Message:

(trunk) modify tr_torrentParse() and tr_torrentNew() arguments s.t. they use the ctor's session instead of passing it in again. Allow a NULL session pointer for some cases of tr_torrentParse().

Location:

trunk

Files:

• cli/cli.c (modified) (3 diffs)
• daemon/daemon.c (modified) (1 diff)
• gtk/add-dialog.c (modified) (2 diffs)
• gtk/tr-core.c (modified) (1 diff)
• gtk/tr-torrent.c (modified) (1 diff)
• libtransmission/fdlimit.c (modified) (1 diff)
• libtransmission/metainfo.c (modified) (1 diff)
• libtransmission/rpcimpl.c (modified) (1 diff)
• libtransmission/session.c (modified) (2 diffs)
• libtransmission/torrent-ctor.c (modified) (3 diffs)
• libtransmission/torrent.c (modified) (7 diffs)
• libtransmission/transmission.h (modified) (4 diffs)
• macosx/Controller.m (modified) (4 diffs)
• macosx/DragOverlayWindow.m (modified) (1 diff)
• macosx/Torrent.m (modified) (4 diffs)

trunk/cli/cli.c

@@ -356 +356 @@
         tr_info info;
 
-        if( !tr_torrentParse( h, ctor, &info ) )
+        if( !tr_torrentParse( ctor, &info ) )
         {
             int          i;
@@ -392 +392 @@
         tr_info info;
 
-        if( !tr_torrentParse( h, ctor, &info ) )
+        if( !tr_torrentParse( ctor, &info ) )
         {
             dumpInfo( stdout, &info );
@@ -402 +402 @@
     }
 
-    tor = tr_torrentNew( h, ctor, &error );
+    tor = tr_torrentNew( ctor, &error );
     tr_ctorFree( ctor );
     if( !tor )

trunk/daemon/daemon.c

@@ -191 +191 @@
         int err = tr_ctorSetMetainfoFromFile( ctor, filename );
         if( !err )
-            tr_torrentNew( session, ctor, &err );
+            tr_torrentNew( ctor, &err );
 
         tr_ctorFree( ctor );

trunk/gtk/add-dialog.c

@@ -172 +172 @@
         int          new_file = 0;
         tr_torrent * torrent;
-        tr_session * session = tr_core_session( data->core );
 
         if( filename
@@ -187 +186 @@
         tr_ctorSetDeleteSource( data->ctor, FALSE );
 
-        if( ( torrent = tr_torrentNew( session, data->ctor, &err ) ) )
+        if( ( torrent = tr_torrentNew( data->ctor, &err ) ) )
         {
             removeOldTorrent( data );

trunk/gtk/tr-core.c

@@ -928 +928 @@
         {
             tr_info inf;
-            int err = tr_torrentParse( session, ctor, &inf );
+            int err = tr_torrentParse( ctor, &inf );
 
             switch( err )

trunk/gtk/tr-torrent.c

@@ -199 +199 @@
     tr_ctorGetDeleteSource( ctor, &doTrash );
     tr_ctorSetDeleteSource( ctor, FALSE );
-    tor = tr_torrentNew( session, ctor, errcode );
+    tor = tr_torrentNew( ctor, errcode );
 
     if( tor && doTrash )

trunk/libtransmission/fdlimit.c

@@ -444 +444 @@
         else if( o->syncAt <= time( NULL ) ) {
             dbgmsg( "fsync()ing file '%s' in slot #%d", o->filename, i );
-            fsync( o->fd );
+            //fsync( o->fd );
 #ifdef HAVE_POSIX_FADVISE
             /* TODO: test performance with and without this */

trunk/libtransmission/metainfo.c

@@ -441 +441 @@
     /* filename of Transmission's copy */
     tr_free( inf->torrent );
-    inf->torrent = getTorrentFilename( session, inf );
+    inf->torrent = session ?  getTorrentFilename( session, inf ) : NULL;
 
     return NULL;

trunk/libtransmission/rpcimpl.c

@@ -746 +746 @@
     int err = 0;
     const char * result = NULL;
-    tr_torrent * tor = tr_torrentNew( data->session, ctor, &err );
+    tr_torrent * tor = tr_torrentNew( ctor, &err );
 
     tr_ctorFree( ctor );

trunk/libtransmission/session.c

@@ -1369 +1369 @@
                 char * path = tr_buildPath( dirname, d->d_name, NULL );
                 tr_ctorSetMetainfoFromFile( ctor, path );
-                if(( tor = tr_torrentNew( session, ctor, NULL )))
+                if(( tor = tr_torrentNew( ctor, NULL )))
                 {
                     tr_list_append( &list, tor );
@@ -1620 +1620 @@
                 char * path = tr_buildPath( dirname, d->d_name, NULL );
                 tr_ctorSetMetainfoFromFile( ctor, path );
-                if( !tr_torrentParse( session, ctor, &inf ) )
+                if( !tr_torrentParse( ctor, &inf ) )
                 {
                     tr_list_append( &list, tr_strdup( inf.hashString ) );

trunk/libtransmission/torrent-ctor.c

@@ -292 +292 @@
 }
 
+tr_session*
+tr_ctorGetSession( const tr_ctor * ctor )
+{
+    return (tr_session*) ctor->session;
+}
+
 /***
 ****
@@ -302 +308 @@
 
     ctor->session = session;
-    tr_ctorSetPeerLimit( ctor, TR_FALLBACK, session->peerLimitPerTorrent );
     tr_ctorSetPaused( ctor, TR_FALLBACK, FALSE );
-    tr_ctorSetDownloadDir( ctor, TR_FALLBACK, session->downloadDir );
+    if( session != NULL ) {
+        tr_ctorSetPeerLimit( ctor, TR_FALLBACK, session->peerLimitPerTorrent );
+        tr_ctorSetDownloadDir( ctor, TR_FALLBACK, session->downloadDir );
+    }
     tr_ctorSetSave( ctor, TRUE );
     return ctor;
@@ -317 +325 @@
     tr_free( ctor );
 }
-

trunk/libtransmission/torrent.c

@@ -504 +504 @@
 
 static void
-torrentRealInit( tr_session      * session,
-                 tr_torrent      * tor,
-                 const tr_ctor   * ctor )
+torrentRealInit( tr_torrent * tor, const tr_ctor * ctor )
 {
     int          doStart;
@@ -514 +512 @@
     static int   nextUniqueId = 1;
     tr_info    * info = &tor->info;
+    tr_session * session = tr_ctorGetSession( ctor );
+
+    assert( session != NULL );
 
     tr_globalLock( session );
@@ -648 +649 @@
 
 int
-tr_torrentParse( const tr_session  * session,
-                 const tr_ctor     * ctor,
+tr_torrentParse( const tr_ctor     * ctor,
                  tr_info           * setmeInfo )
 {
@@ -656 +656 @@
     tr_info         tmp;
     const tr_benc * metainfo;
+    tr_session    * session = tr_ctorGetSession( ctor );
 
     if( setmeInfo == NULL )
@@ -670 +671 @@
         err = TR_EINVALID;
 
-    if( !err && tr_torrentExists( session, setmeInfo->hash ) )
+    if( !err && session && tr_torrentExists( session, setmeInfo->hash ) )
         err = TR_EDUPLICATE;
 
@@ -680 +681 @@
 
 tr_torrent *
-tr_torrentNew( tr_session     * session,
-               const tr_ctor  * ctor,
+tr_torrentNew( const tr_ctor  * ctor,
                int            * setmeError )
 {
@@ -688 +688 @@
     tr_torrent * tor = NULL;
 
-    err = tr_torrentParse( session, ctor, &tmpInfo );
+    assert( ctor != NULL );
+    assert( tr_isSession( tr_ctorGetSession( ctor ) ) );
+
+    err = tr_torrentParse( ctor, &tmpInfo );
     if( !err )
     {
         tor = tr_new0( tr_torrent, 1 );
         tor->info = tmpInfo;
-        torrentRealInit( session, tor, ctor );
+        torrentRealInit( tor, ctor );
     }
     else if( setmeError )

trunk/libtransmission/transmission.h

@@ -755 +755 @@
 struct tr_benc;
 
-tr_ctor*    tr_ctorNew( const tr_session * session );
+/* it's okay to use NULL here if you're only parsing the torrent.
+ * @see tr_torrentParse() */
+tr_ctor*    tr_ctorNew( const tr_session * session_or_NULL );
 
 void        tr_ctorFree( tr_ctor * ctor );
@@ -809 +811 @@
                                     tr_bool        * setmeDoDelete );
 
+tr_session* tr_ctorGetSession( const tr_ctor * ctor );
+
 /* returns NULL if tr_ctorSetMetainfoFromFile() wasn't used */
 const char* tr_ctorGetSourceFile( const tr_ctor * ctor );
@@ -826 +830 @@
  * metainfo is stored in setme_info and should be freed by the
  * caller via tr_metainfoFree().
- */
-int tr_torrentParse( const tr_session  * session,
-                     const tr_ctor     * ctor,
-                     tr_info           * setme_info_or_NULL );
+ *
+ * If the constructor's session variable is NULL,
+ * info.torrent will be NULL and the duplicate check will not be performed.
+ */
+int tr_torrentParse( const tr_ctor * ctor,
+                     tr_info       * setme_info_or_NULL );
 
 /** @brief free a metainfo
@@ -840 +846 @@
             TR_EINVALID if the torrent couldn't be parsed, or
             TR_EDUPLICATE if there's already a matching torrent object. */
-tr_torrent * tr_torrentNew( tr_session      * session,
-                            const tr_ctor   * ctor,
+tr_torrent * tr_torrentNew( const tr_ctor   * ctor,
                             int             * setmeError );
 

trunk/macosx/Controller.m

@@ -794 +794 @@
         tr_ctor * ctor = tr_ctorNew(fLib);
         tr_ctorSetMetainfoFromFile(ctor, [torrentPath UTF8String]);
-        int result = tr_torrentParse(fLib, ctor, &info);
+        int result = tr_torrentParse(ctor, &info);
         if (result != TR_OK)
         {
@@ -2458 +2458 @@
         tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
         
-        switch (tr_torrentParse(fLib, ctor, NULL))
+        switch (tr_torrentParse(ctor, NULL))
         {
             case TR_OK:
@@ -2698 +2698 @@
                 tr_ctor * ctor = tr_ctorNew(fLib);
                 tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
-                switch (tr_torrentParse(fLib, ctor, NULL))
+                switch (tr_torrentParse(ctor, NULL))
                 {
                     case TR_OK:
@@ -2762 +2762 @@
                 tr_ctor * ctor = tr_ctorNew(fLib);
                 tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
-                switch (tr_torrentParse(fLib, ctor, NULL))
+                switch (tr_torrentParse(ctor, NULL))
                 {
                     case TR_OK:

trunk/macosx/DragOverlayWindow.m

@@ -89 +89 @@
             tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
             tr_info info;
-            if (tr_torrentParse(fLib, ctor, &info) == TR_OK)
+            if (tr_torrentParse(ctor, &info) == TR_OK)
             {
                 count++;

trunk/macosx/Torrent.m

@@ -1624 +1624 @@
         {
             tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);
-            if (tr_torrentParse(lib, ctor, &info) == TR_OK)
+            if (tr_torrentParse(ctor, &info) == TR_OK)
             {
                 NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
@@ -1630 +1630 @@
                 tr_ctorSetDownloadDir(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
                 
-                fHandle = tr_torrentNew(lib, ctor, NULL);
+                fHandle = tr_torrentNew(ctor, NULL);
             }
             tr_metainfoFree(&info);
@@ -1637 +1637 @@
         {
             tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]);
-            if (tr_torrentParse(lib, ctor, &info) == TR_OK)
+            if (tr_torrentParse(ctor, &info) == TR_OK)
             {
                 NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
@@ -1643 +1643 @@
                 tr_ctorSetDownloadDir(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
                 
-                fHandle = tr_torrentNew(lib, ctor, NULL);
+                fHandle = tr_torrentNew(ctor, NULL);
             }
             tr_metainfoFree(&info);