Changeset 7710 for trunk/libtransmission/torrent.c

Timestamp:

Jan 13, 2009, 9:00:05 PM (14 years ago)

Author:

charles

Message:

(trunk libT) peerMgr: operate directly on tr_torrent and not peerMgr+torrentHash

File:

• trunk/libtransmission/torrent.c (modified) (9 diffs)

trunk/libtransmission/torrent.c

@@ -206 +206 @@
                 if( event->allAreSeeds )
                     pex[i].flags |= ADDED_F_SEED_FLAG;
-                tr_peerMgrAddPex( tor->session->peerMgr, tor->info.hash,
-                                  TR_PEER_FROM_TRACKER, pex + i );
+                tr_peerMgrAddPex( tor, TR_PEER_FROM_TRACKER, pex + i );
             }
 
@@ -745 +744 @@
                              &s->downloaders );
 
-    tr_peerMgrTorrentStats( tor->session->peerMgr,
-                            tor->info.hash,
+    tr_peerMgrTorrentStats( tor,
                             &s->peersKnown,
                             &s->peersConnected,
@@ -800 +798 @@
     {
         tr_piece_index_t i;
-        tr_bitfield *    peerPieces = tr_peerMgrGetAvailable(
-            tor->session->peerMgr,
-            tor->info.
-            hash );
+        tr_bitfield *    peerPieces = tr_peerMgrGetAvailable( tor );
         s->desiredAvailable = 0;
         for( i = 0; i < tor->info.pieceCount; ++i )
@@ -920 +915 @@
 tr_torrentWebSpeeds( const tr_torrent * tor )
 {
-    return tor ? tr_peerMgrWebSpeeds( tor->session->peerMgr, tor->info.hash )
-           : NULL;
+    return tor ? tr_peerMgrWebSpeeds( tor ) : NULL;
 }
 
@@ -931 +925 @@
 
     if( tor )
-        ret = tr_peerMgrPeerStats( tor->session->peerMgr,
-                                   tor->info.hash, peerCount );
+        ret = tr_peerMgrPeerStats( tor, peerCount );
 
     return ret;
@@ -949 +942 @@
                         int                size )
 {
-    tr_peerMgrTorrentAvailability( tor->session->peerMgr,
-                                   tor->info.hash,
-                                   tab, size );
+    tr_peerMgrTorrentAvailability( tor, tab, size );
 }
 
@@ -1013 +1004 @@
     tr_globalLock( session );
 
-    tr_peerMgrRemoveTorrent( session->peerMgr, tor->info.hash );
+    tr_peerMgrRemoveTorrent( tor );
 
     tr_cpDestruct( &tor->completion );
@@ -1066 +1057 @@
     tor->startDate = time( NULL );
     tr_trackerStart( tor->tracker );
-    tr_peerMgrStartTorrent( tor->session->peerMgr, tor->info.hash );
+    tr_peerMgrStartTorrent( tor );
 
     tr_globalUnlock( tor->session );
@@ -1155 +1146 @@
 
     tr_verifyRemove( tor );
-    tr_peerMgrStopTorrent( tor->session->peerMgr, tor->info.hash );
+    tr_peerMgrStopTorrent( tor );
     tr_trackerStop( tor->tracker );