From 1955ecf6881896aebfb32e3532f5b156d5b47085 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 10 Mar 2014 21:32:48 +0000 Subject: [PATCH] merged additional unit test from RC_0_16 --- test/test_remap_files.cpp | 158 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 152 insertions(+), 6 deletions(-) diff --git a/test/test_remap_files.cpp b/test/test_remap_files.cpp index 03aec2088..867ef62b2 100644 --- a/test/test_remap_files.cpp +++ b/test/test_remap_files.cpp @@ -74,7 +74,7 @@ void test_remap_files_gather(storage_mode_t storage_mode = storage_mode_sparse) torrent_handle tor2; create_directory("tmp1_remap", ec); - create_directory("tmp1_remap/test_torrent_dir", ec); + create_directory(combine_path("tmp1_remap", "test_torrent_dir"), ec); if (ec) { fprintf(stderr, "error creating directory: %s\n" @@ -87,13 +87,13 @@ void test_remap_files_gather(storage_mode_t storage_mode = storage_mode_sparse) { 50, 16000-50, 16000, 1700, 100, 8000, 8000, 1,1,10,10,10,1000,10,10,10,10,1000,10,10,10,1,1,1 ,10,1000,1000,1000,10,1000,130,65000,340,750,20,300,400,5000,23000,900,43000,4000,43000,60, 40}; - create_random_files("tmp1_remap/test_torrent_dir", file_sizes - , sizeof(file_sizes)/sizeof(file_sizes[0])); + create_random_files(combine_path("tmp1_remap", "test_torrent_dir") + , file_sizes, sizeof(file_sizes)/sizeof(file_sizes[0])); file_storage fs; - add_files(fs, "tmp1_remap/test_torrent_dir"); // generate a torrent with pad files to make sure they // are not requested web seeds + add_files(fs, combine_path("tmp1_remap", "test_torrent_dir")); libtorrent::create_torrent ct(fs, 0x8000, 0x4000); set_piece_hashes(ct, "tmp1_remap", ec); if (ec) @@ -203,6 +203,8 @@ void test_remap_files_gather(storage_mode_t storage_mode = storage_mode_sparse) void test_remap_files_scatter(storage_mode_t storage_mode = storage_mode_sparse) { + int num_files = 10; + // in case the previous run was terminated error_code ec; @@ -222,14 +224,16 @@ void test_remap_files_scatter(storage_mode_t storage_mode = storage_mode_sparse) file.close(); file_storage fs; - for (int i = 0; i < 9; ++i) + for (int i = 0; i < num_files-1; ++i) { char name[100]; snprintf(name, sizeof(name), "multifile/file%d.txt", i); fs.add_file(name, t->total_size() / 10); } char name[100]; - snprintf(name, sizeof(name), "multifile/file%d.txt", 9); + snprintf(name, sizeof(name), "multifile/file%d.txt", num_files); + // the last file has to be a special case to make the size + // add up exactly (in case the total size is not divisible by 10). fs.add_file(name, t->total_size() - fs.total_size()); boost::intrusive_ptr t2 = clone_ptr(t); @@ -324,6 +328,135 @@ void test_remap_files_scatter(storage_mode_t storage_mode = storage_mode_sparse) TEST_CHECK(st2.is_seeding); } +void test_remap_files_prio(storage_mode_t storage_mode = storage_mode_sparse) +{ + // in case the previous run was terminated + error_code ec; + + int const alert_mask = alert::all_categories + & ~alert::progress_notification + & ~alert::stats_notification; + + session ses1(fingerprint("LT", 0, 1, 0, 0), std::make_pair(48075, 49000), "0.0.0.0", 0, alert_mask); + session ses2(fingerprint("LT", 0, 1, 0, 0), std::make_pair(49075, 50000), "0.0.0.0", 0, alert_mask); + + torrent_handle tor1; + torrent_handle tor2; + + create_directory("tmp1_remap3", ec); + create_directory(combine_path("tmp1_remap3", "test_torrent_dir"), ec); + + // create a torrent with 2 files, remap them into 3 files and make sure + // the file priorities don't break things + static const int file_sizes[] = {100000, 100000}; + const int num_files = sizeof(file_sizes)/sizeof(file_sizes[0]); + + create_random_files(combine_path("tmp1_remap3", "test_torrent_dir") + , file_sizes, num_files); + + file_storage fs1; + const int piece_size = 0x4000; + + add_files(fs1, combine_path("tmp1_remap3", "test_torrent_dir")); + libtorrent::create_torrent ct(fs1, piece_size, 0x4000 + , libtorrent::create_torrent::optimize); + + // calculate the hash for all pieces + set_piece_hashes(ct, "tmp1_remap3", ec); + if (ec) fprintf(stderr, "ERROR: set_piece_hashes: (%d) %s\n" + , ec.value(), ec.message().c_str()); + + std::vector buf; + bencode(std::back_inserter(buf), ct.generate()); + boost::intrusive_ptr t(new torrent_info(&buf[0], buf.size(), ec)); + + int num_new_files = 3; + + file_storage fs; + for (int i = 0; i < num_new_files-1; ++i) + { + char name[100]; + snprintf(name, sizeof(name), "multifile/file%d.txt", i); + fs.add_file(name, t->total_size() / 10); + } + char name[100]; + snprintf(name, sizeof(name), "multifile/file%d.txt", num_new_files); + // the last file has to be a special case to make the size + // add up exactly (in case the total size is not divisible by 10). + fs.add_file(name, t->total_size() - fs.total_size()); + + boost::intrusive_ptr t2 = clone_ptr(t); + + t2->remap_files(fs); + + add_torrent_params params; + params.storage_mode = storage_mode; + params.flags &= ~add_torrent_params::flag_paused; + params.flags &= ~add_torrent_params::flag_auto_managed; + + wait_for_listen(ses1, "ses1"); + wait_for_listen(ses2, "ses2"); + + peer_disconnects = 0; + + std::vector file_prio(2, 1); + file_prio[0] = 0; + params.file_priorities = file_prio; + + // test using piece sizes smaller than 16kB + boost::tie(tor1, tor2, ignore) = setup_transfer(&ses1, &ses2, 0 + , true, false, true, "_remap3", 8 * 1024, &t, false, ¶ms + , true, false, &t2); + + fprintf(stderr, "\ntesting remap scatter prio\n\n"); + + for (int i = 0; i < 50; ++i) + { + print_alerts(ses1, "ses1", true, true, true, on_alert); + print_alerts(ses2, "ses2", true, true, true, on_alert); + + torrent_status st1 = tor1.status(); + torrent_status st2 = tor2.status(); + + if (i % 10 == 0) + { + std::cerr + << "\033[32m" << int(st1.download_payload_rate / 1000.f) << "kB/s " + << "\033[33m" << int(st1.upload_payload_rate / 1000.f) << "kB/s " + << "\033[0m" << int(st1.progress * 100) << "% " + << st1.num_peers + << ": " + << "\033[32m" << int(st2.download_payload_rate / 1000.f) << "kB/s " + << "\033[31m" << int(st2.upload_payload_rate / 1000.f) << "kB/s " + << "\033[0m" << int(st2.progress * 100) << "% " + << st2.num_peers + << std::endl; + } + + if (st2.is_finished) break; + + if (st2.state != torrent_status::downloading) + { + static char const* state_str[] = + {"checking (q)", "checking", "dl metadata" + , "downloading", "finished", "seeding", "allocating", "checking (r)"}; + std::cerr << "st2 state: " << state_str[st2.state] << std::endl; + } + + TEST_CHECK(st1.state == torrent_status::seeding + || st1.state == torrent_status::checking_files); + TEST_CHECK(st2.state == torrent_status::downloading + || st2.state == torrent_status::checking_resume_data); + + if (peer_disconnects >= 2) break; + + test_sleep(100); + } + + torrent_status st2 = tor2.status(); + TEST_CHECK(st2.is_finished); +} + int test_main() { using namespace libtorrent; @@ -336,6 +469,8 @@ int test_main() remove_all("tmp1_remap", ec); remove_all("tmp2_remap", ec); + remove_all("tmp1_remap2", ec); + remove_all("tmp2_remap2", ec); test_remap_files_scatter(); @@ -343,6 +478,17 @@ int test_main() remove_all("tmp2_remap", ec); remove_all("tmp1_remap2", ec); remove_all("tmp2_remap2", ec); + remove_all("tmp1_remap3", ec); + remove_all("tmp2_remap3", ec); + + test_remap_files_prio(); + + remove_all("tmp1_remap", ec); + remove_all("tmp2_remap", ec); + remove_all("tmp1_remap2", ec); + remove_all("tmp2_remap2", ec); + remove_all("tmp1_remap3", ec); + remove_all("tmp2_remap3", ec); return 0; }