From 06f2eb29c9717c420a8dda7396c744349a064d71 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 11 Nov 2015 21:44:02 -0500 Subject: [PATCH] tests: integrate cleaned up librbd AIO callback adapter Signed-off-by: Jason Dillaman --- src/test/librbd/test_JournalEntries.cc | 9 +++------ src/test/librbd/test_internal.cc | 13 +++++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/test/librbd/test_JournalEntries.cc b/src/test/librbd/test_JournalEntries.cc index 7dea5475c8d7c..1b8e08235df79 100644 --- a/src/test/librbd/test_JournalEntries.cc +++ b/src/test/librbd/test_JournalEntries.cc @@ -125,8 +125,7 @@ TEST_F(TestJournalEntries, AioWrite) { std::string buffer(512, '1'); C_SaferCond cond_ctx; - librbd::AioCompletion *c = - librbd::aio_create_completion_internal(&cond_ctx, librbd::rbd_ctx_cb); + librbd::AioCompletion *c = librbd::AioCompletion::create(&cond_ctx); c->get(); ictx->aio_work_queue->aio_write(c, 123, buffer.size(), buffer.c_str(), 0); ASSERT_EQ(0, c->wait_for_complete()); @@ -163,8 +162,7 @@ TEST_F(TestJournalEntries, AioDiscard) { ASSERT_TRUE(journaler != NULL); C_SaferCond cond_ctx; - librbd::AioCompletion *c = - librbd::aio_create_completion_internal(&cond_ctx, librbd::rbd_ctx_cb); + librbd::AioCompletion *c = librbd::AioCompletion::create(&cond_ctx); c->get(); ictx->aio_work_queue->aio_discard(c, 123, 234); ASSERT_EQ(0, c->wait_for_complete()); @@ -197,8 +195,7 @@ TEST_F(TestJournalEntries, AioFlush) { ASSERT_TRUE(journaler != NULL); C_SaferCond cond_ctx; - librbd::AioCompletion *c = - librbd::aio_create_completion_internal(&cond_ctx, librbd::rbd_ctx_cb); + librbd::AioCompletion *c = librbd::AioCompletion::create(&cond_ctx); c->get(); ictx->aio_work_queue->aio_flush(c); ASSERT_EQ(0, c->wait_for_complete()); diff --git a/src/test/librbd/test_internal.cc b/src/test/librbd/test_internal.cc index b0c3ce911b85e..f8f5702d267be 100644 --- a/src/test/librbd/test_internal.cc +++ b/src/test/librbd/test_internal.cc @@ -252,9 +252,8 @@ TEST_F(TestInternal, AioWriteRequestsLock) { ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE, "manually locked")); std::string buffer(256, '1'); - DummyContext *ctx = new DummyContext(); - librbd::AioCompletion *c = - librbd::aio_create_completion_internal(ctx, librbd::rbd_ctx_cb); + Context *ctx = new DummyContext(); + librbd::AioCompletion *c = librbd::AioCompletion::create(ctx); c->get(); ictx->aio_work_queue->aio_write(c, 0, buffer.size(), buffer.c_str(), 0); @@ -275,9 +274,8 @@ TEST_F(TestInternal, AioDiscardRequestsLock) { ASSERT_EQ(0, open_image(m_image_name, &ictx)); ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE, "manually locked")); - DummyContext *ctx = new DummyContext(); - librbd::AioCompletion *c = - librbd::aio_create_completion_internal(ctx, librbd::rbd_ctx_cb); + Context *ctx = new DummyContext(); + librbd::AioCompletion *c = librbd::AioCompletion::create(ctx); c->get(); ictx->aio_work_queue->aio_discard(c, 0, 256); @@ -661,8 +659,7 @@ TEST_F(TestInternal, ShrinkFlushesCache) { ictx->aio_work_queue->write(0, buffer.size(), buffer.c_str(), 0); C_SaferCond cond_ctx; - librbd::AioCompletion *c = - librbd::aio_create_completion_internal(&cond_ctx, librbd::rbd_ctx_cb); + librbd::AioCompletion *c = librbd::AioCompletion::create(&cond_ctx); c->get(); ictx->aio_work_queue->aio_write(c, 0, buffer.size(), buffer.c_str(), 0); -- 2.39.5