Refactoring tracker code.

rakshasa · Oct 11, 2011 · 8e9f692 · 8e9f692
1 parent 7a5a888
commit 8e9f692
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/src/torrent/tracker_controller.cc b/src/torrent/tracker_controller.cc
@@ -46,6 +46,7 @@ namespace torrent {
 TrackerController::TrackerController(TrackerList* trackers) :
   m_flags(0),
   m_tracker_list(trackers),
+  m_failed_requests(0),
   m_task_timeout(new rak::priority_item()) {
 }
 
@@ -55,9 +56,12 @@ TrackerController::~TrackerController() {
 
 void
 TrackerController::close() {
+  m_failed_requests = 0;
+
   stop_requesting();
 
   m_tracker_list->close_all();
+  priority_queue_erase(&taskScheduler, m_task_timeout);
 }
 
 void
@@ -82,6 +86,8 @@ TrackerController::stop_requesting() {
 
 void
 TrackerController::receive_success(Tracker* tb, TrackerController::address_list* l) {
+  m_failed_requests = 0;
+
   m_slot_success(l);
 }
 

diff --git a/src/torrent/tracker_controller.h b/src/torrent/tracker_controller.h
@@ -70,6 +70,8 @@ class LIBTORRENT_EXPORT TrackerController {
   TrackerList*        tracker_list()        { return m_tracker_list; }
   TrackerList*        tracker_list() const  { return m_tracker_list; }
 
+  uint32_t            failed_requests() const { return m_failed_requests; }
+
   //protected:
   void                close();
 
@@ -87,11 +89,14 @@ class LIBTORRENT_EXPORT TrackerController {
 
   // TEMP:
   rak::priority_item* task_timeout()        { return m_task_timeout; }
+  void                set_failed_requests(uint32_t value) { m_failed_requests = value; }
 
 private:
   int                 m_flags;
   TrackerList*        m_tracker_list;
 
+  uint32_t            m_failed_requests;
+
   slot_address_list   m_slot_success;
   slot_string         m_slot_failure;
 

diff --git a/src/tracker/tracker_manager.cc b/src/tracker/tracker_manager.cc
@@ -55,7 +55,6 @@ TrackerManager::TrackerManager() :
 
   m_numRequests(0),
   m_maxRequests(4),
-  m_failedRequests(0),
   m_initialTracker(0) {
 
   m_tracker_controller = new TrackerController(m_tracker_list);
@@ -77,14 +76,6 @@ TrackerManager::~TrackerManager() {
   delete m_tracker_controller;
 }
 
-void
-TrackerManager::close() {
-  m_failedRequests = 0;
-
-  m_tracker_controller->close();
-  priority_queue_erase(&taskScheduler, m_tracker_controller->task_timeout());
-}
-
 void
 TrackerManager::send_start() {
   close();
@@ -213,8 +204,6 @@ TrackerManager::receive_timeout() {
 
 void
 TrackerManager::receive_success(AddressList* l) {
-  m_failedRequests = 0;
-
   if (m_tracker_list->state() == DownloadInfo::STOPPED || !m_tracker_controller->is_active())
     return m_tracker_controller->slot_success()(l);
 
@@ -268,10 +257,10 @@ TrackerManager::receive_failed(const std::string& msg) {
 
     if (m_tracker_list->focus() == m_tracker_list->end()) {
       // Tried all the trackers, start from the beginning.
-      m_failedRequests++;
+      m_tracker_controller->set_failed_requests(m_tracker_controller->failed_requests() + 1);
       m_tracker_list->set_focus(m_tracker_list->begin());
 
-      retry_seconds = std::min<unsigned int>(300, 3 + 20 * m_failedRequests);
+      retry_seconds = std::min<unsigned int>(300, 3 + 20 * m_tracker_controller->failed_requests());
     }
 
     priority_queue_insert(&taskScheduler, m_tracker_controller->task_timeout(), (cachedTime + rak::timer::from_seconds(retry_seconds)).round_seconds());

diff --git a/src/tracker/tracker_manager.h b/src/tracker/tracker_manager.h
@@ -103,7 +103,6 @@ class TrackerManager {
 
   uint32_t            m_numRequests;
   uint32_t            m_maxRequests;
-  uint32_t            m_failedRequests;
 
   uint32_t            m_initialTracker;
 };

diff --git a/test/torrent/tracker_controller_test.cc b/test/torrent/tracker_controller_test.cc
@@ -14,6 +14,7 @@ tracker_controller_test::test_basic() {
   torrent::TrackerController tracker_controller(NULL);
 
   CPPUNIT_ASSERT(tracker_controller.flags() == 0);
+  CPPUNIT_ASSERT(tracker_controller.failed_requests() == 0);
   CPPUNIT_ASSERT(!tracker_controller.is_active());
   CPPUNIT_ASSERT(!tracker_controller.is_requesting());
 }
@@ -76,9 +77,11 @@ tracker_controller_test::test_single_success() {
   CPPUNIT_ASSERT(tracker_0_0->trigger_success());
 
   CPPUNIT_ASSERT(success_counter == 1 && failure_counter == 0);
+  CPPUNIT_ASSERT(tracker_controller.failed_requests() == 0);
 
   tracker_list.send_state_idx(0, 2);
   CPPUNIT_ASSERT(tracker_0_0->trigger_failure());
 
   CPPUNIT_ASSERT(success_counter == 1 && failure_counter == 1);
+  //  CPPUNIT_ASSERT(tracker_controller.failed_requests() == 1);
 }