Skip to content

Commit

Permalink
fix bug in piece picker where set_piece_priority would return false e…
Browse files Browse the repository at this point in the history
…ven though the piece filter changed and updated test_transfer to catch it

git-svn-id: http://libtorrent.svn.sourceforge.net/svnroot/libtorrent/trunk@2613 a83610d8-ad2a-0410-a6ab-fc0612d85776
  • Loading branch information
arvidn committed Aug 19, 2008
1 parent 6eaa18d commit def87d6
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/piece_picker.cpp
Expand Up @@ -1099,7 +1099,7 @@ namespace libtorrent
p.piece_priority = new_piece_priority;
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()));

Expand Down
33 changes: 33 additions & 0 deletions test/test_transfer.cpp
Expand Up @@ -180,6 +180,39 @@ void test_transfer()

TEST_CHECK(!tor2.is_seed());

std::fill(priorities.begin(), priorities.end(), 1);
tor2.prioritize_pieces(priorities);
std::cout << "setting priorities to 1" << std::endl;

for (int i = 0; i < 130; ++i)
{
print_alerts(ses1, "ses1");
print_alerts(ses2, "ses2");

torrent_status st1 = tor1.status();
torrent_status st2 = tor2.status();

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 (tor2.is_finished()) break;

TEST_CHECK(st1.state == torrent_status::seeding);
TEST_CHECK(st2.state == torrent_status::downloading);

test_sleep(1000);
}

TEST_CHECK(tor2.is_seed());
}

int test_main()
Expand Down

0 comments on commit def87d6

Please sign in to comment.