Changeset 8bcc7e

Timestamp:

02/09/2009 11:23:26 PM (16 years ago)

Author:

Andrew Resch <andrewresch@gmail.com>

Branches:

2.0.x, develop, extjs4-port, master

Children:

9175ac

Parents:

db23f6

Message:

lt sync 3243

File:

• libtorrent/src/torrent.cpp (modified) (56 diffs)

libtorrent/src/torrent.cpp

@@ -102 +102 @@
                         , tor(t)
                 { TORRENT_ASSERT(t != 0); }
-
+                
                 bool operator()(session_impl::connection_map::value_type const& c) const
                 {
@@ -118 +118 @@
         {
                 peer_by_id(const peer_id& i): pid(i) {}
-
+                
                 bool operator()(session_impl::connection_map::value_type const& p) const
                 {
@@ -353 +353 @@
                 if (m_torrent_file->is_valid() && m_torrent_file->priv()) return false;
                 if (m_trackers.empty()) return true;
-
+                        
                 return m_failed_trackers > 0 || !m_ses.settings().use_dht_as_fallback;
         }
@@ -364 +364 @@
                 // reset, which means that all its peers already have an
                 // invalidated torrent pointer (so it cannot be verified to be correct)
-
+                
                 // i.e. the invariant can only be maintained if all connections have
                 // been closed by the time the torrent is destructed. And they are
@@ -370 +370 @@
 
                 TORRENT_ASSERT(m_connections.empty());
-
+                
                 INVARIANT_CHECK;
 
@@ -422 +422 @@
 
                 add_extension(tp);
-
+                
                 for (peer_iterator i = m_connections.begin();
                         i != m_connections.end(); ++i)
@@ -479 +479 @@
                         if (m_resume_entry.dict_find_string_value("file-format") != "libtorrent resume file")
                                 error = "invalid file format tag";
-
+        
                         std::string info_hash = m_resume_entry.dict_find_string_value("info-hash");
                         if (!error && info_hash.empty())
@@ -507 +507 @@
                         }
                 }
-
+        
                 m_storage->async_check_fastresume(&m_resume_entry
                         , bind(&torrent::on_resume_data_checked
@@ -563 +563 @@
                         {
                                 peer_id id(0);
-
+        
                                 for (int i = 0; i < banned_peers_entry->list_size(); ++i)
                                 {
@@ -581 +581 @@
 
                 bool fastresume_rejected = !j.str.empty();
-
+                
                 if (fastresume_rejected && m_ses.m_alerts.should_post<fastresume_rejected_alert>())
                 {
@@ -748 +748 @@
                         , shared_from_this(), _1, _2));
         }
-
+        
         void torrent::on_piece_checked(int ret, disk_io_job const& j)
         {
@@ -813 +813 @@
         {
                 session_impl::mutex_t::scoped_lock l(m_ses.m_mutex);
-
+        
                 if (m_abort) return;
                 announce_with_tracker();
@@ -954 +954 @@
                 TORRENT_ASSERT(m_currently_trying_tracker >= 0);
                 TORRENT_ASSERT(m_currently_trying_tracker < int(m_trackers.size()));
-
+                
                 tracker_request req;
                 req.info_hash = m_torrent_file->info_hash();
@@ -974 +974 @@
                         m_ses.m_alerts.post_alert(tracker_warning_alert(get_handle(), req.url, msg));
         }
-
+        
         void torrent::tracker_scrape_response(tracker_request const& req
                 , int complete, int incomplete, int downloaded)
         {
                 session_impl::mutex_t::scoped_lock l(m_ses.m_mutex);
-
+ 
                 INVARIANT_CHECK;
                 TORRENT_ASSERT(req.kind == tracker_request::scrape_request);
-
+ 
                 if (complete >= 0) m_complete = complete;
                 if (incomplete >= 0) m_incomplete = incomplete;
-
+ 
                 if (m_ses.m_alerts.should_post<scrape_reply_alert>())
                 {
@@ -992 +992 @@
                 }
         }
-
+ 
         void torrent::tracker_response(
                 tracker_request const& r
@@ -1104 +1104 @@
                         return;
                 }
-
+                        
                 m_policy.peer_from_tracker(*host, pid, peer_info::tracker, 0);
         }
@@ -1166 +1166 @@
                         * piece_size;
                 TORRENT_ASSERT(wanted_done >= 0);
-
+                
                 size_type total_done
                         = size_type(num_have()) * piece_size;
@@ -1295 +1295 @@
                         // but not yet verified against the hash
                         std::cerr << "num_have: " << num_have() << std::endl;
-
+                        
                         std::cerr << "unfinished:" << std::endl;
-
+                        
                         for (std::vector<piece_picker::downloading_piece>::const_iterator i =
                                 dl_queue.begin(); i != dl_queue.end(); ++i)
@@ -1308 +1308 @@
                                 std::cerr << std::endl;
                         }
-
+                        
                         std::cerr << "downloading pieces:" << std::endl;
 
@@ -1635 +1635 @@
                         m_storage->abort_disk_io();
                 }
