*** empty log message ***
This commit is contained in:
parent
6466b46573
commit
b5914b5528
|
@ -147,7 +147,7 @@ namespace libtorrent
|
||||||
void initialize_pieces(torrent* t,
|
void initialize_pieces(torrent* t,
|
||||||
const boost::filesystem::path& path,
|
const boost::filesystem::path& path,
|
||||||
detail::piece_checker_data* data,
|
detail::piece_checker_data* data,
|
||||||
boost::mutex* mutex);
|
boost::mutex& mutex);
|
||||||
|
|
||||||
int bytes_left() const { return m_bytes_left; }
|
int bytes_left() const { return m_bytes_left; }
|
||||||
|
|
||||||
|
|
|
@ -101,7 +101,7 @@ namespace libtorrent
|
||||||
void print(std::ostream& os) const;
|
void print(std::ostream& os) const;
|
||||||
|
|
||||||
void allocate_files(detail::piece_checker_data* data,
|
void allocate_files(detail::piece_checker_data* data,
|
||||||
boost::mutex* mutex,
|
boost::mutex& mutex,
|
||||||
const std::string& save_path)
|
const std::string& save_path)
|
||||||
{
|
{
|
||||||
m_storage.initialize_pieces(this, save_path, data, mutex);
|
m_storage.initialize_pieces(this, save_path, data, mutex);
|
||||||
|
|
|
@ -105,7 +105,7 @@ namespace libtorrent
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
t->torrent_ptr->allocate_files(t, &m_mutex, t->save_path);
|
t->torrent_ptr->allocate_files(t, m_mutex, t->save_path);
|
||||||
// lock the session to add the new torrent
|
// lock the session to add the new torrent
|
||||||
|
|
||||||
boost::mutex::scoped_lock l(m_mutex);
|
boost::mutex::scoped_lock l(m_mutex);
|
||||||
|
|
|
@ -333,7 +333,7 @@ bool libtorrent::storage::verify_piece(piece_file& file)
|
||||||
void libtorrent::storage::initialize_pieces(torrent* t,
|
void libtorrent::storage::initialize_pieces(torrent* t,
|
||||||
const boost::filesystem::path& path,
|
const boost::filesystem::path& path,
|
||||||
detail::piece_checker_data* data,
|
detail::piece_checker_data* data,
|
||||||
boost::mutex* mutex)
|
boost::mutex& mutex)
|
||||||
{
|
{
|
||||||
m_save_path = path;
|
m_save_path = path;
|
||||||
m_torrent_file = &t->torrent_file();
|
m_torrent_file = &t->torrent_file();
|
||||||
|
@ -452,7 +452,7 @@ void libtorrent::storage::initialize_pieces(torrent* t,
|
||||||
left_to_write -= chunksize;
|
left_to_write -= chunksize;
|
||||||
progress += chunksize;
|
progress += chunksize;
|
||||||
|
|
||||||
boost::mutex::scoped_lock l(*mutex);
|
boost::mutex::scoped_lock l(mutex);
|
||||||
data->progress = static_cast<float>(progress) / total_bytes;
|
data->progress = static_cast<float>(progress) / total_bytes;
|
||||||
if (data->abort) return;
|
if (data->abort) return;
|
||||||
}
|
}
|
||||||
|
@ -460,7 +460,7 @@ void libtorrent::storage::initialize_pieces(torrent* t,
|
||||||
if (left_to_write > 0) f.write(zeros, left_to_write);
|
if (left_to_write > 0) f.write(zeros, left_to_write);
|
||||||
progress += left_to_write;
|
progress += left_to_write;
|
||||||
|
|
||||||
boost::mutex::scoped_lock l(*mutex);
|
boost::mutex::scoped_lock l(mutex);
|
||||||
data->progress = static_cast<float>(progress) / total_bytes;
|
data->progress = static_cast<float>(progress) / total_bytes;
|
||||||
if (data->abort) return;
|
if (data->abort) return;
|
||||||
}
|
}
|
||||||
|
@ -484,7 +484,7 @@ void libtorrent::storage::initialize_pieces(torrent* t,
|
||||||
// std::cout << i+1 << " / " << m_torrent_file->num_pieces() << " missing: " << missing << "\r";
|
// std::cout << i+1 << " / " << m_torrent_file->num_pieces() << " missing: " << missing << "\r";
|
||||||
|
|
||||||
progress += m_torrent_file->piece_size(i);
|
progress += m_torrent_file->piece_size(i);
|
||||||
boost::mutex::scoped_lock l(*mutex);
|
boost::mutex::scoped_lock l(mutex);
|
||||||
data->progress = static_cast<float>(progress) / total_bytes;
|
data->progress = static_cast<float>(progress) / total_bytes;
|
||||||
if (data->abort) return;
|
if (data->abort) return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue