Changeset 2967

Timestamp:

Sep 1, 2007, 1:37:41 PM (15 years ago)

Author:

charles

Message:

promote some fields up out of peer-msgs s.t. the manager knows about them and can use them for stat messages and deciding which peers to choke/unchoke. add cleanup code for shutting down a group of peers.

Location:

branches/encryption/libtransmission

Files:

• Makefile.am (modified) (1 diff)
• peer-mgr-private.h (added)
• peer-mgr.c (modified) (16 diffs)
• peer-msgs.c (modified) (28 diffs)
• peer-msgs.h (modified) (1 diff)
• peer-work.h (deleted)
• torrent.c (modified) (1 diff)

branches/encryption/libtransmission/Makefile.am

@@ -65 +65 @@
     peer-io.h \
     peer-mgr.h \
+    peer-mgr-private.h \
     peer-msgs.h \
     platform.h \

branches/encryption/libtransmission/peer-mgr.c

@@ -14 +14 @@
 #include <string.h> /* memcpy, memcmp */
 
-#include <arpa/inet.h>
-
 #include "transmission.h"
 #include "handshake.h"
@@ -22 +20 @@
 #include "peer-io.h"
 #include "peer-mgr.h"
-#include "peer-work.h"
+#include "peer-mgr-private.h"
+#include "peer-msgs.h"
 #include "ptrarray.h"
 #include "utils.h"
@@ -30 +29 @@
 typedef struct
 {
-    struct in_addr in_addr;
-    uint16_t port;
-    tr_peerIo * io;
-    int from;
-}
-Peer;
-
-typedef struct
-{
     uint8_t hash[SHA_DIGEST_LENGTH];
-    tr_ptrArray * peers; /* Peer */
+    tr_ptrArray * peers; /* tr_peer */
 }
 Torrent;
@@ -97 +87 @@
 peerCompare( const void * va, const void * vb )
 {
-    const Peer * a = (const Peer *) va;
-    const Peer * b = (const Peer *) vb;
+    const tr_peer * a = (const tr_peer *) va;
+    const tr_peer * b = (const tr_peer *) vb;
     return memcmp( &a->in_addr, &b->in_addr, sizeof(struct in_addr) );
 }
@@ -105 +95 @@
 peerCompareToAddr( const void * va, const void * vb )
 {
-    const Peer * a = (const Peer *) va;
+    const tr_peer * a = (const tr_peer *) va;
     const struct in_addr * b = (const struct in_addr *) vb;
     return memcmp( &a->in_addr, b, sizeof(struct in_addr) );
 }
 
