Changeset 13900

Timestamp:

Jan 30, 2013, 6:00:03 PM (9 years ago)

Author:

jordan

Message:

(libT) peer-mgr doesn't care about non-piece data being transferred, so don't notify it when it happens

Location:

trunk/libtransmission

Files:

• peer-common.h (modified) (3 diffs)
• peer-io.h (modified) (3 diffs)
• peer-mgr.c (modified) (3 diffs)
• peer-msgs.c (modified) (5 diffs)
• webseed.c (modified) (2 diffs)

trunk/libtransmission/peer-common.h

@@ -52 +52 @@
     TR_PEER_CLIENT_GOT_BLOCK,
     TR_PEER_CLIENT_GOT_CHOKE,
-    TR_PEER_CLIENT_GOT_DATA,
+    TR_PEER_CLIENT_GOT_PIECE_DATA,
     TR_PEER_CLIENT_GOT_ALLOWED_FAST,
     TR_PEER_CLIENT_GOT_SUGGEST,
@@ -61 +61 @@
     TR_PEER_CLIENT_GOT_HAVE_ALL,
     TR_PEER_CLIENT_GOT_HAVE_NONE,
-    TR_PEER_PEER_GOT_DATA,
+    TR_PEER_PEER_GOT_PIECE_DATA,
     TR_PEER_ERROR
 }
@@ -73 +73 @@
     struct tr_bitfield  * bitfield;     /* for GOT_BITFIELD */
     uint32_t              offset;       /* for GOT_BLOCK */
-    uint32_t              length;       /* for GOT_BLOCK + GOT_DATA */
+    uint32_t              length;       /* for GOT_BLOCK + GOT_PIECE_DATA */
     int                   err;          /* errno for GOT_ERROR */
-    bool                  wasPieceData; /* for GOT_DATA */
     tr_port               port;         /* for GOT_PORT */
 }

trunk/libtransmission/peer-io.h

@@ -58 +58 @@
 
 typedef ReadState (*tr_can_read_cb)(struct tr_peerIo * io,
-                                        void             * user_data,
-                                        size_t           * setme_piece_byte_count);
-
-typedef void    (*tr_did_write_cb)(struct tr_peerIo * io,
-                                        size_t             bytesWritten,
-                                        int                wasPieceData,
-                                        void             * userData);
-
-typedef void    (*tr_net_error_cb)(struct tr_peerIo * io,
-                                        short              what,
-                                        void             * userData);
+                                    void             * user_data,
+                                    size_t           * setme_piece_byte_count);
+
+typedef void (*tr_did_write_cb)(struct tr_peerIo * io,
+                                size_t             bytesWritten,
+                                bool               wasPieceData,
+                                void             * userData);
+
+typedef void (*tr_net_error_cb)(struct tr_peerIo * io,
+                                short              what,
+                                void             * userData);
 
 typedef struct tr_peerIo
@@ -258 +258 @@
 **/
 
-void    tr_peerIoSetIOFuncs    (tr_peerIo        * io,
-                                   tr_can_read_cb     readcb,
-                                   tr_did_write_cb    writecb,
-                                   tr_net_error_cb    errcb,
-                                   void             * user_data);
-
-void    tr_peerIoClear         (tr_peerIo        * io);
+void    tr_peerIoSetIOFuncs   (tr_peerIo        * io,
+                               tr_can_read_cb     readcb,
+                               tr_did_write_cb    writecb,
+                               tr_net_error_cb    errcb,
+                               void             * user_data);
+
+void    tr_peerIoClear        (tr_peerIo        * io);
 
 /**
@@ -271 +271 @@
 
 void    tr_peerIoWriteBytes   (tr_peerIo         * io,
-                                  const void        * writeme,
-                                  size_t              writemeLen,
-                                  bool                isPieceData);
+                               const void        * writeme,
+                               size_t              writemeLen,
+                               bool                isPieceData);
 
 void    tr_peerIoWriteBuf     (tr_peerIo         * io,
-                                  struct evbuffer   * buf,
-                                  bool                isPieceData);
+                               struct evbuffer   * buf,
+                               bool                isPieceData);
 
 /**

trunk/libtransmission/peer-mgr.c

@@ -102 +102 @@
 };
 
-const tr_peer_event TR_PEER_EVENT_INIT = { 0, 0, NULL, 0, 0, 0, false, 0 };
+const tr_peer_event TR_PEER_EVENT_INIT = { 0, 0, NULL, 0, 0, 0, 0 };
 
 /**
@@ -1698 +1698 @@
   switch (e->eventType)
     {
-      case TR_PEER_PEER_GOT_DATA:
+      case TR_PEER_PEER_GOT_PIECE_DATA:
         {
           const time_t now = tr_time ();
           tr_torrent * tor = s->tor;
 
-          if (e->wasPieceData)
-            {
-              tor->uploadedCur += e->length;
-              tr_announcerAddBytes (tor, TR_ANN_UP, e->length);
-              tr_torrentSetActivityDate (tor, now);
-              tr_torrentSetDirty (tor);
-            }
-
-          /* update the stats */
-          if (e->wasPieceData)
-            tr_statsAddUploaded (tor->session, e->length);
-
-          /* update our atom */
-          if (peer->atom && e->wasPieceData)
+          tor->uploadedCur += e->length;
+          tr_announcerAddBytes (tor, TR_ANN_UP, e->length);
+          tr_torrentSetActivityDate (tor, now);
+          tr_torrentSetDirty (tor);
+          tr_statsAddUploaded (tor->session, e->length);
+
+          if (peer->atom != NULL)
+            peer->atom->piece_data_time = now;
+
+          break;
+        }
+
+      case TR_PEER_CLIENT_GOT_PIECE_DATA:
+        {
+          const time_t now = tr_time ();
+          tr_torrent * tor = s->tor;
+
+          tor->downloadedCur += e->length;
+          tr_torrentSetActivityDate (tor, now);
+          tr_torrentSetDirty (tor);
+
+          tr_statsAddDownloaded (tor->session, e->length);
+
+          if (peer->atom != NULL)
             peer->atom->piece_data_time = now;
 
@@ -1779 +1789 @@
         break;
 
-      case TR_PEER_CLIENT_GOT_DATA:
-        {
-          const time_t now = tr_time ();
-          tr_torrent * tor = s->tor;
-
-          if (e->wasPieceData)
-            {
-              tor->downloadedCur += e->length;
-              tr_torrentSetActivityDate (tor, now);
-              tr_torrentSetDirty (tor);
-            }
-
-          /* update the stats */
-          if (e->wasPieceData)
-            tr_statsAddDownloaded (tor->session, e->length);
-
-          /* update our atom */
-          if (peer->atom && e->wasPieceData)
-            peer->atom->piece_data_time = now;
-
-          break;
-        }
-
       case TR_PEER_CLIENT_GOT_BLOCK:
         {
-          const tr_block_index_t block = _tr_block (s->tor, e->pieceIndex, e->offset);
+          tr_torrent * tor = s->tor;
+          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);
-          pieceListResortPiece (s, pieceListLookup (s, e->pieceIndex));
-          tr_torrentGotBlock (s->tor, block);
+          pieceListResortPiece (s, pieceListLookup (s, p));
+          tr_torrentGotBlock (tor, block);
           break;
         }

