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

slight performance fix in disk elevator algorithm

Browse Source
This commit is contained in:
Arvid Norberg
2010-04-24 21:53:45 +00:00
parent 54c451e513
commit fb28835452
3 changed files with 62 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
test/test_storage.cpp
View File

@@ -125,11 +125,12 @@ int bufs_size(file::iovec_t const* bufs, int num_bufs);
// simulate a very slow first read
struct test_storage : storage_interface
{
test_storage() {}
test_storage(): m_started(false), m_ready(false) {}
virtual bool initialize(bool allocate_files) { return true; }
virtual bool has_any_file() { return true; }
int write(
const char* buf
, int slot
@@ -147,7 +148,18 @@ struct test_storage : storage_interface
{
if (slot == 0 || slot == 5999)
{
sleep(2000);
mutex::scoped_lock l(m_mutex);
std::cerr << "--- starting job " << slot << " waiting for main thread ---\n" << std::endl;
m_ready = true;
m_ready_condition.signal(l);
while (!m_started)
m_condition.wait(l);
m_condition.clear(l);
m_ready_condition.clear(l);
m_ready = false;
m_started = false;
std::cerr << "--- starting ---\n" << std::endl;
}
return size;
@@ -185,6 +197,28 @@ struct test_storage : storage_interface
virtual bool delete_files() { return false; }
virtual ~test_storage() {}
void wait_for_ready()
{
mutex::scoped_lock l(m_mutex);
while (!m_ready)
m_ready_condition.wait(l);
}
void start()
{
mutex::scoped_lock l(m_mutex);
m_started = true;
m_condition.signal(l);
}
private:
condition m_ready_condition;
condition m_condition;
mutex m_mutex;
bool m_started;
bool m_ready;
};
storage_interface* create_test_storage(file_storage const& fs
@@ -260,11 +294,12 @@ void run_elevator_test()
dio.add_job(j);
// test the elevator going up
turns = 0;
direction = 1;
last_job = 0;
add_job(dio, 0, pm); // trigger delay in storage
// make sure the job is processed
sleep(200);
((test_storage*)pm->get_storage_impl())->wait_for_ready();
boost::uint32_t p = 1234513;
for (int i = 0; i < 100; ++i)
@@ -275,22 +310,25 @@ void run_elevator_test()
add_job(dio, job, pm);
}
((test_storage*)pm->get_storage_impl())->start();
for (int i = 0; i < 101; ++i)
{
ios.run_one(ec);
if (ec) std::cerr << "run_one: " << ec.message() << std::endl;
}
TEST_CHECK(turns < 2);
TEST_CHECK(turns == 0);
TEST_EQUAL(job_counter, 0);
std::cerr << "number of elevator turns: " << turns << std::endl;
// test the elevator going down
turns = 0;
direction = -1;
last_job = 6000;
add_job(dio, 5999, pm); // trigger delay in storage
// make sure the job is processed
sleep(200);
((test_storage*)pm->get_storage_impl())->wait_for_ready();
for (int i = 0; i < 100; ++i)
{
@@ -300,13 +338,15 @@ void run_elevator_test()
add_job(dio, job, pm);
}
((test_storage*)pm->get_storage_impl())->start();
for (int i = 0; i < 101; ++i)
{
ios.run_one(ec);
if (ec) std::cerr << "run_one: " << ec.message() << std::endl;
}
TEST_CHECK(turns < 2);
TEST_CHECK(turns == 0);
TEST_EQUAL(job_counter, 0);
std::cerr << "number of elevator turns: " << turns << std::endl;
@@ -320,7 +360,7 @@ void run_elevator_test()
direction = 0;
add_job(dio, 0, pm); // trigger delay in storage
// make sure the job is processed
sleep(200);
((test_storage*)pm->get_storage_impl())->wait_for_ready();
for (int i = 0; i < 100; ++i)
{
@@ -330,6 +370,8 @@ void run_elevator_test()
add_job(dio, job, pm);
}
((test_storage*)pm->get_storage_impl())->start();
for (int i = 0; i < 101; ++i)
{
ios.run_one(ec);