Changeset 14083

Timestamp:

May 27, 2013, 9:04:48 PM (9 years ago)

Author:

jordan

Message:

(trunk, libT) fix tr_torrentStat() regression in the nightlies reported in #5294 by mw3demo

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (16 diffs)
• peer-mgr.h (modified) (1 diff)
• peer-msgs.c (modified) (11 diffs)
• peer-msgs.h (modified) (1 diff)
• torrent.c (modified) (2 diffs)
• torrent.h (modified) (1 diff)

trunk/libtransmission/peer-mgr.c

@@ -487 +487 @@
 
 static void
+resetTorrentStats (tr_torrent * tor)
+{
+  int i;
+
+  tor->peerCount = 0;
+  tor->activePeerCount[TR_UP] = 0;
+  tor->activePeerCount[TR_DOWN] = 0;
+  tor->activeWebseedCount = 0;
+  for (i=0; i<TR_PEER_FROM__MAX; i++)
+    tor->peerFromCount[i] = 0;
+}
+
+static void
 swarmFree (void * vs)
 {
@@ -501 +514 @@
   tr_ptrArrayDestruct (&s->outgoingHandshakes, NULL);
   tr_ptrArrayDestruct (&s->peers, NULL);
+  resetTorrentStats (s->tor);
 
   replicationFree (s);
@@ -520 +534 @@
   tr_ptrArrayDestruct (&s->webseeds, (PtrArrayForeachFunc)tr_peerFree);
   s->webseeds = TR_PTR_ARRAY_INIT;
+  s->tor->activeWebseedCount = 0;
 
   /* repopulate it */
@@ -594 +609 @@
   managerUnlock (manager);
   tr_free (manager);
-}
-
-static int
-clientIsDownloadingFrom (const tr_torrent * tor, const tr_peerMsgs * p)
-{
-  if (!tr_torrentHasMetadata (tor))
-    return true;
-
-  return tr_peerMsgsIsClientInterested (p) && !tr_peerMsgsIsClientChoked (p);
-}
-
-static int
-clientIsUploadingTo (const tr_peerMsgs * p)
-{
-  return tr_peerMsgsIsPeerInterested (p) && !tr_peerMsgsIsPeerChoked (p);
 }
 
@@ -869 +869 @@
 countActiveWebseeds (tr_swarm * s)
 {
-  int i;
-  int activeCount = 0;
-  const int n = tr_ptrArraySize (&s->webseeds);
-  const uint64_t now = tr_time_msec ();
-
-  for (i=0; i<n; ++i)
-    if (tr_peerIsTransferringPieces (tr_ptrArrayNth(&s->webseeds,i), now, TR_DOWN, NULL))
-      ++activeCount;
+  int activeCount;
+
+  if (s->tor->isRunning && !tr_torrentIsSeed (s->tor))
+    {
+      int i;
+      const int n = tr_ptrArraySize (&s->webseeds);
+      const uint64_t now = tr_time_msec ();
+
+      for (i=0; i<n; ++i)
+        if (tr_peerIsTransferringPieces (tr_ptrArrayNth(&s->webseeds,i), now, TR_DOWN, NULL))
+          ++activeCount;
+    }
+  else
+    {
+      activeCount = 0;
+    }
 
   return activeCount;
@@ -1932 +1940 @@
 
   tr_ptrArrayInsertSorted (&swarm->peers, peer, peerCompare);
+  ++tor->peerCount;
+  ++tor->peerFromCount[atom->fromFirst];
+
+  assert (tor->peerCount == tr_ptrArraySize (&swarm->peers));
+  assert (tor->peerFromCount[atom->fromFirst] <= tor->peerCount);
 }
 
@@ -2420 +2433 @@
 }
 
