From b148a231b44b5ee88da3e4894e79bd44faddce46 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Tue, 23 Oct 2018 16:19:51 -0400 Subject: [PATCH] test/librados/aio: remove unused callbacks That callbacks are called is covered by many other tests. These particular m_safe and m_complete fields were unused. Signed-off-by: Josh Durgin --- src/test/librados/aio.cc | 630 ++++++++++++++++++--------------------- 1 file changed, 283 insertions(+), 347 deletions(-) diff --git a/src/test/librados/aio.cc b/src/test/librados/aio.cc index dd9a17190af82..2d14e0f917001 100644 --- a/src/test/librados/aio.cc +++ b/src/test/librados/aio.cc @@ -24,9 +24,7 @@ public: AioTestData() : m_cluster(NULL), m_ioctx(NULL), - m_init(false), - m_complete(false), - m_safe(false) + m_init(false) { } @@ -63,17 +61,13 @@ public: rados_ioctx_t m_ioctx; std::string m_pool_name; bool m_init; - bool m_complete; - bool m_safe; }; class AioTestDataPP { public: AioTestDataPP() - : m_init(false), - m_complete(false), - m_safe(false) + : m_init(false) { } @@ -116,40 +110,14 @@ public: IoCtx m_ioctx; std::string m_pool_name; bool m_init; - bool m_complete; - bool m_safe; }; -void set_completion_complete(rados_completion_t cb, void *arg) -{ - AioTestData *test = static_cast(arg); - test->m_complete = true; -} - -void set_completion_safe(rados_completion_t cb, void *arg) -{ - AioTestData *test = static_cast(arg); - test->m_safe = true; -} - -void set_completion_completePP(rados_completion_t cb, void *arg) -{ - AioTestDataPP *test = static_cast(arg); - test->m_complete = true; -} - -void set_completion_safePP(rados_completion_t cb, void *arg) -{ - AioTestDataPP *test = static_cast(arg); - test->m_safe = true; -} - TEST(LibRadosAio, TooBig) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(-E2BIG, rados_aio_write(test_data.m_ioctx, "foo", @@ -167,7 +135,7 @@ TEST(LibRadosAio, TooBigPP) { bufferlist bl; AioCompletion *aio_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, NULL, NULL); + nullptr, NULL, NULL); ASSERT_EQ(-E2BIG, test_data.m_ioctx.aio_write("foo", aio_completion, bl, UINT_MAX, 0)); ASSERT_EQ(-E2BIG, test_data.m_ioctx.aio_append("foo", aio_completion, bl, UINT_MAX)); // ioctx.aio_write_full no way to overflow bl.length() @@ -234,8 +202,8 @@ TEST(LibRadosAio, SimpleWrite) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); auto sg = make_scope_guard([&] { rados_aio_release(my_completion); }); char buf[128]; memset(buf, 0xcc, sizeof(buf)); @@ -249,8 +217,8 @@ TEST(LibRadosAio, SimpleWrite) { rados_ioctx_set_namespace(test_data.m_ioctx, "nspace"); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); auto sg2 = make_scope_guard([&] { rados_aio_release(my_completion2); }); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", my_completion2, buf, sizeof(buf), 0)); @@ -270,7 +238,7 @@ TEST(LibRadosAio, SimpleWritePP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completePP, set_completion_safePP); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_write("foo", @@ -288,7 +256,7 @@ TEST(LibRadosAio, SimpleWritePP) { ASSERT_EQ("", test_data.init()); test_data.m_ioctx.set_namespace("nspace"); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completePP, set_completion_safePP); + nullptr, nullptr, nullptr); ASSERT_EQ(0, test_data.m_ioctx.aio_write("foo", my_completion, bl1, sizeof(buf), 0)); { @@ -304,8 +272,8 @@ TEST(LibRadosAio, WaitForSafe) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -320,7 +288,7 @@ TEST(LibRadosAio, WaitForSafePP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completePP, set_completion_safePP); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -339,8 +307,8 @@ TEST(LibRadosAio, RoundTrip) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -353,8 +321,8 @@ TEST(LibRadosAio, RoundTrip) { char buf2[256]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), 0)); { @@ -371,8 +339,8 @@ TEST(LibRadosAio, RoundTrip2) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -385,8 +353,8 @@ TEST(LibRadosAio, RoundTrip2) { char buf2[128]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), 0)); { @@ -403,8 +371,8 @@ TEST(LibRadosAio, RoundTrip3) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); @@ -426,8 +394,8 @@ TEST(LibRadosAio, RoundTrip3) { char buf2[128]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); rados_read_op_t op2 = rados_create_read_op(); rados_read_op_read(op2, 0, sizeof(buf2), buf2, NULL, NULL); @@ -462,7 +430,7 @@ TEST(LibRadosAio, RoundTripPP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completePP, set_completion_safePP); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -478,7 +446,7 @@ TEST(LibRadosAio, RoundTripPP) { ASSERT_EQ(0, my_completion->get_return_value()); bufferlist bl2; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completePP, set_completion_safePP); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion2, &bl2, sizeof(buf), 0)); @@ -497,7 +465,7 @@ TEST(LibRadosAio, RoundTripPP2) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completePP, set_completion_safePP); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -513,7 +481,7 @@ TEST(LibRadosAio, RoundTripPP2) { ASSERT_EQ(0, my_completion->get_return_value()); bufferlist bl2; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completePP, set_completion_safePP); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion2, &bl2, sizeof(buf), 0)); @@ -588,7 +556,7 @@ TEST(LibRadosAio, RoundTripSparseReadPP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completePP, set_completion_safePP); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -605,7 +573,7 @@ TEST(LibRadosAio, RoundTripSparseReadPP) { std::map extents; bufferlist bl2; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completePP, set_completion_safePP); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_sparse_read("foo", my_completion2, &extents, &bl2, sizeof(buf), 0)); @@ -623,8 +591,8 @@ TEST(LibRadosAio, RoundTripAppend) { AioTestData test_data; rados_completion_t my_completion, my_completion2, my_completion3; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_append(test_data.m_ioctx, "foo", @@ -636,8 +604,8 @@ TEST(LibRadosAio, RoundTripAppend) { ASSERT_EQ(0, rados_aio_get_return_value(my_completion)); char buf2[128]; memset(buf2, 0xdd, sizeof(buf2)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_append(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2))); { @@ -647,8 +615,8 @@ TEST(LibRadosAio, RoundTripAppend) { ASSERT_EQ(0, rados_aio_get_return_value(my_completion2)); char buf3[sizeof(buf) + sizeof(buf2)]; memset(buf3, 0, sizeof(buf3)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion3, buf3, sizeof(buf3), 0)); { @@ -667,7 +635,7 @@ TEST(LibRadosAio, RoundTripAppendPP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -686,7 +654,7 @@ TEST(LibRadosAio, RoundTripAppendPP) { bufferlist bl2; bl2.append(buf2, sizeof(buf2)); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_append("foo", my_completion2, bl2, sizeof(buf2))); @@ -697,7 +665,7 @@ TEST(LibRadosAio, RoundTripAppendPP) { ASSERT_EQ(0, my_completion2->get_return_value()); bufferlist bl3; AioCompletion *my_completion3 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion3, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion3, &bl3, 2 * sizeof(buf), 0)); @@ -720,8 +688,8 @@ TEST(LibRadosAio, RemoveTest) { rados_completion_t my_completion; AioTestData test_data; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); memset(buf, 0xaa, sizeof(buf)); ASSERT_EQ(0, rados_append(test_data.m_ioctx, "foo", buf, sizeof(buf))); ASSERT_EQ(0, rados_aio_remove(test_data.m_ioctx, "foo", my_completion)); @@ -745,7 +713,7 @@ TEST(LibRadosAioPP, RemoveTestPP) { ASSERT_EQ(0, test_data.m_ioctx.append("foo", bl1, sizeof(buf))); boost::scoped_ptr my_completion (test_data.m_cluster.aio_create_completion - ((void*)&test_data, set_completion_completePP, set_completion_safePP)); + (nullptr, nullptr, nullptr)); ASSERT_EQ(0, test_data.m_ioctx.aio_remove("foo", my_completion.get())); { TestAlarm alarm; @@ -767,8 +735,8 @@ TEST(LibRadosAio, XattrsRoundTrip) { ASSERT_EQ(0, rados_append(test_data.m_ioctx, "foo", buf, sizeof(buf))); // async getxattr rados_completion_t my_completion; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); ASSERT_EQ(0, rados_aio_getxattr(test_data.m_ioctx, "foo", my_completion, attr1, buf, sizeof(buf))); { TestAlarm alarm; @@ -778,8 +746,8 @@ TEST(LibRadosAio, XattrsRoundTrip) { rados_aio_release(my_completion); // async setxattr rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_setxattr(test_data.m_ioctx, "foo", my_completion2, attr1, attr1_buf, sizeof(attr1_buf))); { TestAlarm alarm; @@ -789,8 +757,8 @@ TEST(LibRadosAio, XattrsRoundTrip) { rados_aio_release(my_completion2); // async getxattr rados_completion_t my_completion3; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_getxattr(test_data.m_ioctx, "foo", my_completion3, attr1, buf, sizeof(buf))); { TestAlarm alarm; @@ -816,7 +784,7 @@ TEST(LibRadosAioPP, XattrsRoundTripPP) { // async getxattr boost::scoped_ptr my_completion (test_data.m_cluster.aio_create_completion - ((void*)&test_data, set_completion_completePP, set_completion_safePP)); + (nullptr, nullptr, nullptr)); ASSERT_EQ(0, test_data.m_ioctx.aio_getxattr("foo", my_completion.get(), attr1, bl2)); { TestAlarm alarm; @@ -831,7 +799,7 @@ TEST(LibRadosAioPP, XattrsRoundTripPP) { ASSERT_EQ("", test_data2.init()); boost::scoped_ptr my_completion2 (test_data.m_cluster.aio_create_completion - ((void*)&test_data2, set_completion_completePP, set_completion_safePP)); + (nullptr, nullptr, nullptr)); ASSERT_EQ(0, test_data.m_ioctx.aio_setxattr("foo", my_completion2.get(), attr1, bl3)); { TestAlarm alarm; @@ -844,7 +812,7 @@ TEST(LibRadosAioPP, XattrsRoundTripPP) { ASSERT_EQ("", test_data3.init()); boost::scoped_ptr my_completion3 (test_data.m_cluster.aio_create_completion - ((void*)&test_data3, set_completion_completePP, set_completion_safePP)); + (nullptr, nullptr, nullptr)); ASSERT_EQ(0, test_data.m_ioctx.aio_getxattr("foo", my_completion3.get(), attr1, bl4)); { TestAlarm alarm; @@ -866,8 +834,8 @@ TEST(LibRadosAio, RmXattr) { ASSERT_EQ(0, rados_append(test_data.m_ioctx, "foo", buf, sizeof(buf))); // async setxattr rados_completion_t my_completion; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); ASSERT_EQ(0, rados_aio_setxattr(test_data.m_ioctx, "foo", my_completion, attr1, attr1_buf, sizeof(attr1_buf))); { TestAlarm alarm; @@ -877,8 +845,8 @@ TEST(LibRadosAio, RmXattr) { rados_aio_release(my_completion); // async rmxattr rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_rmxattr(test_data.m_ioctx, "foo", my_completion2, attr1)); { TestAlarm alarm; @@ -888,8 +856,8 @@ TEST(LibRadosAio, RmXattr) { rados_aio_release(my_completion2); // async getxattr after deletion rados_completion_t my_completion3; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_getxattr(test_data.m_ioctx, "foo", my_completion3, attr1, buf, sizeof(buf))); { TestAlarm alarm; @@ -905,8 +873,8 @@ TEST(LibRadosAio, RmXattr) { ASSERT_EQ(0, rados_write(test_data.m_ioctx, "foo_rmxattr", buf2, sizeof(buf2), 0)); // asynx setxattr rados_completion_t my_completion4; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion4)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion4)); ASSERT_EQ(0, rados_aio_setxattr(test_data.m_ioctx, "foo_rmxattr", my_completion4, attr2, attr2_buf, sizeof(attr2_buf))); { TestAlarm alarm; @@ -918,8 +886,8 @@ TEST(LibRadosAio, RmXattr) { ASSERT_EQ(0, rados_remove(test_data.m_ioctx, "foo_rmxattr")); // async rmxattr on non existing object rados_completion_t my_completion5; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion5)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion5)); ASSERT_EQ(0, rados_aio_rmxattr(test_data.m_ioctx, "foo_rmxattr", my_completion5, attr2)); { TestAlarm alarm; @@ -944,7 +912,7 @@ TEST(LibRadosAioPP, RmXattrPP) { bl2.append(attr1_buf, sizeof(attr1_buf)); boost::scoped_ptr my_completion (test_data.m_cluster.aio_create_completion - ((void*)&test_data, set_completion_completePP, set_completion_safePP)); + (nullptr, nullptr, nullptr)); ASSERT_EQ(0, test_data.m_ioctx.aio_setxattr("foo", my_completion.get(), attr1, bl2)); { TestAlarm alarm; @@ -956,7 +924,7 @@ TEST(LibRadosAioPP, RmXattrPP) { ASSERT_EQ("", test_data2.init()); boost::scoped_ptr my_completion2 (test_data.m_cluster.aio_create_completion - ((void*)&test_data2, set_completion_completePP, set_completion_safePP)); + (nullptr, nullptr, nullptr)); ASSERT_EQ(0, test_data.m_ioctx.aio_rmxattr("foo", my_completion2.get(), attr1)); { TestAlarm alarm; @@ -968,7 +936,7 @@ TEST(LibRadosAioPP, RmXattrPP) { ASSERT_EQ("", test_data3.init()); boost::scoped_ptr my_completion3 (test_data.m_cluster.aio_create_completion - ((void*)&test_data3, set_completion_completePP, set_completion_safePP)); + (nullptr, nullptr, nullptr)); bufferlist bl3; ASSERT_EQ(0, test_data.m_ioctx.aio_getxattr("foo", my_completion3.get(), attr1, bl3)); { @@ -991,7 +959,7 @@ TEST(LibRadosAioPP, RmXattrPP) { ASSERT_EQ("", test_data4.init()); boost::scoped_ptr my_completion4 (test_data.m_cluster.aio_create_completion - ((void*)&test_data4, set_completion_completePP, set_completion_safePP)); + (nullptr, nullptr, nullptr)); ASSERT_EQ(0, test_data.m_ioctx.aio_setxattr("foo_rmxattr", my_completion4.get(), attr2, bl22)); { TestAlarm alarm; @@ -1005,7 +973,7 @@ TEST(LibRadosAioPP, RmXattrPP) { ASSERT_EQ("", test_data5.init()); boost::scoped_ptr my_completion5 (test_data.m_cluster.aio_create_completion - ((void*)&test_data5, set_completion_completePP, set_completion_safePP)); + (nullptr, nullptr, nullptr)); ASSERT_EQ(0, test_data.m_ioctx.aio_rmxattr("foo_rmxattr", my_completion5.get(), attr2)); { TestAlarm alarm; @@ -1032,8 +1000,8 @@ TEST(LibRadosAio, XattrIter) { ASSERT_EQ(0, rados_setxattr(test_data.m_ioctx, "foo", attr2, attr2_buf, sizeof(attr2_buf))); // call async version of getxattrs and wait for completion rados_completion_t my_completion; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); rados_xattrs_iter_t iter; ASSERT_EQ(0, rados_aio_getxattrs(test_data.m_ioctx, "foo", my_completion, &iter)); { @@ -1092,7 +1060,7 @@ TEST(LibRadosIoPP, XattrListPP) { // call async version of getxattrs boost::scoped_ptr my_completion (test_data.m_cluster.aio_create_completion - ((void*)&test_data, set_completion_completePP, set_completion_safePP)); + (nullptr, nullptr, nullptr)); std::map attrset; ASSERT_EQ(0, test_data.m_ioctx.aio_getxattrs("foo", my_completion.get(), attrset)); { @@ -1118,8 +1086,8 @@ TEST(LibRadosAio, IsComplete) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -1132,8 +1100,8 @@ TEST(LibRadosAio, IsComplete) { char buf2[128]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), 0)); { @@ -1157,7 +1125,7 @@ TEST(LibRadosAio, IsCompletePP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -1173,7 +1141,7 @@ TEST(LibRadosAio, IsCompletePP) { ASSERT_EQ(0, my_completion->get_return_value()); bufferlist bl2; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion2, &bl2, sizeof(buf), 0)); @@ -1199,8 +1167,8 @@ TEST(LibRadosAio, IsSafe) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -1220,8 +1188,8 @@ TEST(LibRadosAio, IsSafe) { char buf2[128]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), 0)); { @@ -1238,7 +1206,7 @@ TEST(LibRadosAio, IsSafePP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -1260,7 +1228,7 @@ TEST(LibRadosAio, IsSafePP) { } ASSERT_EQ(0, my_completion->get_return_value()); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); bufferlist bl2; ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion2, @@ -1280,8 +1248,8 @@ TEST(LibRadosAio, ReturnValue) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0, sizeof(buf)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "nonexistent", @@ -1298,7 +1266,7 @@ TEST(LibRadosAio, ReturnValuePP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); bufferlist bl1; @@ -1316,8 +1284,8 @@ TEST(LibRadosAio, Flush) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xee, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -1327,8 +1295,8 @@ TEST(LibRadosAio, Flush) { char buf2[128]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), 0)); { @@ -1345,7 +1313,7 @@ TEST(LibRadosAio, FlushPP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -1358,7 +1326,7 @@ TEST(LibRadosAio, FlushPP) { ASSERT_EQ(0, my_completion->get_return_value()); bufferlist bl2; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion2, &bl2, sizeof(buf), 0)); @@ -1377,8 +1345,8 @@ TEST(LibRadosAio, FlushAsync) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); rados_completion_t flush_completion; ASSERT_EQ(0, rados_aio_create_completion(NULL, NULL, NULL, &flush_completion)); char buf[128]; @@ -1399,8 +1367,8 @@ TEST(LibRadosAio, FlushAsync) { char buf2[128]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), 0)); { @@ -1418,7 +1386,7 @@ TEST(LibRadosAio, FlushAsyncPP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *flush_completion = test_data.m_cluster.aio_create_completion(NULL, NULL, NULL); AioCompletion *my_completion_null = NULL; @@ -1442,7 +1410,7 @@ TEST(LibRadosAio, FlushAsyncPP) { ASSERT_EQ(0, my_completion->get_return_value()); bufferlist bl2; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion2, &bl2, sizeof(buf), 0)); @@ -1462,8 +1430,8 @@ TEST(LibRadosAio, RoundTripWriteFull) { AioTestData test_data; rados_completion_t my_completion, my_completion2, my_completion3; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -1475,8 +1443,8 @@ TEST(LibRadosAio, RoundTripWriteFull) { ASSERT_EQ(0, rados_aio_get_return_value(my_completion)); char buf2[64]; memset(buf2, 0xdd, sizeof(buf2)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_write_full(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2))); { @@ -1486,8 +1454,8 @@ TEST(LibRadosAio, RoundTripWriteFull) { ASSERT_EQ(0, rados_aio_get_return_value(my_completion2)); char buf3[sizeof(buf) + sizeof(buf2)]; memset(buf3, 0, sizeof(buf3)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion3, buf3, sizeof(buf3), 0)); { @@ -1505,7 +1473,7 @@ TEST(LibRadosAio, RoundTripWriteFullPP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -1524,7 +1492,7 @@ TEST(LibRadosAio, RoundTripWriteFullPP) { bufferlist bl2; bl2.append(buf2, sizeof(buf2)); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_write_full("foo", my_completion2, bl2)); { @@ -1534,7 +1502,7 @@ TEST(LibRadosAio, RoundTripWriteFullPP) { ASSERT_EQ(0, my_completion2->get_return_value()); bufferlist bl3; AioCompletion *my_completion3 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion3, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion3, &bl3, sizeof(buf), 0)); @@ -1596,8 +1564,8 @@ TEST(LibRadosAio, RoundTripWriteSame) { AioTestData test_data; rados_completion_t my_completion, my_completion2, my_completion3; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char full[128]; memset(full, 0xcc, sizeof(full)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -1611,8 +1579,8 @@ TEST(LibRadosAio, RoundTripWriteSame) { char buf[32]; size_t ws_write_len = sizeof(full); memset(buf, 0xdd, sizeof(buf)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_writesame(test_data.m_ioctx, "foo", my_completion2, buf, sizeof(buf), ws_write_len, 0)); @@ -1621,8 +1589,8 @@ TEST(LibRadosAio, RoundTripWriteSame) { ASSERT_EQ(0, rados_aio_wait_for_complete(my_completion2)); } ASSERT_EQ(0, rados_aio_get_return_value(my_completion2)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion3, full, sizeof(full), 0)); { @@ -1642,7 +1610,7 @@ TEST(LibRadosAio, RoundTripWriteSamePP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char full[128]; @@ -1663,7 +1631,7 @@ TEST(LibRadosAio, RoundTripWriteSamePP) { bufferlist bl2; bl2.append(buf, sizeof(buf)); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_writesame("foo", my_completion2, bl2, ws_write_len, 0)); @@ -1674,7 +1642,7 @@ TEST(LibRadosAio, RoundTripWriteSamePP) { ASSERT_EQ(0, my_completion2->get_return_value()); bufferlist bl3; AioCompletion *my_completion3 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion3, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion3, &bl3, sizeof(full), 0)); @@ -1746,8 +1714,8 @@ TEST(LibRadosAio, SimpleStat) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -1760,8 +1728,8 @@ TEST(LibRadosAio, SimpleStat) { uint64_t psize; time_t pmtime; rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_stat(test_data.m_ioctx, "foo", my_completion2, &psize, &pmtime)); { @@ -1778,7 +1746,7 @@ TEST(LibRadosAio, SimpleStatPP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -1795,7 +1763,7 @@ TEST(LibRadosAio, SimpleStatPP) { uint64_t psize; time_t pmtime; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_stat("foo", my_completion2, &psize, &pmtime)); @@ -1813,8 +1781,8 @@ TEST(LibRadosAio, SimpleStatNS) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -1827,8 +1795,8 @@ TEST(LibRadosAio, SimpleStatNS) { rados_ioctx_set_namespace(test_data.m_ioctx, "nspace"); char buf2[64]; memset(buf2, 0xbb, sizeof(buf2)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", my_completion, buf2, sizeof(buf2), 0)); { @@ -1840,8 +1808,8 @@ TEST(LibRadosAio, SimpleStatNS) { time_t pmtime; rados_completion_t my_completion2; rados_ioctx_set_namespace(test_data.m_ioctx, ""); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_stat(test_data.m_ioctx, "foo", my_completion2, &psize, &pmtime)); { @@ -1853,8 +1821,8 @@ TEST(LibRadosAio, SimpleStatNS) { rados_ioctx_set_namespace(test_data.m_ioctx, "nspace"); rados_completion_t my_completion3; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_stat(test_data.m_ioctx, "foo", my_completion3, &psize, &pmtime)); { @@ -1873,7 +1841,7 @@ TEST(LibRadosAio, SimpleStatPPNS) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -1890,7 +1858,7 @@ TEST(LibRadosAio, SimpleStatPPNS) { uint64_t psize; time_t pmtime; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_stat("foo", my_completion2, &psize, &pmtime)); @@ -1908,8 +1876,8 @@ TEST(LibRadosAio, StatRemove) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -1922,8 +1890,8 @@ TEST(LibRadosAio, StatRemove) { uint64_t psize; time_t pmtime; rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_stat(test_data.m_ioctx, "foo", my_completion2, &psize, &pmtime)); { @@ -1933,8 +1901,8 @@ TEST(LibRadosAio, StatRemove) { ASSERT_EQ(0, rados_aio_get_return_value(my_completion2)); ASSERT_EQ(sizeof(buf), psize); rados_completion_t my_completion3; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_remove(test_data.m_ioctx, "foo", my_completion3)); { TestAlarm alarm; @@ -1944,8 +1912,8 @@ TEST(LibRadosAio, StatRemove) { uint64_t psize2; time_t pmtime2; rados_completion_t my_completion4; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion4)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion4)); ASSERT_EQ(0, rados_aio_stat(test_data.m_ioctx, "foo", my_completion4, &psize2, &pmtime2)); { @@ -1963,7 +1931,7 @@ TEST(LibRadosAio, StatRemovePP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -1980,7 +1948,7 @@ TEST(LibRadosAio, StatRemovePP) { uint64_t psize; time_t pmtime; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_stat("foo", my_completion2, &psize, &pmtime)); @@ -1993,7 +1961,7 @@ TEST(LibRadosAio, StatRemovePP) { uint64_t psize2; time_t pmtime2; AioCompletion *my_completion3 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion3, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_remove("foo", my_completion3)); { @@ -2003,7 +1971,7 @@ TEST(LibRadosAio, StatRemovePP) { ASSERT_EQ(0, my_completion3->get_return_value()); AioCompletion *my_completion4 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion4, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_stat("foo", my_completion4, &psize2, &pmtime2)); @@ -2022,8 +1990,8 @@ TEST(LibRadosAio, ExecuteClass) { AioTestData test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -2033,8 +2001,8 @@ TEST(LibRadosAio, ExecuteClass) { ASSERT_EQ(0, rados_aio_get_return_value(my_completion)); } rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); char out[128]; ASSERT_EQ(0, rados_aio_exec(test_data.m_ioctx, "foo", my_completion2, "hello", "say_hello", NULL, 0, out, sizeof(out))); @@ -2052,7 +2020,7 @@ TEST(LibRadosAio, ExecuteClassPP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -2067,7 +2035,7 @@ TEST(LibRadosAio, ExecuteClassPP) { } ASSERT_EQ(0, my_completion->get_return_value()); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); bufferlist in, out; ASSERT_EQ(0, test_data.m_ioctx.aio_exec("foo", my_completion2, @@ -2291,8 +2259,8 @@ TEST(LibRadosAio, MultiWrite) { AioTestData test_data; rados_completion_t my_completion, my_completion2, my_completion3; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -2305,8 +2273,8 @@ TEST(LibRadosAio, MultiWrite) { char buf2[64]; memset(buf2, 0xdd, sizeof(buf2)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), sizeof(buf))); { @@ -2317,8 +2285,8 @@ TEST(LibRadosAio, MultiWrite) { char buf3[(sizeof(buf) + sizeof(buf2)) * 3]; memset(buf3, 0, sizeof(buf3)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion3, buf3, sizeof(buf3), 0)); { @@ -2337,7 +2305,7 @@ TEST(LibRadosAio, MultiWritePP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -2357,7 +2325,7 @@ TEST(LibRadosAio, MultiWritePP) { bufferlist bl2; bl2.append(buf2, sizeof(buf2)); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_write("foo", my_completion2, bl2, sizeof(buf2), sizeof(buf))); @@ -2369,7 +2337,7 @@ TEST(LibRadosAio, MultiWritePP) { bufferlist bl3; AioCompletion *my_completion3 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion3, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion3, &bl3, (sizeof(buf) + sizeof(buf2) * 3), 0)); @@ -2391,8 +2359,8 @@ TEST(LibRadosAio, AioUnlock) { ASSERT_EQ("", test_data.init()); ASSERT_EQ(0, rados_lock_exclusive(test_data.m_ioctx, "foo", "TestLock", "Cookie", "", NULL, 0)); rados_completion_t my_completion; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_complete, set_completion_safe, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); ASSERT_EQ(0, rados_aio_unlock(test_data.m_ioctx, "foo", "TestLock", "Cookie", my_completion)); { TestAlarm alarm; @@ -2408,7 +2376,7 @@ TEST(LibRadosAio, AioUnlockPP) { ASSERT_EQ(0, test_data.m_ioctx.lock_exclusive("foo", "TestLock", "Cookie", "", NULL, 0)); boost::scoped_ptr my_completion (test_data.m_cluster.aio_create_completion - ((void*)&test_data, set_completion_completePP, set_completion_safePP)); + (nullptr, nullptr, nullptr)); ASSERT_EQ(0, test_data.m_ioctx.aio_unlock("foo", "TestLock", "Cookie", my_completion.get())); { TestAlarm alarm; @@ -2426,9 +2394,7 @@ public: AioTestDataEC() : m_cluster(NULL), m_ioctx(NULL), - m_init(false), - m_complete(false), - m_safe(false) + m_init(false) { } @@ -2465,17 +2431,13 @@ public: rados_ioctx_t m_ioctx; std::string m_pool_name; bool m_init; - bool m_complete; - bool m_safe; }; class AioTestDataECPP { public: AioTestDataECPP() - : m_init(false), - m_complete(false), - m_safe(false) + : m_init(false) { } @@ -2512,40 +2474,14 @@ public: IoCtx m_ioctx; std::string m_pool_name; bool m_init; - bool m_complete; - bool m_safe; }; -void set_completion_completeEC(rados_completion_t cb, void *arg) -{ - AioTestDataEC *test = static_cast(arg); - test->m_complete = true; -} - -void set_completion_safeEC(rados_completion_t cb, void *arg) -{ - AioTestDataEC *test = static_cast(arg); - test->m_safe = true; -} - -void set_completion_completeECPP(rados_completion_t cb, void *arg) -{ - AioTestDataECPP *test = static_cast(arg); - test->m_complete = true; -} - -void set_completion_safeECPP(rados_completion_t cb, void *arg) -{ - AioTestDataECPP *test = static_cast(arg); - test->m_safe = true; -} - TEST(LibRadosAioEC, SimpleWrite) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); auto sg = make_scope_guard([&] { rados_aio_release(my_completion); }); char buf[128]; memset(buf, 0xcc, sizeof(buf)); @@ -2559,8 +2495,8 @@ TEST(LibRadosAioEC, SimpleWrite) { rados_ioctx_set_namespace(test_data.m_ioctx, "nspace"); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); auto sg2 = make_scope_guard([&] { rados_aio_release(my_completion2); }); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", my_completion2, buf, sizeof(buf), 0)); @@ -2580,7 +2516,7 @@ TEST(LibRadosAioEC, SimpleWritePP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeECPP, set_completion_safeECPP); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_write("foo", @@ -2598,7 +2534,7 @@ TEST(LibRadosAioEC, SimpleWritePP) { ASSERT_EQ("", test_data.init()); test_data.m_ioctx.set_namespace("nspace"); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeECPP, set_completion_safeECPP); + nullptr, nullptr, nullptr); ASSERT_EQ(0, test_data.m_ioctx.aio_write("foo", my_completion, bl1, sizeof(buf), 0)); { @@ -2614,8 +2550,8 @@ TEST(LibRadosAioEC, WaitForSafe) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -2630,7 +2566,7 @@ TEST(LibRadosAioEC, WaitForSafePP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeECPP, set_completion_safeECPP); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -2649,8 +2585,8 @@ TEST(LibRadosAioEC, RoundTrip) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -2663,8 +2599,8 @@ TEST(LibRadosAioEC, RoundTrip) { char buf2[256]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), 0)); { @@ -2681,8 +2617,8 @@ TEST(LibRadosAioEC, RoundTrip2) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -2695,8 +2631,8 @@ TEST(LibRadosAioEC, RoundTrip2) { char buf2[128]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), 0)); { @@ -2713,7 +2649,7 @@ TEST(LibRadosAioEC, RoundTripPP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeECPP, set_completion_safeECPP); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -2729,7 +2665,7 @@ TEST(LibRadosAioEC, RoundTripPP) { ASSERT_EQ(0, my_completion->get_return_value()); bufferlist bl2; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeECPP, set_completion_safeECPP); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion2, &bl2, sizeof(buf), 0)); @@ -2748,7 +2684,7 @@ TEST(LibRadosAioEC, RoundTripPP2) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeECPP, set_completion_safeECPP); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -2764,7 +2700,7 @@ TEST(LibRadosAioEC, RoundTripPP2) { ASSERT_EQ(0, my_completion->get_return_value()); bufferlist bl2; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeECPP, set_completion_safeECPP); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion2, &bl2, sizeof(buf), 0)); @@ -2826,7 +2762,7 @@ TEST(LibRadosAioEC, RoundTripSparseReadPP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeECPP, set_completion_safeECPP); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -2844,7 +2780,7 @@ TEST(LibRadosAioEC, RoundTripSparseReadPP) { map extents; bufferlist bl2; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeECPP, set_completion_safeECPP); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_sparse_read("foo", my_completion2, &extents, &bl2, sizeof(buf), 0)); @@ -2862,8 +2798,8 @@ TEST(LibRadosAioEC, RoundTripAppend) { AioTestDataEC test_data; rados_completion_t my_completion, my_completion2, my_completion3, my_completion4; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); int requires; ASSERT_EQ(0, rados_ioctx_pool_requires_alignment2(test_data.m_ioctx, &requires)); ASSERT_NE(0, requires); @@ -2885,8 +2821,8 @@ TEST(LibRadosAioEC, RoundTripAppend) { int hbsize = bsize / 2; char *buf2 = (char *)new char[hbsize]; memset(buf2, 0xdd, hbsize); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_append(test_data.m_ioctx, "foo", my_completion2, buf2, hbsize)); { @@ -2895,8 +2831,8 @@ TEST(LibRadosAioEC, RoundTripAppend) { } ASSERT_EQ(0, rados_aio_get_return_value(my_completion2)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_append(test_data.m_ioctx, "foo", my_completion3, buf2, hbsize)); { @@ -2908,8 +2844,8 @@ TEST(LibRadosAioEC, RoundTripAppend) { int tbsize = bsize + hbsize; char *buf3 = (char *)new char[tbsize]; memset(buf3, 0, tbsize); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion4)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion4)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion4, buf3, bsize * 3, 0)); { @@ -2932,7 +2868,7 @@ TEST(LibRadosAioEC, RoundTripAppendPP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); bool requires; @@ -2960,7 +2896,7 @@ TEST(LibRadosAioEC, RoundTripAppendPP) { bufferlist bl2; bl2.append(buf2, hbsize); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_append("foo", my_completion2, bl2, hbsize)); @@ -2971,7 +2907,7 @@ TEST(LibRadosAioEC, RoundTripAppendPP) { ASSERT_EQ(0, my_completion2->get_return_value()); AioCompletion *my_completion3 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion3, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_append("foo", my_completion3, bl2, hbsize)); @@ -2983,7 +2919,7 @@ TEST(LibRadosAioEC, RoundTripAppendPP) { bufferlist bl3; AioCompletion *my_completion4 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion4, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion4, &bl3, bsize * 3, 0)); @@ -3007,8 +2943,8 @@ TEST(LibRadosAioEC, IsComplete) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -3021,8 +2957,8 @@ TEST(LibRadosAioEC, IsComplete) { char buf2[128]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), 0)); { @@ -3046,7 +2982,7 @@ TEST(LibRadosAioEC, IsCompletePP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -3062,7 +2998,7 @@ TEST(LibRadosAioEC, IsCompletePP) { ASSERT_EQ(0, my_completion->get_return_value()); bufferlist bl2; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion2, &bl2, sizeof(buf), 0)); @@ -3088,8 +3024,8 @@ TEST(LibRadosAioEC, IsSafe) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -3109,8 +3045,8 @@ TEST(LibRadosAioEC, IsSafe) { char buf2[128]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), 0)); { @@ -3127,7 +3063,7 @@ TEST(LibRadosAioEC, IsSafePP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -3149,7 +3085,7 @@ TEST(LibRadosAioEC, IsSafePP) { } ASSERT_EQ(0, my_completion->get_return_value()); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); bufferlist bl2; ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion2, @@ -3169,8 +3105,8 @@ TEST(LibRadosAioEC, ReturnValue) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0, sizeof(buf)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "nonexistent", @@ -3187,7 +3123,7 @@ TEST(LibRadosAioEC, ReturnValuePP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); bufferlist bl1; @@ -3205,8 +3141,8 @@ TEST(LibRadosAioEC, Flush) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xee, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -3216,8 +3152,8 @@ TEST(LibRadosAioEC, Flush) { char buf2[128]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), 0)); { @@ -3234,7 +3170,7 @@ TEST(LibRadosAioEC, FlushPP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -3247,7 +3183,7 @@ TEST(LibRadosAioEC, FlushPP) { ASSERT_EQ(0, my_completion->get_return_value()); bufferlist bl2; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion2, &bl2, sizeof(buf), 0)); @@ -3266,8 +3202,8 @@ TEST(LibRadosAioEC, FlushAsync) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); rados_completion_t flush_completion; ASSERT_EQ(0, rados_aio_create_completion(NULL, NULL, NULL, &flush_completion)); char buf[128]; @@ -3288,8 +3224,8 @@ TEST(LibRadosAioEC, FlushAsync) { char buf2[128]; memset(buf2, 0, sizeof(buf2)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), 0)); { @@ -3307,7 +3243,7 @@ TEST(LibRadosAioEC, FlushAsyncPP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); AioCompletion *flush_completion = test_data.m_cluster.aio_create_completion(NULL, NULL, NULL); AioCompletion *my_completion_null = NULL; @@ -3331,7 +3267,7 @@ TEST(LibRadosAioEC, FlushAsyncPP) { ASSERT_EQ(0, my_completion->get_return_value()); bufferlist bl2; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion2, &bl2, sizeof(buf), 0)); @@ -3351,8 +3287,8 @@ TEST(LibRadosAioEC, RoundTripWriteFull) { AioTestDataEC test_data; rados_completion_t my_completion, my_completion2, my_completion3; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -3364,8 +3300,8 @@ TEST(LibRadosAioEC, RoundTripWriteFull) { ASSERT_EQ(0, rados_aio_get_return_value(my_completion)); char buf2[64]; memset(buf2, 0xdd, sizeof(buf2)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_write_full(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2))); { @@ -3375,8 +3311,8 @@ TEST(LibRadosAioEC, RoundTripWriteFull) { ASSERT_EQ(0, rados_aio_get_return_value(my_completion2)); char buf3[sizeof(buf) + sizeof(buf2)]; memset(buf3, 0, sizeof(buf3)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion3, buf3, sizeof(buf3), 0)); { @@ -3394,7 +3330,7 @@ TEST(LibRadosAioEC, RoundTripWriteFullPP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -3413,7 +3349,7 @@ TEST(LibRadosAioEC, RoundTripWriteFullPP) { bufferlist bl2; bl2.append(buf2, sizeof(buf2)); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_write_full("foo", my_completion2, bl2)); { @@ -3423,7 +3359,7 @@ TEST(LibRadosAioEC, RoundTripWriteFullPP) { ASSERT_EQ(0, my_completion2->get_return_value()); bufferlist bl3; AioCompletion *my_completion3 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion3, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion3, &bl3, sizeof(buf), 0)); @@ -3485,8 +3421,8 @@ TEST(LibRadosAioEC, SimpleStat) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -3499,8 +3435,8 @@ TEST(LibRadosAioEC, SimpleStat) { uint64_t psize; time_t pmtime; rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_stat(test_data.m_ioctx, "foo", my_completion2, &psize, &pmtime)); { @@ -3517,7 +3453,7 @@ TEST(LibRadosAioEC, SimpleStatPP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -3534,7 +3470,7 @@ TEST(LibRadosAioEC, SimpleStatPP) { uint64_t psize; time_t pmtime; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_stat("foo", my_completion2, &psize, &pmtime)); @@ -3552,8 +3488,8 @@ TEST(LibRadosAioEC, SimpleStatNS) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -3566,8 +3502,8 @@ TEST(LibRadosAioEC, SimpleStatNS) { rados_ioctx_set_namespace(test_data.m_ioctx, "nspace"); char buf2[64]; memset(buf2, 0xbb, sizeof(buf2)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", my_completion, buf2, sizeof(buf2), 0)); { @@ -3579,8 +3515,8 @@ TEST(LibRadosAioEC, SimpleStatNS) { time_t pmtime; rados_completion_t my_completion2; rados_ioctx_set_namespace(test_data.m_ioctx, ""); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_stat(test_data.m_ioctx, "foo", my_completion2, &psize, &pmtime)); { @@ -3592,8 +3528,8 @@ TEST(LibRadosAioEC, SimpleStatNS) { rados_ioctx_set_namespace(test_data.m_ioctx, "nspace"); rados_completion_t my_completion3; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_stat(test_data.m_ioctx, "foo", my_completion3, &psize, &pmtime)); { @@ -3612,7 +3548,7 @@ TEST(LibRadosAioEC, SimpleStatPPNS) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -3629,7 +3565,7 @@ TEST(LibRadosAioEC, SimpleStatPPNS) { uint64_t psize; time_t pmtime; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_stat("foo", my_completion2, &psize, &pmtime)); @@ -3647,8 +3583,8 @@ TEST(LibRadosAioEC, StatRemove) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -3661,8 +3597,8 @@ TEST(LibRadosAioEC, StatRemove) { uint64_t psize; time_t pmtime; rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_stat(test_data.m_ioctx, "foo", my_completion2, &psize, &pmtime)); { @@ -3672,8 +3608,8 @@ TEST(LibRadosAioEC, StatRemove) { ASSERT_EQ(0, rados_aio_get_return_value(my_completion2)); ASSERT_EQ(sizeof(buf), psize); rados_completion_t my_completion3; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_remove(test_data.m_ioctx, "foo", my_completion3)); { TestAlarm alarm; @@ -3683,8 +3619,8 @@ TEST(LibRadosAioEC, StatRemove) { uint64_t psize2; time_t pmtime2; rados_completion_t my_completion4; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion4)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion4)); ASSERT_EQ(0, rados_aio_stat(test_data.m_ioctx, "foo", my_completion4, &psize2, &pmtime2)); { @@ -3702,7 +3638,7 @@ TEST(LibRadosAioEC, StatRemovePP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -3719,7 +3655,7 @@ TEST(LibRadosAioEC, StatRemovePP) { uint64_t psize; time_t pmtime; AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_stat("foo", my_completion2, &psize, &pmtime)); @@ -3732,7 +3668,7 @@ TEST(LibRadosAioEC, StatRemovePP) { uint64_t psize2; time_t pmtime2; AioCompletion *my_completion3 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion3, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_remove("foo", my_completion3)); { @@ -3742,7 +3678,7 @@ TEST(LibRadosAioEC, StatRemovePP) { ASSERT_EQ(0, my_completion3->get_return_value()); AioCompletion *my_completion4 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion4, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_stat("foo", my_completion4, &psize2, &pmtime2)); @@ -3761,8 +3697,8 @@ TEST(LibRadosAioEC, ExecuteClass) { AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -3773,8 +3709,8 @@ TEST(LibRadosAioEC, ExecuteClass) { } ASSERT_EQ(0, rados_aio_get_return_value(my_completion)); rados_completion_t my_completion2; - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); char out[128]; ASSERT_EQ(0, rados_aio_exec(test_data.m_ioctx, "foo", my_completion2, "hello", "say_hello", NULL, 0, out, sizeof(out))); @@ -3792,7 +3728,7 @@ TEST(LibRadosAioEC, ExecuteClassPP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -3807,7 +3743,7 @@ TEST(LibRadosAioEC, ExecuteClassPP) { } ASSERT_EQ(0, my_completion->get_return_value()); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); bufferlist in, out; ASSERT_EQ(0, test_data.m_ioctx.aio_exec("foo", my_completion2, @@ -3859,8 +3795,8 @@ TEST(LibRadosAioEC, MultiWrite) { AioTestDataEC test_data; rados_completion_t my_completion, my_completion2, my_completion3; ASSERT_EQ("", test_data.init()); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -3873,8 +3809,8 @@ TEST(LibRadosAioEC, MultiWrite) { char buf2[64]; memset(buf2, 0xdd, sizeof(buf2)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion2)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion2)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", my_completion2, buf2, sizeof(buf2), sizeof(buf))); { @@ -3885,8 +3821,8 @@ TEST(LibRadosAioEC, MultiWrite) { char buf3[(sizeof(buf) + sizeof(buf2)) * 3]; memset(buf3, 0, sizeof(buf3)); - ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data, - set_completion_completeEC, set_completion_safeEC, &my_completion3)); + ASSERT_EQ(0, rados_aio_create_completion(nullptr, + nullptr, nullptr, &my_completion3)); ASSERT_EQ(0, rados_aio_read(test_data.m_ioctx, "foo", my_completion3, buf3, sizeof(buf3), 0)); { @@ -3904,7 +3840,7 @@ TEST(LibRadosAioEC, MultiWritePP) { AioTestDataECPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char buf[128]; @@ -3924,7 +3860,7 @@ TEST(LibRadosAioEC, MultiWritePP) { bufferlist bl2; bl2.append(buf2, sizeof(buf2)); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_write("foo", my_completion2, bl2, sizeof(buf2), sizeof(buf))); @@ -3936,7 +3872,7 @@ TEST(LibRadosAioEC, MultiWritePP) { bufferlist bl3; AioCompletion *my_completion3 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_completeEC, set_completion_safeEC); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion3, my_completion_null); ASSERT_EQ(0, test_data.m_ioctx.aio_read("foo", my_completion3, &bl3, (sizeof(buf) + sizeof(buf2) * 3), 0)); @@ -3956,14 +3892,14 @@ TEST(LibRadosAio, RacingRemovePP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init({{"objecter_retry_writes_after_first_reply", "true"}})); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion, nullptr); char buf[128]; memset(buf, 0xcc, sizeof(buf)); bufferlist bl; bl.append(buf, sizeof(buf)); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_NE(my_completion2, nullptr); ASSERT_EQ(0, test_data.m_ioctx.aio_remove("foo", my_completion2)); ASSERT_EQ(0, test_data.m_ioctx.aio_write("foo", my_completion, @@ -3984,7 +3920,7 @@ TEST(LibRadosAio, RoundTripCmpExtPP) { AioTestDataPP test_data; ASSERT_EQ("", test_data.init()); AioCompletion *my_completion = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); AioCompletion *my_completion_null = NULL; ASSERT_NE(my_completion, my_completion_null); char full[128]; @@ -4003,7 +3939,7 @@ TEST(LibRadosAio, RoundTripCmpExtPP) { bufferlist cbl; cbl.append(full, sizeof(full)); AioCompletion *my_completion2 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_EQ(0, test_data.m_ioctx.aio_cmpext("foo", my_completion2, 0, cbl)); { @@ -4017,7 +3953,7 @@ TEST(LibRadosAio, RoundTripCmpExtPP) { cbl.clear(); cbl.append(full, sizeof(full)); AioCompletion *my_completion3 = test_data.m_cluster.aio_create_completion( - (void*)&test_data, set_completion_complete, set_completion_safe); + nullptr, nullptr, nullptr); ASSERT_EQ(0, test_data.m_ioctx.aio_cmpext("foo", my_completion3, 0, cbl)); { -- 2.39.5