Delegator Refactoring: More bugfixes.

git-svn-id: svn://rakshasa.no/libtorrent/trunk/libtorrent@162 e378c898-3ddf-0310-93e7-cc216c733640

src/content/delegator.cc

@@ -49,6 +49,12 @@ Delegator::delegate(const BitField& bf, int affinity) {
 					    bool_not(call_member(&DelegatorPiece::get_reservees_size))),
 				   assign_ref(target, back_as_ptr()))));
 
+  if (target)
+    return target->create();
+
+  // else find a new chunk
+  target = new_chunk(bf);
+
   if (target)
     return target->create();
 
@@ -63,12 +69,6 @@ Delegator::delegate(const BitField& bf, int affinity) {
 
 				   assign_ref(target, back_as_ptr()))));
 
-  if (target)
-    return target->create();
-
-  // else find a new chunk
-  target = new_chunk(bf);
-
   if (target)
     return target->create();
 

src/peer/request_list.cc

@@ -47,9 +47,10 @@ RequestList::downloading(const Piece& p) {
   if (m_downloading)
     throw internal_error("RequestList::downloading(...) bug, m_downloaing is already set");
 
-  ReserveeList::iterator itr = std::find_if(m_reservees.begin(), m_reservees.end(),
-					    eq(ref(p), call_member(&DelegatorReservee::get_piece)));
-
+  ReserveeList::iterator itr =
+    std::find_if(m_reservees.begin(), m_reservees.end(),
+		 eq(ref(p), call_member(&DelegatorReservee::get_piece)));
+
   if (itr == m_reservees.end() || !m_delegator->downloading(**itr))
     return false;
 
@@ -106,4 +107,21 @@ RequestList::cancel_range(ReserveeList::iterator end) {
   }
 }
 
+unsigned int
+RequestList::remove_invalid() {
+  unsigned int count = 0;
+  ReserveeList::iterator itr;
+
+  // Could be more efficient, but rarely do we find any.
+  while ((itr = std::find_if(m_reservees.begin(), m_reservees.end(),
+			     bool_not(call_member(&DelegatorReservee::is_valid))))
+	 != m_reservees.end()) {
+    count++;
+    delete *itr;
+    m_reservees.erase(itr);
+  }
+
+  return count;
+}
+
 }

src/peer/request_list.h

@@ -37,11 +37,19 @@ class RequestList {
   bool               is_wanted()                      { return m_reservees.front()->is_valid(); }
 
   bool               has_index(unsigned int i);
+  unsigned int       remove_invalid();
 
   unsigned int       get_size()                       { return m_reservees.size(); }
 
   const Piece&       get_piece()                      { return m_piece; }
-  const Piece&       get_queued_piece(unsigned int i) { return m_reservees[i]->get_piece(); }
+
+  Piece              get_queued_piece(unsigned int i) {
+    // TODO: Make this unnessesary?
+    if (m_reservees[i]->is_valid())
+      return m_reservees[i]->get_piece();
+    else
+      return Piece();
+  }
 
   void               set_delegator(Delegator* d)      { m_delegator = d; }
   void               set_bitfield(const BitField* b)  { m_bitfield = b; }

src/peer_connection.cc

@@ -191,7 +191,6 @@ void PeerConnection::read() {
 	m_down.length = piece.get_length();
 	m_down.state = READ_SKIP_PIECE;
 
-	remove_service(SERVICE_STALL);
 	caughtExceptions.push_back("Receiving piece we don't want from " + m_peer.dns());
       }
 
@@ -234,7 +233,8 @@ void PeerConnection::read() {
       m_down.pos = 0;
 
       m_requests.skip();
-      remove_service(SERVICE_STALL);
+
+      goto evil_goto_read;
     }
 
     previous = m_down.pos;
@@ -264,32 +264,32 @@ void PeerConnection::read() {
     goto evil_goto_read;
 
   case READ_SKIP_PIECE:
-    // TODO: Temporary, kill as soon as possible.
-    if (in_service(SERVICE_STALL))
-      throw internal_error("READ_SKIP_PIECE state but peer is in SERVICE_STALL");
+    if (m_down.pos != 0)
+      throw internal_error("READ_SKIP_PIECE m_down.pos != 0");
 
-    previous = m_down.pos;
     s = readBuf(m_down.buf,
 		std::min(m_down.length, BUFFER_SIZE),
 		m_down.pos);
 
-    m_throttle.down().add(m_down.pos - previous);
+    m_throttle.down().add(m_down.pos);
 
-    if (!s)
-      return;
-
     m_down.length -= m_down.pos;
     m_down.pos = 0;
 
     if (m_down.length == 0) {
       // Done with this piece.
       m_down.state = IDLE;
 
+      remove_service(SERVICE_STALL);
+
       if (m_requests.get_size())
 	insert_service(Timer::cache() + m_download->settings().stallTimeout, SERVICE_STALL);
     }
 
-    goto evil_goto_read;
+    if (s)
+      goto evil_goto_read;
+    else
+      return;
 
   default:
     throw internal_error("peer_connectino::read() called on object in wrong state");
@@ -663,7 +663,6 @@ void PeerConnection::sendHave(int index) {
   // skip it.
   if (m_requests.is_downloading() &&
       m_requests.get_piece().get_index() == index) {
-    throw internal_error("PeerConnection::sendHave(...) got RequestList.is_downloading() with this index");
 
     if (m_down.state != READ_PIECE)
       throw internal_error("PeerConnection::sendHave(...) got RequestList.is_downloading() but state is not READ_PIECE");
@@ -672,11 +671,15 @@ void PeerConnection::sendHave(int index) {
     m_down.length = m_requests.get_piece().get_length() - m_down.pos;
     m_down.pos = 0;
 
-    // TODO: Do some proper canceling here.
+    m_requests.skip();
 
     m_down.data = Storage::Chunk();
   }
 
+  if (m_requests.remove_invalid() &&
+      m_requests.get_size() == 0)
+    remove_service(SERVICE_STALL);
+
   if (m_requests.has_index(index))
     throw internal_error("PeerConnection::sendHave(...) found a request with the same index");