Changeset 7874 for trunk

Timestamp:

Feb 11, 2009, 4:34:35 PM (13 years ago)

Author:

charles

Message:

(trunk libT) partial revert of r7825: back out the refillPulse() changes

Location:

trunk/libtransmission

Files:

• peer-common.h (modified) (1 diff)
• peer-mgr.c (modified) (13 diffs)
• peer-msgs.c (modified) (5 diffs)
• webseed.c (modified) (2 diffs)

trunk/libtransmission/peer-common.h

@@ -48 +48 @@
     TR_PEER_ERROR,
     TR_PEER_CANCEL,
-    TR_PEER_UPLOAD_ONLY
+    TR_PEER_UPLOAD_ONLY,
+    TR_PEER_NEED_REQ
 }
 PeerEventType;

trunk/libtransmission/peer-mgr.c

@@ +1 @@
+
 /*
  * This file Copyright (C) 2007-2009 Charles Kerr <charles@transmissionbt.com>
@@ -127 +128 @@
     tr_ptrArray     peers; /* tr_peer */
     tr_ptrArray     webseeds; /* tr_webseed */
+    tr_timer *      refillTimer;
     tr_torrent *    tor;
     tr_peer *       optimistic; /* the optimistic peer, or NULL if none */
@@ -140 +142 @@
     tr_timer        * bandwidthTimer;
     tr_timer        * rechokeTimer;
-    tr_timer        * refillTimer;
     tr_timer        * reconnectTimer;
 };
@@ -380 +381 @@
 
     memcpy( hash, t->hash, SHA_DIGEST_LENGTH );
+
+    tr_timerFree( &t->refillTimer );
 
     tr_ptrArrayDestruct( &t->webseeds, (PtrArrayForeachFunc)tr_webseedFree );
@@ -423 +426 @@
 static int bandwidthPulse ( void * vmgr );
 static int rechokePulse   ( void * vmgr );
-static int refillPulse    ( void * vmgr );
 static int reconnectPulse ( void * vmgr );
 
@@ -435 +437 @@
     m->bandwidthTimer = tr_timerNew( session, bandwidthPulse, m, BANDWIDTH_PERIOD_MSEC );
     m->rechokeTimer   = tr_timerNew( session, rechokePulse,   m, RECHOKE_PERIOD_MSEC );
-    m->refillTimer    = tr_timerNew( session, refillPulse,    m, REFILL_PERIOD_MSEC );
     m->reconnectTimer = tr_timerNew( session, reconnectPulse, m, RECONNECT_PERIOD_MSEC );
 
@@ -449 +450 @@
 
     tr_timerFree( &manager->reconnectTimer );
-    tr_timerFree( &manager->refillTimer );
     tr_timerFree( &manager->rechokeTimer );
     tr_timerFree( &manager->bandwidthTimer );
@@ -735 +735 @@
 }
 
-static void
-refillTorrent( Torrent * t )
+static int
+refillPulse( void * vtorrent )
 {
     tr_block_index_t block;
@@ -744 +744 @@
     tr_webseed ** webseeds;
     struct tr_blockIterator * blockIterator;
+    Torrent * t = vtorrent;
     tr_torrent * tor = t->tor;
 
     if( !t->isRunning )
-        return;
+        return TRUE;
     if( tr_torrentIsSeed( t->tor ) )
-        return;
-
+        return TRUE;
+
+    torrentLock( t );
     tordbg( t, "Refilling Request Buffers..." );
 
@@ -822 +824 @@
     tr_free( webseeds );
     tr_free( peers );
-}
-
-static int
-refillPulse( void * vmgr )
-{
-    tr_torrent * tor = NULL;
-    tr_peerMgr * mgr = vmgr;
-    managerLock( mgr );
-
-    while(( tor = tr_torrentNext( mgr->session, tor )))
-        if( tor->isRunning && !tr_torrentIsSeed( tor ) )
-            refillTorrent( tor->torrentPeers );
-
-    managerUnlock( mgr );
-    return TRUE;
+
+    t->refillTimer = NULL;
+    torrentUnlock( t );
+    return FALSE;
 }
 
@@ -883 +874 @@
     tor->corruptCur += byteCount;
     tor->downloadedCur -= MIN( tor->downloadedCur, byteCount );
+}
+
+static void
+refillSoon( Torrent * t )
+{
+    if( t->refillTimer == NULL )
+        t->refillTimer = tr_timerNew( t->manager->session,
+                                      refillPulse, t,
+                                      REFILL_PERIOD_MSEC );
 }
 
@@ -950 +950 @@
                 a->uploadOnly = e->uploadOnly ? UPLOAD_ONLY_YES : UPLOAD_ONLY_NO;
             }
+            break;
+
+        case TR_PEER_NEED_REQ:
+            refillSoon( t );
             break;
 
@@ -1513 +1517 @@
 tr_peerMgrStartTorrent( tr_torrent * tor )
 {
-    tor->torrentPeers->isRunning = TRUE;
+    Torrent * t = tor->torrentPeers;
+
+    managerLock( t->manager );
+
+    assert( t );
+
+    if( !t->isRunning )
+    {
+        t->isRunning = TRUE;
+
+        if( !tr_ptrArrayEmpty( &t->webseeds ) )
+            refillSoon( t );
+    }
+
+    managerUnlock( t->manager );
 }
 

trunk/libtransmission/peer-msgs.c

@@ -421 +421 @@
 
 static void
+fireNeedReq( tr_peermsgs * msgs )
+{
+    tr_peer_event e = blankEvent;
+    e.eventType = TR_PEER_NEED_REQ;
+    publish( msgs, &e );
+}
+
+static void
 firePeerProgress( tr_peermsgs * msgs )
 {
@@ -646 +654 @@
     if( i != msgs->peer->clientIsInterested )
         sendInterest( msgs, i );
+    if( i )
+        fireNeedReq( msgs );
 }
 
@@ -810 +820 @@
         dbgmsg( msgs, "pump sent %d requests, now have %d active and %d queued",
                 sent, msgs->clientAskedFor.len, msgs->clientWillAskFor.len );
+
+    if( len < max )
+        fireNeedReq( msgs );
 }
 
@@ -1354 +1367 @@
             dbgmsg( msgs, "got Unchoke" );
             msgs->peer->clientIsChoked = 0;
+            fireNeedReq( msgs );
             break;
 
@@ -1379 +1393 @@
 
         case BT_BITFIELD:
+        {
             dbgmsg( msgs, "got a bitfield" );
             tr_peerIoReadBytes( msgs->peer->io, inbuf, msgs->peer->have->bits, msglen );
             updatePeerProgress( msgs );
+            fireNeedReq( msgs );
             break;
+        }
 
         case BT_REQUEST:

trunk/libtransmission/webseed.c

@@ -60 +60 @@
     if( w->callback )
         w->callback( NULL, e, w->callback_userdata );
+}
+
+static void
+fireNeedReq( tr_webseed * w )
+{
+    tr_peer_event e = blankEvent;
+    e.eventType = TR_PEER_NEED_REQ;
+    publish( w, &e );
 }
 
@@ -173 +181 @@
             if( w->dead )
                 tr_webseedFree( w );
-            else
+            else  {
                 fireClientGotBlock( w, w->pieceIndex, w->pieceOffset, w->byteCount );
+                fireNeedReq( w );
+            }
         }
     }