-
+                
                 dequeue_torrent_check();
+                
+                if (m_state == torrent_status::checking_files)
+                        set_state(torrent_status::queued_for_checking);
 
                 m_owning_storage = 0;
@@ -1691 +1694 @@
         {
                 session_impl::mutex_t::scoped_lock l(m_ses.m_mutex);
-
+                
                 {
                         if (ret == 0)
@@ -1827 +1830 @@
                 // in the torrent
                 TORRENT_ASSERT(int(files.size()) == m_torrent_file->num_files());
-
+                
                 if (m_torrent_file->num_pieces() == 0) return;
 
@@ -1843 +1846 @@
                 update_piece_priorities();
         }
-
+        
         int torrent::file_priority(int index) const
         {
@@ -1965 +1968 @@
                 TORRENT_ASSERT(valid_metadata());
                 if (is_seed()) return false;
-
+                
                 TORRENT_ASSERT(m_picker.get());
                 TORRENT_ASSERT(index >= 0);
@@ -2000 +2003 @@
                 // in the torrent
                 TORRENT_ASSERT((int)bitmask.size() == m_torrent_file->num_files());
-
+                
                 size_type position = 0;
 
@@ -2015 +2018 @@
                                 // is the file selected for download?
                                 if (!bitmask[i])
-                                {
+                                {           
                                         // mark all pieces of the file as downloadable
                                         int start_piece = int(start / piece_length);
@@ -2048 +2051 @@
                 --m_num_uploads;
         }
-
+        
         bool torrent::unchoke_peer(peer_connection& c)
         {
@@ -2161 +2164 @@
                         return;
                 }
-
+                
 #ifdef TORRENT_USE_OPENSSL
                 if (protocol != "http" && protocol != "https")
@@ -2340 +2343 @@
                         return;
                 }
-
+                
                 boost::shared_ptr<socket_type> s(new (std::nothrow) socket_type(m_ses.m_io_service));
                 if (!s) return;
-
+        
                 bool ret = instantiate_connection(m_ses.m_io_service, m_ses.web_seed_proxy(), *s);
                 (void)ret;
@@ -2359 +2362 @@
                         m_ses, shared_from_this(), s, a, url, 0));
                 if (!c) return;
-
+                        
 #ifdef TORRENT_DEBUG
                 c->m_in_constructor = false;
@@ -2410 +2413 @@
                 }
         }
-
+        
         void torrent::resolve_peer_country(boost::intrusive_ptr<peer_connection> const& p) const
         {
@@ -2448 +2451 @@
 
                 INVARIANT_CHECK;
-
+                
                 m_resolving_country = false;
 
@@ -2520 +2523 @@
                         // country is an ISO 3166 country code
                         int country = i->endpoint().address().to_v4().to_ulong() & 0xffff;
-
+                        
                         // look up the country code in the map
                         const int size = sizeof(country_map)/sizeof(country_map[0]);
@@ -2537 +2540 @@
                                 return;
                         }
-
+                        
                         p->set_country(i->name);
                 }
@@ -2613 +2616 @@
                                 std::string new_filename = mapped_files->list_string_value_at(i);
                                 if (new_filename.empty()) continue;
-                                m_torrent_file->rename_file(i, new_filename);
+                                rename_file(i, new_filename);
                         }
                 }
@@ -2628 +2631 @@
                 }
         }
