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

fixed handling of unaligned block requests

Browse Source
This commit is contained in:
Arvid Norberg
2009-05-31 19:33:54 +00:00
parent 524151c040
commit 3e7bd46706
2 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
test/test_storage.cpp
View File

@@ -49,7 +49,8 @@ POSSIBILITY OF SUCH DAMAGE.
using namespace libtorrent;
using namespace boost::filesystem;
const int piece_size = 16 * 1024;
const int piece_size = 16 * 1024 * 16;
const int block_size = 16 * 1024;
const int half = piece_size / 2;
@@ -92,6 +93,19 @@ void on_check_files(int ret, disk_io_job const& j, bool* done)
}
}
void on_read(int ret, disk_io_job const& j, bool* done)
{
std::cerr << "on_read ret: " << ret;
*done = true;
if (ret < 0)
{
std::cerr << j.error.message() << std::endl;
std::cerr << j.error_file << std::endl;
}
}
void on_move_storage(int ret, disk_io_job const& j, std::string path)
{
std::cerr << "on_move_storage ret: " << ret << " path: " << j.str << std::endl;
@@ -206,6 +220,18 @@ void run_storage_tests(boost::intrusive_ptr<torrent_info> info
ios.run_one(ec);
}
done = false;
peer_request r;
r.piece = 0;
r.start = 10;
r.length = 16 * 1024;
pm->async_read(r, boost::bind(&on_read, _1, _2, &done));
while (!done)
{
ios.reset();
ios.run_one(ec);
}
// test rename_file
remove(test_path / "part0");
TEST_CHECK(exists(test_path / "temp_storage/test1.tmp"));
@@ -246,15 +272,14 @@ void run_storage_tests(boost::intrusive_ptr<torrent_info> info
TEST_CHECK(!exists(test_path / "temp_storage2/temp_storage"));
TEST_CHECK(!exists(test_path / "temp_storage2/part0"));
peer_request r;
r.piece = 0;
r.start = 0;
r.length = piece_size;
pm->async_read(r, bind(&on_read_piece, _1, _2, piece0, piece_size));
r.length = block_size;
pm->async_read(r, bind(&on_read_piece, _1, _2, piece0, block_size));
r.piece = 1;
pm->async_read(r, bind(&on_read_piece, _1, _2, piece1, piece_size));
pm->async_read(r, bind(&on_read_piece, _1, _2, piece1, block_size));
r.piece = 2;
pm->async_read(r, bind(&on_read_piece, _1, _2, piece2, piece_size));
pm->async_read(r, bind(&on_read_piece, _1, _2, piece2, block_size));
pm->async_release_files(none);
pm->async_rename_file(0, "temp_storage/test1.tmp", none);