+static void removeAllPeers (tr_swarm *);
+
 static void
 stopSwarm (tr_swarm * swarm)
 {
-  tr_peer * peer;
-
   swarm->isRunning = false;
 
@@ -2430 +2443 @@
   invalidatePieceSorting (swarm);
 
-  /* disconnect the peers. */
-  while ((peer = tr_ptrArrayPop (&swarm->peers)))
-    tr_peerFree (peer);
+  removeAllPeers (swarm);
 
   /* disconnect the handshakes. handshakeAbort calls handshakeDoneCB (),
@@ -2522 +2533 @@
   for (i=0; i<peerCount; ++i)
     tr_peerUpdateProgress (tor, peers[i]);
+
+  /* update the bittorrent peers' willingnes... */
+  for (i=0; i<peerCount; ++i)
+    {
+      tr_peerMsgsUpdateActive (tr_peerMsgsCast(peers[i]), TR_UP);
+      tr_peerMsgsUpdateActive (tr_peerMsgsCast(peers[i]), TR_DOWN);
+    }
 }
 
@@ -2616 +2634 @@
   assert (desiredAvailable <= tor->info.totalSize);
   return desiredAvailable;
-}
-
-void
-tr_peerMgrTorrentStats (tr_torrent  * tor,
-                        int         * setmePeersConnected,
-                        int         * setmeWebseedsSendingToUs,
-                        int         * setmePeersSendingToUs,
-                        int         * setmePeersGettingFromUs,
-                        int         * setmePeersFrom)
-{
-  int i;
-  int n;
-  tr_swarm * s;
-
-  assert (tr_isTorrent (tor));
-
-  *setmePeersConnected       = 0;
-  *setmePeersGettingFromUs   = 0;
-  *setmePeersSendingToUs     = 0;
-  *setmeWebseedsSendingToUs  = 0;
-
-  s = tor->swarm;
-  n = tr_ptrArraySize (&s->peers);
-
-  for (i=0; i<TR_PEER_FROM__MAX; ++i)
-    setmePeersFrom[i] = 0;
-
-  for (i=0; i<n; ++i)
-    {
-      tr_peer * peer = tr_ptrArrayNth (&s->peers, i);
-      tr_peerMsgs * msgs = PEER_MSGS (peer);
-      const struct peer_atom * atom = peer->atom;
-
-      assert (msgs != NULL);
-
-      ++*setmePeersConnected;
-
-      ++setmePeersFrom[atom->fromFirst];
-
-      if (clientIsDownloadingFrom (tor, msgs))
-        ++*setmePeersSendingToUs;
-
-      if (clientIsUploadingTo (msgs))
-        ++*setmePeersGettingFromUs;
-    }
-
-  *setmeWebseedsSendingToUs = countActiveWebseeds (s);
 }
 
@@ -2736 +2707 @@
       stat->clientIsInterested  = tr_peerMsgsIsClientInterested (msgs);
       stat->isIncoming          = tr_peerMsgsIsIncomingConnection (msgs);
-      stat->isDownloadingFrom   = clientIsDownloadingFrom (tor, msgs);
-      stat->isUploadingTo       = clientIsUploadingTo (msgs);
+      stat->isDownloadingFrom   = tr_peerMsgsIsActive (msgs, TR_PEER_TO_CLIENT);
+      stat->isUploadingTo       = tr_peerMsgsIsActive (msgs, TR_CLIENT_TO_PEER);
       stat->isSeed              = peerIsSeed (peer);
 
@@ -3182 +3153 @@
   while ((tor = tr_torrentNext (mgr->session, tor)))
     {
-      if (tor->isRunning)
+      if (tor->isRunning && tor->peerCount)
         {
           tr_swarm * s = tor->swarm;
-          if (!tr_ptrArrayEmpty (&s->peers))
-            {
-              rechokeUploads (s, now);
-              rechokeDownloads (s);
-            }
+          rechokeUploads (s, now);
+          rechokeDownloads (s);
         }
     }
@@ -3322 +3290 @@
 
   removed = tr_ptrArrayRemoveSorted (&s->peers, peer, peerCompare);
+  --s->tor->peerCount;
+  --s->tor->peerFromCount[atom->fromFirst];
 
   if (replicationExists (s))
