Changeset 8709

Timestamp:

Jun 16, 2009, 7:31:17 PM (13 years ago)

Author:

charles

Message:

(trunk libT) revert most of r8693 as a quick fix for a possible alignment issue on a NAS

Location:

trunk/libtransmission

Files:

• bandwidth.h (modified) (4 diffs)
• peer-mgr.c (modified) (1 diff)
• torrent.c (modified) (11 diffs)
• torrent.h (modified) (3 diffs)

trunk/libtransmission/bandwidth.h

@@ -17 +17 @@
 #ifndef TR_BANDWIDTH_H
 #define TR_BANDWIDTH_H
-
-#include <assert.h>
 
 #include "transmission.h"
@@ -155 +153 @@
  */
 static TR_INLINE void tr_bandwidthSetDesiredSpeed( tr_bandwidth        * bandwidth,
-                                                   tr_direction          dir,
-                                                   double                desiredSpeed )
+                                                tr_direction          dir,
+                                                double                desiredSpeed )
 {
     bandwidth->band[dir].desiredSpeed = desiredSpeed;
@@ -241 +239 @@
  * in that particular case we want to ignore the global speed limit...
  */
-static TR_INLINE void
-tr_bandwidthHonorParentLimits( tr_bandwidth  * bandwidth,
-                               tr_direction    direction,
-                               tr_bool         isEnabled )
+static TR_INLINE void tr_bandwidthHonorParentLimits ( tr_bandwidth        * bandwidth,
+                                                      tr_direction          direction,
+                                                      tr_bool               isEnabled )
 {
     assert( tr_isBandwidth( bandwidth ) );
@@ -252 +249 @@
 }
 
-static TR_INLINE tr_bool
-tr_bandwidthAreParentLimitsHonored( const tr_bandwidth  * bandwidth,
-                                    tr_direction          direction )
+static TR_INLINE tr_bool tr_bandwidthAreParentLimitsHonored( tr_bandwidth  * bandwidth,
+                                                             tr_direction    direction )
 {
     assert( tr_isBandwidth( bandwidth ) );

trunk/libtransmission/peer-mgr.c

@@ -1315 +1315 @@
                 peer->io = tr_handshakeStealIO( handshake ); /* this steals its refcount too, which is
                                                                 balanced by our unref in peerDestructor()  */
-                tr_peerIoSetParent( peer->io, &t->tor->bandwidth );
+                tr_peerIoSetParent( peer->io, t->tor->bandwidth );
                 tr_peerMsgsNew( t->tor, peer, peerCallbackFunc, t, &peer->msgsTag );
 

trunk/libtransmission/torrent.c

@@ -115 +115 @@
     assert( tr_isDirection( dir ) );
 
-    tr_bandwidthSetDesiredSpeed( &tor->bandwidth, dir, KiB_sec );
+    tr_bandwidthSetDesiredSpeed( tor->bandwidth, dir, KiB_sec );
 }
 
@@ -124 +124 @@
     assert( tr_isDirection( dir ) );
 
-    return tr_bandwidthGetDesiredSpeed( &tor->bandwidth, dir );
+    return tr_bandwidthGetDesiredSpeed( tor->bandwidth, dir );
 }
 
@@ -133 +133 @@
     assert( tr_isDirection( dir ) );
 
-    tr_bandwidthSetLimited( &tor->bandwidth, dir, do_use );
+    tr_bandwidthSetLimited( tor->bandwidth, dir, do_use );
 }
 
@@ -142 +142 @@
     assert( tr_isDirection( dir ) );
 
-    return tr_bandwidthIsLimited( &tor->bandwidth, dir );
+    return tr_bandwidthIsLimited( tor->bandwidth, dir );
 }
 
@@ -150 +150 @@
     assert( tr_isTorrent( tor ) );
 
-    tr_bandwidthHonorParentLimits( &tor->bandwidth, TR_UP, doUse );
-    tr_bandwidthHonorParentLimits( &tor->bandwidth, TR_DOWN, doUse );
+    tr_bandwidthHonorParentLimits( tor->bandwidth, TR_UP, doUse );
+    tr_bandwidthHonorParentLimits( tor->bandwidth, TR_DOWN, doUse );
 }
 
@@ -159 +159 @@
     assert( tr_isTorrent( tor ) );
 
-    return tr_bandwidthAreParentLimitsHonored( &tor->bandwidth, TR_UP );
+    return tr_bandwidthAreParentLimitsHonored( tor->bandwidth, TR_UP );
 }
 
@@ -543 +543 @@
     randomizeTiers( info );
 
-    tr_bandwidthConstruct( &tor->bandwidth, session, session->bandwidth );
+    tor->bandwidth = tr_bandwidthNew( session, session->bandwidth );
 
     tor->blockSize = getBlockSize( info->pieceSize );
@@ -886 +886 @@
     d = tr_peerMgrGetWebseedSpeed( tor, now );
     s->swarmSpeed         = tr_rcRate( &tor->swarmSpeed, now );
-    s->rawUploadSpeed     = tr_bandwidthGetRawSpeed  ( &tor->bandwidth, now, TR_UP );
-    s->pieceUploadSpeed   = tr_bandwidthGetPieceSpeed( &tor->bandwidth, now, TR_UP );
-    s->rawDownloadSpeed   = d + tr_bandwidthGetRawSpeed  ( &tor->bandwidth, now, TR_DOWN );
-    s->pieceDownloadSpeed = d + tr_bandwidthGetPieceSpeed( &tor->bandwidth, now, TR_DOWN );
+    s->rawUploadSpeed     = tr_bandwidthGetRawSpeed  ( tor->bandwidth, now, TR_UP );
+    s->pieceUploadSpeed   = tr_bandwidthGetPieceSpeed( tor->bandwidth, now, TR_UP );
+    s->rawDownloadSpeed   = d + tr_bandwidthGetRawSpeed  ( tor->bandwidth, now, TR_DOWN );
+    s->pieceDownloadSpeed = d + tr_bandwidthGetPieceSpeed( tor->bandwidth, now, TR_DOWN );
 
     usableSeeds += tor->info.webseedCount;
@@ -1211 +1211 @@
     session->torrentCount--;
 
-    tr_bandwidthDestruct( &tor->bandwidth );
+    tr_bandwidthFree( tor->bandwidth );
 
     tr_metainfoFree( inf );
@@ -1740 +1740 @@
     assert( tr_isTorrent( tor ) );
 
-    return tor->bandwidth.priority;
+    return tor->bandwidth->priority;
 }
 
@@ -1749 +1749 @@
     assert( tr_isPriority( priority ) );
 
-    tor->bandwidth.priority = priority;
+    tor->bandwidth->priority = priority;
 }
 

trunk/libtransmission/torrent.h

@@ -18 +18 @@
 #define TR_TORRENT_H 1
 
-#include "bandwidth.h" /* tr_bandwidth */
 #include "completion.h" /* tr_completion */
 #include "ratecontrol.h" /* tr_ratecontrol */
@@ -174 +173 @@
     tr_completeness            completeness;
 
-    struct tr_bandwidth        bandwidth;
-
     struct tr_tracker *        tracker;
     struct tr_publisher_tag *  trackerSubscription;
@@ -217 +214 @@
     int                        uniqueId;
 
+    struct tr_bandwidth      * bandwidth;
+
     struct tr_torrent_peers  * torrentPeers;