Changeset 3732

Timestamp:

08/19/08 07:45:23 (5 months ago)

Author:

andar

Message:

lt sync 2613

Location:

branches/1.0.0_RC/libtorrent

Files:

• include/libtorrent/alert_types.hpp (modified) (1 diff)
• src/piece_picker.cpp (modified) (1 diff)
• src/torrent.cpp (modified) (8 diffs)

branches/1.0.0_RC/libtorrent/include/libtorrent/alert_types.hpp

@@ -167 +167 @@
                 {
                         static char const* state_str[] =
-                                {"checking (q)", "checking", "connecting", "dl metadata"
+                                {"checking (q)", "checking", "dl metadata"
                                 , "downloading", "finished", "seeding", "allocating"};
 

branches/1.0.0_RC/libtorrent/src/piece_picker.cpp

@@ -1100 +1100 @@
                 int new_priority = p.priority(this);
 
-                if (prev_priority == new_priority) return false;
+                if (prev_priority == new_priority) return ret;
 
                 TORRENT_ASSERT(prev_priority < int(m_priority_boundries.size()));

branches/1.0.0_RC/libtorrent/src/torrent.cpp

@@ -1801 +1801 @@
 
                 if (m_torrent_file->num_pieces() == 0) return;
-                bool was_finished = is_finished();
 
                 size_type position = 0;
@@ -1827 +1826 @@
                 }
                 prioritize_pieces(pieces);
-                update_peer_interest(was_finished);
         }
 
@@ -1837 +1835 @@
                         (*i)->update_interest();
 
-                // if we used to be finished, but we aren't anymore
-                // we may need to connect to peers again
-                if (!is_finished() && was_finished)
-                        m_policy.recalculate_connect_candidates();
-        
                 // the torrent just became finished
                 if (is_finished() && !was_finished)
+                {
                         finished();
+                }
                 else if (!is_finished() && was_finished)
+                {
+                        // if we used to be finished, but we aren't anymore
+                        // we may need to connect to peers again
                         resume_download();
+                        m_policy.recalculate_connect_candidates();
+                }
         }
 
@@ -3148 +3148 @@
                 if (is_seed()) completed();
 
-        // disconnect all seeds
-        // TODO: should disconnect all peers that have the pieces we have
-        // not just seeds
+                // disconnect all seeds
+                // TODO: should disconnect all peers that have the pieces we have
+                // not just seeds
                 std::vector<peer_connection*> seeds;
                 for (peer_iterator i = m_connections.begin();
@@ -3266 +3266 @@
                 set_state(torrent_status::downloading);
 
+                if (m_ses.m_alerts.should_post<torrent_checked_alert>())
+                {
+                        m_ses.m_alerts.post_alert(torrent_checked_alert(
+                                get_handle()));
+                }
+                
                 if (!is_seed())
                 {
@@ -3275 +3281 @@
                         if (m_ses.m_auto_manage_time_scaler > 1)
                                 m_ses.m_auto_manage_time_scaler = 1;
+
+                        if (is_finished()) finished();
+                }
+                else
+                {
+                        m_complete_sent = true;
+                        finished();
                 }
 
@@ -3290 +3303 @@
                 }
 #endif
-
-                if (is_seed())
-                {
-                        m_complete_sent = true;
-                        finished();
-                }
 
                 if (!m_connections_initialized)
@@ -3312 +3319 @@
                 }
 
-                if (m_ses.m_alerts.should_post<torrent_checked_alert>())
-                {
-                        m_ses.m_alerts.post_alert(torrent_checked_alert(
-                                get_handle()));
-                }
-                
                 m_files_checked = true;