@@ -3327 +3297 @@
 
   assert (removed == peer);
+  assert (s->tor->peerCount == tr_ptrArraySize (&s->peers));
+  assert (s->tor->peerFromCount[atom->fromFirst] >= 0);
+
   tr_peerFree (removed);
 }
@@ -3363 +3336 @@
   while (!tr_ptrArrayEmpty (&s->peers))
     removePeer (s, tr_ptrArrayNth (&s->peers, 0));
+
+  assert (!s->tor->peerCount);
 }
 
@@ -3646 +3621 @@
       if (tor->isStopping)
         tr_torrentStop (tor);
+
+      /* update the torrent's stats */
+      tor->activeWebseedCount = countActiveWebseeds (tor->swarm);
     }
 

trunk/libtransmission/peer-mgr.h

@@ -171 +171 @@
 void         tr_peerMgrOnBlocklistChanged   (tr_peerMgr         * manager);
 
-void         tr_peerMgrTorrentStats         (tr_torrent         * tor,
-                                             int                * setmePeersConnected,
-                                             int                * setmeWebseedsSendingToUs,
-                                             int                * setmePeersSendingToUs,
-                                             int                * setmePeersGettingFromUs,
-                                             int                * setmePeersFrom); /* TR_PEER_FROM__MAX */
-
 struct tr_peer_stat * tr_peerMgrPeerStats   (const tr_torrent   * tor,
                                              int                * setmeCount);

trunk/libtransmission/peer-msgs.c

@@ -199 +199 @@
   int prefetchCount;
 
+  int is_active[2];
+
   /* how long the outMessages batch should be allowed to grow before
    * it's flushed -- some messages (like requests >:) should be sent
@@ -268 +270 @@
 ***
 **/
+
+static void
+myDebug (const char * file, int line,
+         const struct tr_peerMsgs * msgs,
+         const char * fmt, ...) TR_GNUC_PRINTF(4, 5);
 
 static void
@@ -679 +686 @@
 #endif
 
