Changeset 7110
- Timestamp:
- Nov 15, 2008, 1:07:08 AM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/libtransmission/peer-mgr.c
r7109 r7110 1843 1843 unsigned int doUnchoke : 1; 1844 1844 unsigned int isInterested : 1; 1845 double rate; 1845 unsigned int isChoked : 1; 1846 int rate; 1846 1847 tr_peer * peer; 1847 1848 }; … … 1853 1854 const struct ChokeData * a = va; 1854 1855 const struct ChokeData * b = vb; 1855 int diff = 0; 1856 1857 if( diff == 0 ) /* prefer higher overall speeds */ 1858 diff = a->rate > b->rate ? -1 : 1; 1859 1860 if( diff == 0 ) /* prefer unchoked */ 1861 diff = (int)a->peer->peerIsChoked - (int)b->peer->peerIsChoked; 1862 1863 return diff; 1856 1857 if( a->rate != b->rate ) /* prefer higher overall speeds */ 1858 return a->rate > b->rate ? -1 : 1; 1859 1860 if( a->isChoked != b->isChoked ) /* prefer unchoked */ 1861 return a->isChoked ? 1 : -1; 1862 1863 return 0; 1864 1864 } 1865 1865 … … 1902 1902 n->peer = peer; 1903 1903 n->isInterested = peer->peerIsInterested; 1904 n->rate = tr_peerGetPieceSpeed( peer, TR_CLIENT_TO_PEER ) 1905 + tr_peerGetPieceSpeed( peer, TR_PEER_TO_CLIENT ); 1904 n->isChoked = peer->peerIsChoked; 1905 n->rate = (int)(tr_peerGetPieceSpeed( peer, TR_CLIENT_TO_PEER ) 1906 + tr_peerGetPieceSpeed( peer, TR_PEER_TO_CLIENT ) ); 1906 1907 } 1907 1908 }
Note: See TracChangeset
for help on using the changeset viewer.