Changeset 12424

Timestamp:

May 10, 2011, 4:46:44 AM (11 years ago)

Author:

jordan

Message:

(trunk libT) CPU improvement in torrent.c's torrentInit()

Add the new torrent to the session's torrent list by prepending it instead of appending it. That way we don't have to walk the list in order to add it. tr_session.torrentList is an unordered list, so there's no real difference between prepending and appending.

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (2 diffs)
• torrent.c (modified) (1 diff)

trunk/libtransmission/peer-mgr.c

@@ -2829 +2829 @@
     const int peerCount = tr_ptrArraySize( &t->peers );
     const time_t now = tr_time( );
+
+    /* some cases where this function isn't necessary */
+    if( tr_torrentIsSeed( t->tor ) )
+        return;
+    if ( tr_torrentIsPieceTransferAllowed( t->tor, TR_PEER_TO_CLIENT ) )
+        return;
 
     /* decide HOW MANY peers to be interested in */
@@ -3154 +3160 @@
         if( tor->isRunning ) {
             Torrent * t = tor->torrentPeers;
-            if( tr_ptrArrayEmpty( &t->peers ) )
-                continue;
-            rechokeUploads( t, now );
-            if( !tr_torrentIsSeed( tor ) && tr_torrentIsPieceTransferAllowed( tor, TR_PEER_TO_CLIENT ) )
+            if( !tr_ptrArrayEmpty( &t->peers ) ) {
+                rechokeUploads( t, now );
                 rechokeDownloads( t );
+            }
         }
     }

trunk/libtransmission/torrent.c

@@ -869 +869 @@
     }
 
-    {
-        tr_torrent * it = NULL;
-        tr_torrent * last = NULL;
-        while( ( it = tr_torrentNext( session, it ) ) )
-            last = it;
-
-        if( !last )
-            session->torrentList = tor;
-        else
-            last->next = tor;
-        ++session->torrentCount;
-    }
+    /* add the torrent to tr_session.torrentList */
+    tor->next = session->torrentList;
+    session->torrentList = tor;
+    ++session->torrentCount;
 
     /* if we don't have a local .torrent file already, assume the torrent is new */