-
+        
         void torrent::write_resume_data(entry& ret) const
         {
@@ -2651 +2654 @@
 
                 ret["sequential_download"] = m_sequential_download;
-
+                
                 const sha1_hash& info_hash = torrent_file().info_hash();
                 ret["info-hash"] = std::string((char*)info_hash.begin(), (char*)info_hash.end());
@@ -2752 +2755 @@
                 entry::list_type& peer_list = ret["peers"].list();
                 entry::list_type& banned_peer_list = ret["banned_peers"].list();
-
+                
                 int max_failcount = m_ses.m_settings.max_failcount;
 
@@ -2845 +2848 @@
                         v.push_back(peer_info());
                         peer_info& p = v.back();
-
+                        
                         peer->get_peer_info(p);
 #ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES
@@ -2923 +2926 @@
                         queue.push_back(pi);
                 }
-
-        }
-
+        
+        }
+        
         bool torrent::connect_to_peer(policy::peer* peerinfo)
         {
@@ -3051 +3054 @@
                         return false;
                 }
-
+                
                 if (m_ses.m_connections.find(p) == m_ses.m_connections.end())
                 {
@@ -3181 +3184 @@
                                 double lhs_rate = double(lhs_transferred) / (lhs_time_connected + 1);
                                 double rhs_rate = double(rhs_transferred) / (rhs_time_connected + 1);
-
+                        
                                 return lhs_rate < rhs_rate;
                         }
@@ -3263 +3266 @@
 
                 INVARIANT_CHECK;
-
+                
                 TORRENT_ASSERT(amount > 0);
                 m_bandwidth_limit[channel].expire(amount);
@@ -3357 +3360 @@
 
         // this is called when we were finished, but some files were
-        // marked for downloading, and we are no longer finished
+        // marked for downloading, and we are no longer finished        
         void torrent::resume_download()
         {
                 INVARIANT_CHECK;
-
+        
                 TORRENT_ASSERT(!is_finished());
                 set_state(torrent_status::downloading);
@@ -3442 +3445 @@
         {
                 session_impl::mutex_t::scoped_lock l(m_ses.m_mutex);
-
+                
                 TORRENT_ASSERT(m_torrent_file->is_valid());
 
@@ -3459 +3462 @@
                                 get_handle()));
                 }
-
+                
                 if (!is_seed())
                 {
@@ -3590 +3593 @@
                 else
                         TORRENT_ASSERT(m_queued_for_checking);
-
+  
                 if (!m_ses.m_queued_for_checking.empty())
                 {
@@ -3715 +3718 @@
                         }
                 }
-
+                        
 // This check is very expensive.
                 TORRENT_ASSERT(!valid_metadata() || m_block_size > 0);
@@ -3766 +3769 @@
                                 torrent* t = i->second.get();
                                 if (t == this) continue;
-                                if (t->m_sequence_number >= p
+                                if (t->m_sequence_number >= p 
                                         && t->m_sequence_number < m_sequence_number
                                         && t->m_sequence_number != -1)
@@ -3987 +3990 @@
         }
 
-        // this is an async operation triggered by the client
+        // this is an async operation triggered by the client   
         void torrent::save_resume_data()
         {
                 INVARIANT_CHECK;
-
+        
                 if (m_owning_storage.get())
                 {
@@ -4264 +4267 @@
                                 , bind(&torrent::connect_to_url_seed, this, _1));
                 }
-
+                
                 for (peer_iterator i = m_connections.begin();
                         i != m_connections.end();)
@@ -4397 +4400 @@
         {
                 TORRENT_ASSERT(valid_metadata());
-
+        
                 fp.resize(m_torrent_file->num_files(), 0);
 
@@ -4406 +4409 @@
                         return;
                 }
-
+                
                 TORRENT_ASSERT(has_picker());
 
@@ -4526 +4529 @@
                 }
         }
-
+        
         void torrent::set_state(torrent_status::state_t s)
         {
@@ -4664 +4667 @@
                                 --num_filtered_pieces;
                         }
-
+                        
                         st.total_wanted -= size_type(num_filtered_pieces) * m_torrent_file->piece_length();
                 }
@@ -4788 +4791 @@
 
 }
+