-static Peer*
+static tr_peer*
 getExistingPeer( Torrent * torrent, const struct in_addr * in_addr )
 {
-    return (Peer*) tr_ptrArrayFindSorted( torrent->peers,
-                                          in_addr,
-                                          peerCompareToAddr );
-}
-
-static Peer*
+    return (tr_peer*) tr_ptrArrayFindSorted( torrent->peers,
+                                             in_addr,
+                                             peerCompareToAddr );
+}
+
+static tr_peer*
 getPeer( Torrent * torrent, const struct in_addr * in_addr )
 {
-    Peer * peer = getExistingPeer( torrent, in_addr );
+    tr_peer * peer = getExistingPeer( torrent, in_addr );
     if( peer == NULL )
     {
-        peer = tr_new0( Peer, 1 );
+        peer = tr_new0( tr_peer, 1 );
         memcpy( &peer->in_addr, in_addr, sizeof(struct in_addr) );
         tr_ptrArrayInsertSorted( torrent->peers, peer, peerCompare );
@@ -132 +122 @@
 
 static void
-freePeer( Peer * peer )
-{
-#warning free the peer-work state here
+freePeer( tr_peer * peer )
+{
+    tr_peerMsgsFree( peer->msgs );
+    tr_bitfieldFree( peer->have );
+    tr_bitfieldFree( peer->blame );
+    tr_bitfieldFree( peer->banned );
     tr_peerIoFree( peer->io );
+    tr_free( peer->client );
     tr_free( peer );
 }
@@ -143 +137 @@
 {
     int i, size;
-    Peer ** peers = (Peer **) tr_ptrArrayPeek( t->peers, &size );
+    tr_peer ** peers = (tr_peer **) tr_ptrArrayPeek( t->peers, &size );
     for( i=0; i<size; ++i )
         freePeer( peers[i] );
@@ -201 +195 @@
     } else {
         uint16_t port;
-        Peer * peer = getPeer( t, tr_peerIoGetAddress(io,&port) );
+        tr_peer * peer = getPeer( t, tr_peerIoGetAddress(io,&port) );
         peer->port = port;
         peer->io = io;
-        tr_peerWorkAdd( tr_torrentFindFromHash(manager->handle,hash), io );
+        peer->msgs = tr_peerMsgsNew( tr_torrentFindFromHash(manager->handle,hash), peer );
     }
 }
@@ -234 +228 @@
     for( i=0; i<peerCount; ++i )
     {
-        Peer * peer;
+        tr_peer * peer;
         struct in_addr addr;
         uint16_t port;
@@ -273 +267 @@
     const Torrent * t = getExistingTorrent( (tr_peerMgr*)manager, torrentHash );
     int i, peerCount;
-    const Peer ** peers = (const Peer **) tr_ptrArrayPeek( t->peers, &peerCount );
+    const tr_peer ** peers = (const tr_peer **) tr_ptrArrayPeek( t->peers, &peerCount );
     uint8_t * ret = tr_new( uint8_t, peerCount * 6 );
     uint8_t * walk = ret;
@@ -326 +320 @@
         else {
             int j, peerCount;
-            const Peer ** peers = (const Peer **) tr_ptrArrayPeek( t->peers, &peerCount );
+            const tr_peer ** peers = (const tr_peer **) tr_ptrArrayPeek( t->peers, &peerCount );
             for( j=0; j<peerCount; ++j )
-                if( peers[i].ccc )
+                if( tr_bitfieldHas( peers[i]->have, j ) )
                     ++tab[i];
         }
@@ -346 +340 @@
     int i, size;
     const Torrent * t = getExistingTorrent( (tr_peerMgr*)manager, torrentHash );
-    const Peer ** peers = (const Peer **) tr_ptrArrayPeek( t->peers, &size );
+    const tr_peer ** peers = (const tr_peer **) tr_ptrArrayPeek( t->peers, &size );
 
     *setmePeersTotal          = size;
@@ -355 +349 @@
     for( i=0; i<size; ++i )
     {
-        const Peer * peer = peers[i];
+        const tr_peer * peer = peers[i];
 
         if( peer->io == NULL ) /* not connected */
@@ -379 +373 @@
     int i, size;
     const Torrent * t = getExistingTorrent( (tr_peerMgr*)manager, torrentHash );
-    const Peer ** peers = (const Peer **) tr_ptrArrayPeek( t->peers, &size );
+    const tr_peer ** peers = (const tr_peer **) tr_ptrArrayPeek( t->peers, &size );
     tr_peer_stat * ret;
 
@@ -386 +380 @@
     for( i=0; i<size; ++i )
     {
-        const Peer * peer = peers[i];
+        const tr_peer * peer = peers[i];
         const int live = peer->io != NULL;
         tr_peer_stat * stat = ret + i;
 
         tr_netNtop( &peer->in_addr, stat->addr, sizeof(stat->addr) );
-        stat->port = peer->port;
-        stat->from = peer->from;
-        stat->isConnected = live;
+        stat->port             = peer->port;
+        stat->from             = peer->from;
+        stat->client           = peer->client;
+        stat->progress         = peer->progress;
+        stat->isConnected      = live;
         stat->uploadToRate     = tr_peerIoGetRateToPeer( peer->io );
         stat->downloadFromRate = tr_peerIoGetRateToClient( peer->io );
-        stat->isDownloading    =  stat->uploadToRate > 0.01;
-        stat->isUploading      =  stat->downloadFromRate > 0.01;
-
-#warning FIXME
-        //stat->progress = tr_peerProgress( peer );
-        //stat->client = tr_peerClient( peer );
+        stat->isDownloading    = stat->uploadToRate > 0.01;
+        stat->isUploading      = stat->downloadFromRate > 0.01;
     }
 
@@ -409 +401 @@
 
 void
-tr_peerMgrDisablePex( tr_peerMgr    * manager UNUSED,
-                      const uint8_t * torrentHash UNUSED,
-                      int             disable UNUSED)
-{
-#warning FIXME
-#if 0
-    if( ( tor->pexDisabled != disable ) && ! ( TR_FLAG_PRIVATE & tor->info.flags ) ) {
-        int i;
+tr_peerMgrDisablePex( tr_peerMgr    * manager,
+                      const uint8_t * torrentHash,
+                      int             disable)
+{
+    tr_torrent * tor = tr_torrentFindFromHash( manager->handle, torrentHash );
+
+    if( ( tor->pexDisabled != disable ) && ! ( TR_FLAG_PRIVATE & tor->info.flags ) )
+    {
+        int i, size;
+        Torrent * t = getExistingTorrent( manager, torrentHash );
+        tr_peer ** peers = (tr_peer **) tr_ptrArrayPeek( t->peers, &size );
+        for( i=0; i<size; ++i ) {
+            peers[i]->pexEnabled = disable ? 0 : 1;
+            peers[i]->lastPexTime = 0;
+        }
+
         tor->pexDisabled = disable;
-        for( i=0; i<tor->peerCount; ++i )
-            tr_peerSetPrivate( tor->peers[i], disable );
-    }
-#endif
-}
+    }
+}

branches/encryption/libtransmission/peer-msgs.c

@@ -29 +29 @@
 #include "peer-io.h"
 #include "peer-mgr.h"
+#include "peer-mgr-private.h"
+#include "peer-msgs.h"
 #include "ratecontrol.h"
 #include "timer.h"
@@ -99 +101 @@
 }
 
-typedef struct
-{
+struct tr_peermsgs
+{
+    tr_peer * peer;
+
     tr_handle * handle;
     tr_torrent * torrent;
     tr_peerIo * io;
-    tr_bitfield * bitfield;   /* the peer's bitfield */
-    tr_bitfield * banfield;   /* bad pieces from the peer */
-    tr_bitfield * blamefield; /* lists pieces that this peer helped us with */
 
     struct evbuffer * outMessages; /* buffer of all the non-piece messages */
@@ -131 +132 @@
     uint64_t gotKeepAliveTime;
 
-    float progress;
-
     uint16_t ut_pex;
     uint16_t listeningPort;
-
-    /* the client name from the `v' string in LTEP's handshake dictionary */
-    char * client;
-}
-tr_peer;
+};
 
 /**
@@ -146 +141 @@
 
 static int
-isPieceInteresting( const tr_peer   * peer,
-                    int               piece )
+isPieceInteresting( const tr_peermsgs   * peer,
+                    int                   piece )
 {
     const tr_torrent * torrent = peer->torrent;
@@ -154 +149 @@
     if( tr_cpPieceIsComplete( torrent->completion, piece ) ) /* we already have it */
         return FALSE;
-    if( !tr_bitfieldHas( peer->bitfield, piece ) ) /* peer doesn't have it */
+    if( !tr_bitfieldHas( peer->peer->have, piece ) ) /* peer doesn't have it */
         return FALSE;
-    if( tr_bitfieldHas( peer->banfield, piece ) ) /* peer is banned for it */
+    if( tr_bitfieldHas( peer->peer->banned, piece ) ) /* peer is banned for it */
         return FALSE;
     return TRUE;
@@ -162 +157 @@
 
 static int
-isInteresting( const tr_peer * peer )
+isInteresting( const tr_peermsgs * peer )
 {
     int i;
@@ -168 +163 @@
     const tr_bitfield * bitfield = tr_cpPieceBitfield( torrent->completion );
 
-    if( !peer->bitfield ) /* We don't know what this peer has */
+    if( !peer->peer->have ) /* We don't know what this peer has */
         return FALSE;
 
-    assert( bitfield->len == peer->bitfield->len );
+    assert( bitfield->len == peer->peer->have->len );
 
     for( i=0; i<torrent->info.pieceCount; ++i )
@@ -181 +176 @@
 
 static void
-sendInterest( tr_peer * peer, int weAreInterested )
+sendInterest( tr_peermsgs * peer, int weAreInterested )
 {
     const uint32_t len = sizeof(uint8_t);
@@ -192 +187 @@
 
 static void
-updateInterest( tr_peer * peer )
+updateInterest( tr_peermsgs * peer )
 {
     const int i = isInteresting( peer );
@@ -200 +195 @@
 
 void
-setChoke( tr_peer * peer, int choke )
+setChoke( tr_peermsgs * peer, int choke )
 {
     if( peer->peerIsChoked != !!choke )
@@ -225 +220 @@
 
 static void
-parseLtepHandshake( tr_peer * peer, int len, struct evbuffer * inbuf )
+parseLtepHandshake( tr_peermsgs * peer, int len, struct evbuffer * inbuf )
 {
     benc_val_t val, * sub;
@@ -253 +248 @@
     if( tr_bencIsStr( sub ) ) {
 int i;
-        tr_free( peer->client );
+        tr_free( peer->peer->client );
         fprintf( stderr, "dictionary says client is [%s]\n", sub->val.s.s );
 for( i=0; i<sub->val.s.i; ++i ) fprintf( stderr, "[%c] (%d)\n", sub->val.s.s[i], (int)sub->val.s.s[i] );
-        peer->client = tr_strndup( sub->val.s.s, sub->val.s.i );
-        fprintf( stderr, "peer->client is now [%s]\n", peer->client );
+        peer->peer->client = tr_strndup( sub->val.s.s, sub->val.s.i );
+        fprintf( stderr, "peer->client is now [%s]\n", peer->peer->client );
     }
 
@@ -272 +267 @@
 
 static void
-parseUtPex( tr_peer * peer, int msglen, struct evbuffer * inbuf )
+parseUtPex( tr_peermsgs * peer, int msglen, struct evbuffer * inbuf )
 {
     benc_val_t val, * sub;
@@ -304 +299 @@
 
 static void
-parseLtep( tr_peer * peer, int msglen, struct evbuffer * inbuf )
+parseLtep( tr_peermsgs * peer, int msglen, struct evbuffer * inbuf )
 {
     uint8_t ltep_msgid;
@@ -329 +324 @@
 
 static int
-readBtLength( tr_peer * peer, struct evbuffer * inbuf )
+readBtLength( tr_peermsgs * peer, struct evbuffer * inbuf )
 {
     uint32_t len;
@@ -350 +345 @@
 
 static int
-readBtMessage( tr_peer * peer, struct evbuffer * inbuf )
+readBtMessage( tr_peermsgs * peer, struct evbuffer * inbuf )
 {
     uint8_t id;
@@ -402 +397 @@
             fprintf( stderr, "got a BT_HAVE\n" );
             tr_peerIoReadUint32( peer->io, inbuf, &ui32 );
-            tr_bitfieldAdd( peer->bitfield, ui32 );
-            peer->progress = tr_bitfieldCountTrueBits( peer->bitfield ) / (float)peer->torrent->info.pieceCount;
+            tr_bitfieldAdd( peer->peer->have, ui32 );
+            peer->peer->progress = tr_bitfieldCountTrueBits( peer->peer->have ) / (float)peer->torrent->info.pieceCount;
             updateInterest( peer );
             break;
 
         case BT_BITFIELD:
-            assert( msglen == peer->bitfield->len );
+            assert( msglen == peer->peer->have->len );
             fprintf( stderr, "got a BT_BITFIELD\n" );
-            tr_peerIoReadBytes( peer->io, inbuf, peer->bitfield->bits, msglen );
-            peer->progress = tr_bitfieldCountTrueBits( peer->bitfield ) / (float)peer->torrent->info.pieceCount;
-            fprintf( stderr, "peer progress is %f\n", peer->progress );
+            tr_peerIoReadBytes( peer->io, inbuf, peer->peer->have->bits, msglen );
+            peer->peer->progress = tr_bitfieldCountTrueBits( peer->peer->have ) / (float)peer->torrent->info.pieceCount;
+            fprintf( stderr, "peer progress is %f\n", peer->peer->progress );
             updateInterest( peer );
             /* FIXME: maybe unchoke */
@@ -482 +477 @@
 
 static int
-canDownload( const tr_peer * peer )
+canDownload( const tr_peermsgs * peer )
 {
     tr_torrent * tor = peer->torrent;
 
 #if 0
-    /* FIXME: was swift worth it?  did anyone notice a difference? :) */
+    /* FIXME: was swift worth it?  did anyone notice a difference? */
     if( SWIFT_ENABLED && !isSeeding && (peer->credit<0) )
         return FALSE;
@@ -502 +497 @@
 
 static void
-gotBlock( tr_peer * peer, int pieceIndex, int offset, struct evbuffer * inbuf )
+gotBlock( tr_peermsgs * peer, int pieceIndex, int offset, struct evbuffer * inbuf )
 {
     tr_torrent * tor = peer->torrent;
@@ -523 +518 @@
 
     /* make a note that this peer helped us with this piece */
-    if( !peer->blamefield )
-         peer->blamefield = tr_bitfieldNew( tor->info.pieceCount );
-    tr_bitfieldAdd( peer->blamefield, pieceIndex );
+    if( !peer->peer->blame )
+         peer->peer->blame = tr_bitfieldNew( tor->info.pieceCount );
+    tr_bitfieldAdd( peer->peer->blame, pieceIndex );
 
     tr_cpBlockAdd( tor->completion, block );
@@ -538 +533 @@
 
 static ReadState
-readBtPiece( tr_peer * peer, struct evbuffer * inbuf )
+readBtPiece( tr_peermsgs * peer, struct evbuffer * inbuf )
 {
     assert( peer->blockToUs.length > 0 );
@@ -575 +570 @@
 {
     ReadState ret;
-    tr_peer * peer = (tr_peer *) vpeer;
+    tr_peermsgs * peer = (tr_peermsgs *) vpeer;
     struct evbuffer * inbuf = EVBUFFER_INPUT ( evin );
     fprintf( stderr, "peer %p got a canRead; state is [%s]\n", peer, getStateName(peer->state) );
@@ -594 +589 @@
 
 static int
-canUpload( const tr_peer * peer )
+canUpload( const tr_peermsgs * peer )
 {
     const tr_torrent * tor = peer->torrent;
@@ -610 +605 @@
 pulse( void * vpeer )
 {
-    tr_peer * peer = (tr_peer *) vpeer;
+    tr_peermsgs * peer = (tr_peermsgs *) vpeer;
     size_t len;
 
@@ -658 +653 @@
 didWrite( struct bufferevent * evin UNUSED, void * vpeer )
 {
-    tr_peer * peer = (tr_peer *) vpeer;
+    tr_peermsgs * peer = (tr_peermsgs *) vpeer;
     fprintf( stderr, "peer %p got a didWrite...\n", peer );
     pulse( vpeer );
@@ -666 +661 @@
 gotError( struct bufferevent * evbuf UNUSED, short what, void * vpeer )
 {
-    tr_peer * peer = (tr_peer *) vpeer;
+    tr_peermsgs * peer = (tr_peermsgs *) vpeer;
     fprintf( stderr, "peer %p got an error in %d\n", peer, (int)what );
 }
 
 static void
-sendBitfield( tr_peer * peer )
+sendBitfield( tr_peermsgs * peer )
 {
     const tr_bitfield * bitfield = tr_cpPieceBitfield( peer->torrent->completion );
@@ -683 +678 @@
 }
 
-void
-tr_peerWorkAdd( struct tr_torrent * torrent,
-                struct tr_peerIo  * io )
-{
-    tr_peer * peer;
-
-    peer = tr_new0( tr_peer, 1 );
+tr_peermsgs*
+tr_peerMsgsNew( struct tr_torrent * torrent, struct tr_peer * peer_in )
+{
+    tr_peermsgs * peer;
+
+    assert( peer_in != NULL );
+    assert( peer_in->io != NULL );
+
+    peer = tr_new0( tr_peermsgs, 1 );
+    peer->peer = peer_in;
     peer->handle = torrent->handle;
     peer->torrent = torrent;
-    peer->io = io;
+    peer->io = peer_in->io;
     peer->weAreChoked = 1;
     peer->peerIsChoked = 1;
@@ -698 +696 @@
     peer->peerIsInterested = 0;
     peer->pulseTag = tr_timerNew( peer->handle, pulse, peer, NULL, 200 );
-    peer->bitfield = tr_bitfieldNew( torrent->info.pieceCount );
+    peer->peer->have = tr_bitfieldNew( torrent->info.pieceCount );
     peer->outMessages = evbuffer_new( );
     peer->outBlock = evbuffer_new( );
     peer->inBlock = evbuffer_new( );
 
-    tr_peerIoSetIOFuncs( io, canRead, didWrite, gotError, peer );
-    tr_peerIoSetIOMode( io, EV_READ|EV_WRITE, 0 );
+    tr_peerIoSetIOFuncs( peer->io, canRead, didWrite, gotError, peer );
+    tr_peerIoSetIOMode( peer->io, EV_READ|EV_WRITE, 0 );
 
     sendBitfield( peer );
-}
+
+    return peer;
+}
+
+void
+tr_peerMsgsFree( tr_peermsgs* p )
+{
+    tr_timerFree( &p->pulseTag );
+    evbuffer_free( p->outMessages );
+    evbuffer_free( p->outBlock );
+    evbuffer_free( p->inBlock );
+    tr_free( p );
+}

branches/encryption/libtransmission/peer-msgs.h

@@ -15 +15 @@
 
 struct tr_torrent;
-struct tr_peerIo;
+struct tr_peer;
 
-void tr_peerWorkAdd( struct tr_torrent  * torrent,
-                     struct tr_peerIo   * io );
+typedef struct tr_peermsgs tr_peermsgs;
+
+tr_peermsgs* tr_peerMsgsNew( struct tr_torrent  * torrent,
+                             struct tr_peer     * peer );
+
+void         tr_peerMsgsFree( tr_peermsgs* );
 
 #endif

branches/encryption/libtransmission/torrent.c

@@ -735 +735 @@
                             &s->peersSendingToUs,
                             &s->peersGettingFromUs,
-                            &s->peersFrom );
+                             s->peersFrom );
 
     s->percentComplete = tr_cpPercentComplete ( tor->completion );