jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge remap_files unit test from RC_0_16

Browse Source
This commit is contained in:
Arvid Norberg
2014-03-05 09:37:49 +00:00
parent 51992598f0
commit 9f4e865596
5 changed files with 370 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/setup_transfer.cpp
View File

@@ -279,13 +279,16 @@ void print_ses_rate(float time
, libtorrent::torrent_status const* st2
, libtorrent::torrent_status const* st3)
{
fprintf(stderr, "%3.1fs | %dkB/s %dkB/s %d%% %d cc:%d%s", time
, int(st1->download_payload_rate / 1000)
, int(st1->upload_payload_rate / 1000)
, int(st1->progress * 100)
, st1->num_peers
, st1->connect_candidates
, st1->error.empty() ? "" : (" [" + st1->error + "]").c_str());
if (st1)
{
fprintf(stderr, "%3.1fs | %dkB/s %dkB/s %d%% %d cc:%d%s", time
, int(st1->download_payload_rate / 1000)
, int(st1->upload_payload_rate / 1000)
, int(st1->progress * 100)
, st1->num_peers
, st1->connect_candidates
, st1->error.empty() ? "" : (" [" + st1->error + "]").c_str());
}
if (st2)
fprintf(stderr, " : %3.1fs | %dkB/s %dkB/s %d%% %d cc:%d%s", time
, int(st2->download_payload_rate / 1000)
@@ -589,7 +592,8 @@ setup_transfer(session* ses1, session* ses2, session* ses3
, bool clear_files, bool use_metadata_transfer, bool connect_peers
, std::string suffix, int piece_size
, boost::intrusive_ptr<torrent_info>* torrent, bool super_seeding
, add_torrent_params const* p, bool stop_lsd, bool use_ssl_ports)
, add_torrent_params const* p, bool stop_lsd, bool use_ssl_ports
, boost::intrusive_ptr<torrent_info>* torrent2)
{
assert(ses1);
assert(ses2);
@@ -689,6 +693,10 @@ setup_transfer(session* ses1, session* ses2, session* ses3
param.ti = 0;
param.info_hash = t->info_hash();
}
else if (torrent2)
{
param.ti = clone_ptr(*torrent2);
}
else
{
param.ti = clone_ptr(t);