trunk/libtransmission/peer-msgs.c

@@ -497 +497 @@
 
 static void
-fireClientGotData (tr_peermsgs * msgs, uint32_t length, int wasPieceData)
+fireClientGotPieceData (tr_peermsgs * msgs, uint32_t length)
 {
     tr_peer_event e = TR_PEER_EVENT_INIT;
-
     e.length = length;
-    e.eventType = TR_PEER_CLIENT_GOT_DATA;
-    e.wasPieceData = wasPieceData;
+    e.eventType = TR_PEER_CLIENT_GOT_PIECE_DATA;
+    publish (msgs, &e);
+}
+
+static void
+firePeerGotPieceData (tr_peermsgs * msgs, uint32_t length)
+{
+    tr_peer_event e = TR_PEER_EVENT_INIT;
+    e.length = length;
+    e.eventType = TR_PEER_PEER_GOT_PIECE_DATA;
     publish (msgs, &e);
 }
@@ -552 +559 @@
 }
 
-static void
-firePeerGotData (tr_peermsgs * msgs, uint32_t length, bool wasPieceData)
-{
-    tr_peer_event e = TR_PEER_EVENT_INIT;
-
-    e.length = length;
-    e.eventType = TR_PEER_PEER_GOT_DATA;
-    e.wasPieceData = wasPieceData;
-
-    publish (msgs, &e);
-}
 
 /**
@@ -1332 +1328 @@
         tr_peerIoReadBytesToBuf (msgs->peer->io, inbuf, block_buffer, n);
 
-        fireClientGotData (msgs, n, true);
+        fireClientGotPieceData (msgs, n);
         *setme_piece_bytes_read += n;
         dbgmsg (msgs, "got %zu bytes for block %u:%u->%u ... %d remain",
@@ -1604 +1600 @@
 
 static void
-didWrite (tr_peerIo * io UNUSED, size_t bytesWritten, int wasPieceData, void * vmsgs)
+didWrite (tr_peerIo * io UNUSED, size_t bytesWritten, bool wasPieceData, void * vmsgs)
 {
     tr_peermsgs * msgs = vmsgs;
-    firePeerGotData (msgs, bytesWritten, wasPieceData);
+
+    if (wasPieceData)
+      firePeerGotPieceData (msgs, bytesWritten);
 
     if (tr_isPeerIo (io) && io->userData)
@@ -1648 +1646 @@
 
     dbgmsg (msgs, "canRead: ret is %d", (int)ret);
-
-    /* log the raw data that was read */
-    if ((ret != READ_ERR) && (evbuffer_get_length (in) != inlen))
-        fireClientGotData (msgs, inlen - evbuffer_get_length (in), false);
 
     return ret;

trunk/libtransmission/webseed.c

@@ -143 +143 @@
 
 static void
-fire_client_got_data (tr_webseed * w, uint32_t length)
+fire_client_got_piece_data (tr_webseed * w, uint32_t length)
 {
     tr_peer_event e = TR_PEER_EVENT_INIT;
-    e.eventType = TR_PEER_CLIENT_GOT_DATA;
+    e.eventType = TR_PEER_CLIENT_GOT_PIECE_DATA;
     e.length = length;
-    e.wasPieceData = true;
     publish (w, &e);
 }
@@ -253 +252 @@
     {
         tr_bandwidthUsed (&w->bandwidth, TR_DOWN, n_added, true, tr_time_msec ());
-        fire_client_got_data (w, n_added);
+        fire_client_got_piece_data (w, n_added);
     }