+/***
+****  ACTIVE
+***/
+
+bool
+tr_peerMsgsIsActive (const tr_peerMsgs  * msgs, tr_direction direction)
+{
+  assert (tr_isPeerMsgs (msgs));
+  assert (tr_isDirection (direction));
+
+  return msgs->is_active[direction];
+}
+
+static void
+tr_peerMsgsSetActive (tr_peerMsgs  * msgs,
+                      tr_direction   direction,
+                      bool           is_active)
+{
+  if (msgs->is_active[direction] != is_active)
+    {
+      int n = msgs->torrent->activePeerCount[direction];
+
+      msgs->is_active[direction] = is_active;
+
+      if (is_active)
+        ++n;
+      else
+        --n;
+      assert (0 <= n);
+      assert (n <= msgs->torrent->peerCount);
+
+      msgs->torrent->activePeerCount[direction] = n;
+    }
+}
+
+void
+tr_peerMsgsUpdateActive (tr_peerMsgs * msgs, tr_direction direction)
+{
+  bool active;
+
+  assert (tr_isPeerMsgs (msgs));
+  assert (tr_isDirection (direction));
+
+  if (direction == TR_CLIENT_TO_PEER)
+    {
+      active = tr_peerMsgsIsPeerInterested (msgs)
+           && !tr_peerMsgsIsPeerChoked (msgs);
+    }
+  else /* TR_PEER_TO_CLIENT */
+    {
+      if (!tr_torrentHasMetadata (msgs->torrent))
+        active = true;
+      else
+        active = tr_peerMsgsIsClientInterested (msgs)
+             && !tr_peerMsgsIsClientChoked (msgs);
+    }
+
+  tr_peerMsgsSetActive (msgs, direction, active);
+}
+
 /**
 ***  INTEREST
@@ -712 +779 @@
 
   if (msgs->client_is_interested != b)
-    sendInterest (msgs, b);
+    {
+      sendInterest (msgs, b);
+
+      tr_peerMsgsUpdateActive (msgs, TR_PEER_TO_CLIENT);
+    }
 }
 
@@ -1417 +1488 @@
             if (!fext)
                 fireGotChoke (msgs);
+            tr_peerMsgsUpdateActive (msgs, TR_PEER_TO_CLIENT);
             break;
 
@@ -1422 +1494 @@
             dbgmsg (msgs, "got Unchoke");
             msgs->client_is_choked = false;
+            tr_peerMsgsUpdateActive (msgs, TR_PEER_TO_CLIENT);
             updateDesiredRequestCount (msgs);
             break;
@@ -1428 +1501 @@
             dbgmsg (msgs, "got Interested");
             msgs->peer_is_interested = true;
+            tr_peerMsgsUpdateActive (msgs, TR_CLIENT_TO_PEER);
             break;
 
@@ -1433 +1507 @@
             dbgmsg (msgs, "got Not Interested");
             msgs->peer_is_interested = false;
+            tr_peerMsgsUpdateActive (msgs, TR_CLIENT_TO_PEER);
             break;
 
@@ -2394 +2469 @@
   assert (msgs != NULL);
 
+  tr_peerMsgsSetActive (msgs, TR_UP, false);
+  tr_peerMsgsSetActive (msgs, TR_DOWN, false);
+
   if (msgs->pexTimer != NULL)
     event_free (msgs->pexTimer);
@@ -2418 +2496 @@
 {
   .destruct = peermsgs_destruct,
-  .is_transferring_pieces = peermsgs_is_transferring_pieces
+  .is_transferring_pieces = peermsgs_is_transferring_pieces,
 };
 
@@ -2527 +2605 @@
   m->client_is_interested = false;
   m->peer_is_interested = false;
+  m->is_active[TR_UP] = false;
+  m->is_active[TR_DOWN] = false;
   m->callback = callback;
   m->callbackData = callbackData;

trunk/libtransmission/peer-msgs.h

@@ -53 +53 @@
 bool         tr_peerMsgsIsClientInterested   (const tr_peerMsgs        * msgs);
 
+bool         tr_peerMsgsIsActive             (const tr_peerMsgs        * msgs,
+                                              tr_direction               direction);
+
+void         tr_peerMsgsUpdateActive         (tr_peerMsgs              * msgs,
+                                              tr_direction               direction);
+
 time_t       tr_peerMsgsGetConnectionAge     (const tr_peerMsgs        * msgs);
 

trunk/libtransmission/torrent.c

@@ -1256 +1256 @@
   unsigned int pieceUploadSpeed_Bps;
   unsigned int pieceDownloadSpeed_Bps;
+  int i;
 
   assert (tr_isTorrent (tor));
@@ -1271 +1272 @@
   s->manualAnnounceTime = tr_announcerNextManualAnnounce (tor);
 
-  tr_peerMgrTorrentStats (tor,
-                          &s->peersConnected,
-                          &s->webseedsSendingToUs,
-                          &s->peersSendingToUs,
-                          &s->peersGettingFromUs,
-                          s->peersFrom);
+  s->peersConnected      = tor->peerCount;
+  s->peersSendingToUs    = tor->activePeerCount[TR_DOWN];
+  s->peersGettingFromUs  = tor->activePeerCount[TR_UP];
+  s->webseedsSendingToUs = tor->activeWebseedCount;
+  for (i=0; i<TR_PEER_FROM__MAX; i++)
+    s->peersFrom[i] = tor->peerFromCount[i];
 
   s->rawUploadSpeed_KBps     = toSpeedKBps (tr_bandwidthGetRawSpeed_Bps (&tor->bandwidth, now, TR_UP));

trunk/libtransmission/torrent.h

@@ -226 +226 @@
     int                        secondsDownloading;
     int                        secondsSeeding;
+
+    int                        peerCount;
+    int                        peerFromCount[TR_PEER_FROM__MAX];
+    int                        activePeerCount[2];
+    int                        activeWebseedCount;
 
     int                        queuePosition;