Changeset 12074

Timestamp:

Mar 3, 2011, 6:33:24 PM (12 years ago)

Author:

jordan

Message:

(trunk libT) remove the unused tr_ratecontrol code. switch webseed over to using tr_bandwidth.

Location:

trunk/libtransmission

Files:

• Makefile.am (modified) (2 diffs)
• bandwidth.h (modified) (1 diff)
• peer-mgr.c (modified) (6 diffs)
• peer-mgr.h (modified) (3 diffs)
• ratecontrol.c (deleted)
• ratecontrol.h (deleted)
• torrent.c (modified) (2 diffs)
• webseed.c (modified) (6 diffs)

trunk/libtransmission/Makefile.am

@@ -47 +47 @@
     port-forwarding.c \
     ptrarray.c \
-    ratecontrol.c \
     resume.c \
     rpcimpl.c \
@@ -100 +99 @@
     port-forwarding.h \
     ptrarray.h \
-    ratecontrol.h \
     resume.h \
     rpcimpl.h \

trunk/libtransmission/bandwidth.h

@@ -17 +17 @@
 #ifndef TR_BANDWIDTH_H
 #define TR_BANDWIDTH_H
+
+#include <assert.h>
 
 #include "transmission.h"

trunk/libtransmission/peer-mgr.c

@@ -379 +379 @@
 }
 
-static tr_peer*
-peerNew( struct peer_atom * atom )
-{
-    tr_peer * peer = tr_new0( tr_peer, 1 );
+void
+tr_peerConstruct( tr_peer * peer )
+{
+    memset( peer, 0, sizeof( tr_peer ) );
 
     peer->have = TR_BITSET_INIT;
-
-    peer->atom = atom;
-    atom->peer = peer;
 
     tr_historyConstruct( &peer->blocksSentToClient,  CANCEL_HISTORY_SEC, ( RECHOKE_PERIOD_MSEC / 1000 ) );
@@ -393 +390 @@
     tr_historyConstruct( &peer->cancelsSentToClient, CANCEL_HISTORY_SEC, ( RECHOKE_PERIOD_MSEC / 1000 ) );
     tr_historyConstruct( &peer->cancelsSentToPeer,   CANCEL_HISTORY_SEC, ( REFILL_UPKEEP_PERIOD_MSEC / 1000 ) );
+}
+
+static tr_peer*
+peerNew( struct peer_atom * atom )
+{
+    tr_peer * peer = tr_new( tr_peer, 1 );
+    tr_peerConstruct( peer );
+
+    peer->atom = atom;
+    atom->peer = peer;
 
     return peer;
@@ -417 +424 @@
 static void peerDeclinedAllRequests( Torrent *, const tr_peer * );
 
-static void
-peerDelete( Torrent * t, tr_peer * peer )
+void
+tr_peerDestruct( tr_torrent * tor, tr_peer * peer )
 {
     assert( peer != NULL );
 
-    peerDeclinedAllRequests( t, peer );
+    peerDeclinedAllRequests( tor->torrentPeers, peer );
 
     if( peer->msgs != NULL )
         tr_peerMsgsFree( peer->msgs );
 
-    tr_peerIoClear( peer->io );
-    tr_peerIoUnref( peer->io ); /* balanced by the ref in handshakeDoneCB() */
+    if( peer->io ) {
+        tr_peerIoClear( peer->io );
+        tr_peerIoUnref( peer->io ); /* balanced by the ref in handshakeDoneCB() */
+    }
 
     tr_historyDestruct( &peer->blocksSentToClient  );
@@ -439 +448 @@
     tr_free( peer->client );
     peer->atom->peer = NULL;
-
+}
+
+static void
+peerDelete( Torrent * t, tr_peer * peer )
+{
+    tr_peerDestruct( t->tor, peer );
     tr_free( peer );
 }
@@ -2458 +2472 @@
     }
 
-    if( peer->progress >= 1.0 )
+    if( peer->atom && ( peer->progress >= 1.0 ) )
         atomSetSeed( tor->torrentPeers, peer->atom );
 }
@@ -2580 +2594 @@
     *setmeWebseedsSendingToUs = countActiveWebseeds( t );
 }
-
-int
-tr_peerMgrGetWebseedSpeed_Bps( const tr_torrent * tor, uint64_t now )
-{
-    int i;
-    int tmp;
-    int ret = 0;
-
-    const Torrent * t = tor->torrentPeers;
-    const int n = tr_ptrArraySize( &t->webseeds );
-    const tr_webseed ** webseeds = (const tr_webseed**) tr_ptrArrayBase( &t->webseeds );
-
-    for( i=0; i<n; ++i )
-        if( tr_webseedGetSpeed_Bps( webseeds[i], now, &tmp ) )
-            ret += tmp;
-
-    return ret;
-}
-
 
 double*

trunk/libtransmission/peer-mgr.h

@@ -69 +69 @@
 
 
-struct tr_bandwidth;
 struct tr_peerIo;
 struct tr_peermsgs;
@@ -132 +131 @@
 }
 tr_peer;
+
+void tr_peerConstruct( struct tr_peer * peer );
+
+void tr_peerDestruct( tr_torrent * tor, struct tr_peer * peer );
+
 
 static inline tr_bool
@@ -248 +252 @@
                                           int              * setmeCount );
 
