Changeset 7580 for trunk/libtransmission/peer-mgr.c

Timestamp:

Jan 2, 2009, 7:56:06 PM (12 years ago)

Author:

charles

Message:

(trunk libT) avoid some unnecessary memory fragmentation... for composited objects that have a tr_bandwidth, contain the it directly rather than a pointer to one allocated elsewhere on the heap.

File:

• trunk/libtransmission/peer-mgr.c (modified) (7 diffs)

trunk/libtransmission/peer-mgr.c

@@ -319 +319 @@
 
 static tr_peer*
-peerConstructor( tr_torrent * tor, const tr_address * addr )
+peerConstructor( const tr_address * addr )
 {
     tr_peer * p;
     p = tr_new0( tr_peer, 1 );
     p->addr = *addr;
-    p->bandwidth = tr_bandwidthNew( tor->session, tor->bandwidth );
     return p;
 }
@@ -340 +339 @@
     if( peer == NULL )
     {
-        peer = peerConstructor( torrent->tor, addr );
+        peer = peerConstructor( addr );
         tr_ptrArrayInsertSorted( &torrent->peers, peer, peerCompare );
     }
@@ -363 +362 @@
     tr_bitfieldFree( peer->blame );
     tr_free( peer->client );
-
-    tr_bandwidthFree( peer->bandwidth );
 
     tr_free( peer );
@@ -1271 +1268 @@
                 peer->port = port;
                 peer->io = tr_handshakeStealIO( handshake );
+                tr_peerIoSetParent( peer->io, t->tor->bandwidth );
                 tr_peerMsgsNew( t->tor, peer, peerCallbackFunc, t, &peer->msgsTag );
-                tr_peerIoSetBandwidth( io, peer->bandwidth );
 
                 success = TRUE;
@@ -1310 +1307 @@
         tr_handshake * handshake;
 
-        io = tr_peerIoNewIncoming( manager->session, addr, port, socket );
+        io = tr_peerIoNewIncoming( manager->session, manager->session->bandwidth, addr, port, socket );
 
         handshake = tr_handshakeNew( io,
@@ -1818 +1815 @@
 tr_peerGetPieceSpeed( const tr_peer * peer, tr_direction direction )
 {
-    assert( peer );
-    assert( direction==TR_CLIENT_TO_PEER || direction==TR_PEER_TO_CLIENT );
-
-    return tr_bandwidthGetPieceSpeed( peer->bandwidth, direction );
+    return peer->io ? tr_peerIoGetPieceSpeed( peer->io, direction ) : 0.0;
 }
 
@@ -2316 +2310 @@
                    tr_peerIoAddrStr( &atom->addr, atom->port ) );
 
-            io = tr_peerIoNewOutgoing( mgr->session, &atom->addr, atom->port, t->hash );
+            io = tr_peerIoNewOutgoing( mgr->session, mgr->session->bandwidth, &atom->addr, atom->port, t->hash );
+
             if( io == NULL )
             {