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

Timestamp:

Jan 30, 2013, 8:06:12 PM (8 years ago)

Author:

jordan

Message:

(libT) increment the announced downloadCount only when the piece becomes complete.

File:

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

trunk/libtransmission/peer-mgr.c

@@ -1671 +1671 @@
 tr_peerMgrPieceCompleted (tr_torrent * tor, tr_piece_index_t p)
 {
-  int i;
-  int peerCount;
-  tr_peer ** peers;
-  tr_swarm * s = tor->swarm;
-
-  /* notify the peers that we now have this piece */
-  peerCount = tr_ptrArraySize (&s->peers);
-  peers = (tr_peer**) tr_ptrArrayBase (&s->peers);
-  for (i=0; i<peerCount; ++i)
-    tr_peerMsgsHave (peers[i]->msgs, p);
+  bool pieceCameFromPeers = false;
+  tr_swarm * const s = tor->swarm;
+  const tr_peer ** peer = (const tr_peer **) tr_ptrArrayBase (&s->peers);
+  const tr_peer ** const pend = peer + tr_ptrArraySize (&s->peers);
+
+  /* walk through our peers */
+  for ( ; peer!=pend; ++peer)
+    {
+      /* notify the peer that we now have this piece */
+      tr_peerMsgsHave ((*peer)->msgs, p);
+
+      if (!pieceCameFromPeers)
+        pieceCameFromPeers = tr_bitfieldHas (&(*peer)->blame, p);
+    }
+
+  if (pieceCameFromPeers) /* webseed downloads don't belong in announce totals */
+    tr_announcerAddBytes (tor, TR_ANN_DOWN, tr_torPieceCountBytes (tor, p));
 
   /* bookkeeping */
@@ -1794 +1801 @@
           const tr_piece_index_t p = e->pieceIndex;
           const tr_block_index_t block = _tr_block (tor, p, e->offset);
-          if (peer->msgs != NULL) /* webseed downloads don't belong in announce totals */
-            tr_announcerAddBytes (tor, TR_ANN_DOWN, tr_torPieceCountBytes (tor, p));
           cancelAllRequestsForBlock (s, block, peer);
           tr_historyAdd (&peer->blocksSentToClient, tr_time(), 1);