-int tr_peerMgrGetWebseedSpeed_Bps( const tr_torrent * tor, uint64_t now );
-
 double* tr_peerMgrWebSpeeds_KBps( const tr_torrent * tor );
 

trunk/libtransmission/torrent.c

@@ -1139 +1139 @@
     int                     usableSeeds;
     uint64_t                now;
-    double                  d;
     uint64_t                seedRatioBytesLeft;
     uint64_t                seedRatioBytesGoal;
@@ -1171 +1170 @@
 
     now = tr_time_msec( );
-    d = tr_peerMgrGetWebseedSpeed_Bps( tor, now );
     s->rawUploadSpeed_KBps     = toSpeedKBps( tr_bandwidthGetRawSpeed_Bps  ( tor->bandwidth, now, TR_UP ) );
     s->pieceUploadSpeed_KBps   = toSpeedKBps( tr_bandwidthGetPieceSpeed_Bps( tor->bandwidth, now, TR_UP ) );
-    s->rawDownloadSpeed_KBps   = toSpeedKBps( d + tr_bandwidthGetRawSpeed_Bps  ( tor->bandwidth, now, TR_DOWN ) );
-    s->pieceDownloadSpeed_KBps = toSpeedKBps( d + tr_bandwidthGetPieceSpeed_Bps( tor->bandwidth, now, TR_DOWN ) );
+    s->rawDownloadSpeed_KBps   = toSpeedKBps( tr_bandwidthGetRawSpeed_Bps  ( tor->bandwidth, now, TR_DOWN ) );
+    s->pieceDownloadSpeed_KBps = toSpeedKBps( tr_bandwidthGetPieceSpeed_Bps( tor->bandwidth, now, TR_DOWN ) );
 
     usableSeeds += tor->info.webseedCount;

trunk/libtransmission/webseed.c

@@ -17 +17 @@
 
 #include "transmission.h"
+#include "bandwidth.h"
 #include "cache.h"
 #include "inout.h" /* tr_ioFindFileLocation() */
 #include "list.h"
-#include "ratecontrol.h"
 #include "peer-mgr.h"
 #include "torrent.h"
@@ -42 +42 @@
 {
     tr_peer              parent;
-    tr_ratecontrol       download_rate;
+    tr_bandwidth         bandwidth;
     tr_session         * session;
     tr_peer_callback   * callback;
@@ -65 +65 @@
 webseed_free( struct tr_webseed * w )
 {
-    tr_bitsetDestruct( &w->parent.have );
-    tr_free( w->parent.client );
-
+    tr_torrent * tor = tr_torrentFindFromId( w->session, w->torrent_id );
+
+    /* webseed destruct */
     event_free( w->timer );
-    tr_rcDestruct( &w->download_rate );
+    tr_bandwidthDestruct( &w->bandwidth );
     tr_free( w->base_url );
+
+    /* parent class destruct */
+    tr_peerDestruct( tor, &w->parent );
+
     tr_free( w );
 }
@@ -126 +130 @@
     if( ( info->n_added > 0 ) && !w->is_stopping )
     {
-        tr_rcTransferred( &w->download_rate, info->n_added );
+        tr_bandwidthUsed( &w->bandwidth, TR_DOWN, info->n_added, TRUE, tr_time_msec( ) );
         fire_client_got_data( w, info->n_added );
     }
@@ -297 +301 @@
 {
     const tr_bool is_active = webseed_has_tasks( w );
-    *setme_Bps = is_active ? tr_rcRate_Bps( &w->download_rate, now ) : 0;
+    *setme_Bps = is_active ? tr_bandwidthGetPieceSpeed_Bps( &w->bandwidth, now, TR_DOWN ) : 0;
     return is_active;
 }
@@ -321 +325 @@
 
 tr_webseed*
-tr_webseedNew( struct tr_torrent * tor,
-               const char        * url,
-               tr_peer_callback  * callback,
-               void              * callback_data )
+tr_webseedNew( struct tr_torrent  * tor,
+               const char         * url,
+               tr_peer_callback   * callback,
+               void               * callback_data )
 {
     tr_webseed * w = tr_new0( tr_webseed, 1 );
     tr_peer * peer = &w->parent;
 
+    /* construct parent class */
+    tr_peerConstruct( peer );
     peer->peerIsChoked = TRUE;
     peer->clientIsInterested = !tr_torrentIsSeed( tor );
-    peer->progress = 1.0;
     peer->client = tr_strdup( "webseed" );
-    peer->have = TR_BITSET_INIT;
     tr_bitsetSetHaveAll( &peer->have );
+    tr_peerUpdateProgress( tor, peer );
 
     w->torrent_id = tr_torrentId( tor );
     w->session = tor->session;
-
     w->base_url_len = strlen( url );
     w->base_url = tr_strndup( url, w->base_url_len );
     w->callback = callback;
     w->callback_data = callback_data;
-    tr_rcConstruct( &w->download_rate );
+    //tr_rcConstruct( &w->download_rate );
+    tr_bandwidthConstruct( &w->bandwidth, tor->session, tor->bandwidth );
     w->timer = evtimer_new( w->session->event_base, webseed_timer_func, w );
     tr_timerAddMsec( w->timer, TR_IDLE_TIMER_MSEC );