Changeset 1058 for trunk/libtorrent/src/protocol/peer_connection_leech.cc

Timestamp:

05/05/08 15:16:26 (4 years ago)

Author:

rakshasa

Message:

* Initial seeding support added. Patch by Josef Drexler.

Files:

• trunk/libtorrent/src/protocol/peer_connection_leech.cc (modified) (16 diffs)

trunk/libtorrent/src/protocol/peer_connection_leech.cc

@@ -51 +51 @@
 
 #include "extensions.h"
+#include "initial_seed.h"
 #include "peer_connection_leech.h"
 
@@ -66 +67 @@
 void
 PeerConnection<type>::initialize_custom() {
+  if (type == Download::CONNECTION_INITIAL_SEED) {
+    if (m_download->initial_seeding() == NULL) {
+      // Can't throw close_connection or network_error here, we're still
+      // initializing. So close the socket and let that kill it later.
+      get_fd().close();
+      return;
+    }
+
+    m_download->initial_seeding()->new_peer(this);
+  }
 //   if (m_download->content()->chunks_completed() != 0) {
 //     m_up->write_bitfield(m_download->file_list()->bitfield()->size_bytes());
@@ -78 +89 @@
 void
 PeerConnection<type>::update_interested() {
-  if (type == Download::CONNECTION_SEED)
+  if (type != Download::CONNECTION_LEECH)
     return;
 
@@ -118 +129 @@
   }
 
-  if (type == Download::CONNECTION_SEED)
+  if (type != Download::CONNECTION_LEECH)
     return true;
 
@@ -193 +204 @@
   switch (buf->read_8()) {
   case ProtocolBase::CHOKE:
-    if (type == Download::CONNECTION_SEED)
+    if (type != Download::CONNECTION_LEECH)
       return true;
 
@@ -213 +224 @@
 
   case ProtocolBase::UNCHOKE:
-    if (type == Download::CONNECTION_SEED)
+    if (type != Download::CONNECTION_LEECH)
       return true;
 
@@ -259 +270 @@
 
   case ProtocolBase::PIECE:
-    if (type == Download::CONNECTION_SEED)
+    if (type != Download::CONNECTION_LEECH)
       throw communication_error("Received a piece but the connection is strictly for seeding.");
 
@@ -382 +393 @@
 
       case ProtocolRead::READ_PIECE:
-        if (type == Download::CONNECTION_SEED)
+        if (type != Download::CONNECTION_LEECH)
           return;
 
@@ -402 +413 @@
 
       case ProtocolRead::READ_SKIP_PIECE:
-        if (type == Download::CONNECTION_SEED)
+        if (type != Download::CONNECTION_LEECH)
           return;
 
@@ -490 +501 @@
   // request has been received while uninterested. The problem arises
   // as they send unchoke before receiving interested.
-  if (type != Download::CONNECTION_SEED && m_sendInterested && m_up->can_write_interested()) {
+  if (type == Download::CONNECTION_LEECH && m_sendInterested && m_up->can_write_interested()) {
     m_up->write_interested(m_downInterested);
     m_sendInterested = false;
   }
 
-  if (type != Download::CONNECTION_SEED && m_tryRequest) {
+  if (type == Download::CONNECTION_LEECH && m_tryRequest) {
     if (!(m_tryRequest = !should_request()) &&
         !(m_tryRequest = try_request_pieces()) &&
@@ -509 +520 @@
   DownloadMain::have_queue_type* haveQueue = m_download->have_queue();
 
-  if (type != Download::CONNECTION_SEED && 
+  if (type == Download::CONNECTION_LEECH && 
       !haveQueue->empty() &&
       m_peerChunks.have_timer() <= haveQueue->front().first &&
@@ -523 +534 @@
   }
 
-  while (type != Download::CONNECTION_SEED && !m_peerChunks.cancel_queue()->empty() && m_up->can_write_cancel()) {
+  if (type == Download::CONNECTION_INITIAL_SEED && m_up->can_write_have())
+    offer_chunk();
+
+  while (type == Download::CONNECTION_LEECH && !m_peerChunks.cancel_queue()->empty() && m_up->can_write_cancel()) {
     m_up->write_cancel(m_peerChunks.cancel_queue()->front());
     m_peerChunks.cancel_queue()->pop_front();
@@ -534 +548 @@
   } else if (!m_upChoke.choked() &&
              !m_peerChunks.upload_queue()->empty() &&
-             m_up->can_write_piece()) {
+             m_up->can_write_piece() &&
+             (type != Download::CONNECTION_INITIAL_SEED || should_upload())) {
     write_prepare_piece();
   }
@@ -639 +654 @@
   m_download->chunk_statistics()->received_have_chunk(&m_peerChunks, index, m_download->file_list()->chunk_size());
 
+  if (type == Download::CONNECTION_INITIAL_SEED)
+    m_download->initial_seeding()->chunk_seen(index, this);
+
+  // Disconnect seeds when we are seeding (but not for initial seeding
+  // so that we keep accurate chunk statistics until that is done).
   if (m_peerChunks.bitfield()->is_all_set()) {
-    if (type == Download::CONNECTION_SEED || m_download->file_list()->is_done())
+    if (type == Download::CONNECTION_SEED || 
+        (type != Download::CONNECTION_INITIAL_SEED && m_download->file_list()->is_done()))
       throw close_connection();
 
@@ -646 +667 @@
   }
 
-  if (type == Download::CONNECTION_SEED || m_download->file_list()->is_done())
+  if (type != Download::CONNECTION_LEECH || m_download->file_list()->is_done())
     return;
 
@@ -677 +698 @@
 }
 
-// Explicit instatiation of the member functions and vtable.
+template<>
+void
+PeerConnection<Download::CONNECTION_INITIAL_SEED>::offer_chunk() {
+  // If bytes left to send in this chunk minus bytes about to be sent is zero,
+  // assume the peer will have got the chunk completely. In that case we may
+  // get another one to offer if not enough other peers are interested even
+  // if the peer would otherwise still be blocked.
+  uint32_t bytesLeft = m_data.bytesLeft;
+  if (!m_peerChunks.upload_queue()->empty() && m_peerChunks.upload_queue()->front().index() == m_data.lastIndex)
+    bytesLeft -= m_peerChunks.upload_queue()->front().length();
+
+  uint32_t index = m_download->initial_seeding()->chunk_offer(this, bytesLeft == 0 ? m_data.lastIndex : InitialSeeding::no_offer);
+
+  if (index == InitialSeeding::no_offer || index == m_data.lastIndex)
+    return;
+
+  m_up->write_have(index);
+  m_data.lastIndex = index;
+  m_data.bytesLeft = m_download->file_list()->chunk_index_size(index);
+}
+
+template<>
+bool
+PeerConnection<Download::CONNECTION_INITIAL_SEED>::should_upload() {
+  // For initial seeding, check if chunk is well seeded now, and if so
+  // remove it from the queue to better use our bandwidth on rare chunks.
+  while (!m_peerChunks.upload_queue()->empty() &&
+         !m_download->initial_seeding()->should_upload(m_peerChunks.upload_queue()->front().index()))
+    m_peerChunks.upload_queue()->pop_front();
+
+  // If queue ends up empty, choke peer to let it know that it
+  // shouldn't wait for the cancelled pieces to be sent.
+  if (m_peerChunks.upload_queue()->empty()) {
+    m_download->upload_choke_manager()->set_not_queued(this, &m_upChoke);
+    m_download->upload_choke_manager()->set_queued(this, &m_upChoke);
+
+  // If we're sending the chunk we last offered, adjust bytes left in it.
+  } else if (m_peerChunks.upload_queue()->front().index() == m_data.lastIndex) {
+    m_data.bytesLeft -= m_peerChunks.upload_queue()->front().length();
+
+    if (!m_data.bytesLeft)
+      m_data.lastIndex = InitialSeeding::no_offer;
+  }
+
+  return !m_peerChunks.upload_queue()->empty();
+}
+
+// Explicit instantiation of the member functions and vtable.
 template class PeerConnection<Download::CONNECTION_LEECH>;
 template class PeerConnection<Download::CONNECTION_SEED>;
-
-}
+template class PeerConnection<Download::CONNECTION_INITIAL_SEED>;
+
+}