From d89c2246deb1dabfb9c4f399e4989370746dfdbb 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 (cherry picked from commit b148a231b44b5ee88da3e4894e79bd44faddce46) Conflicts: src/test/librados/aio.cc - master has make_scope_guard() calls that are absent in luminous --- 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 d6d6645adf41..6671a42f1770 100644 --- a/src/test/librados/aio.cc +++ b/src/test/librados/aio.cc @@ -23,9 +23,7 @@ public: AioTestData() : m_cluster(NULL), m_ioctx(NULL), - m_init(false), - m_complete(false), - m_safe(false) + m_init(false) { } @@ -62,17 +60,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) { } @@ -115,40 +109,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", @@ -166,7 +134,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() @@ -233,8 +201,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)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -247,8 +215,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)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", my_completion2, buf, sizeof(buf), 0)); { @@ -269,7 +237,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", @@ -287,7 +255,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)); { @@ -303,8 +271,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", @@ -319,7 +287,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]; @@ -338,8 +306,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", @@ -352,8 +320,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)); { @@ -370,8 +338,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", @@ -384,8 +352,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)); { @@ -402,8 +370,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)); @@ -425,8 +393,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); @@ -461,7 +429,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]; @@ -477,7 +445,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)); @@ -496,7 +464,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]; @@ -512,7 +480,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)); @@ -587,7 +555,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]; @@ -604,7 +572,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)); @@ -622,8 +590,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", @@ -635,8 +603,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))); { @@ -646,8 +614,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)); { @@ -666,7 +634,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]; @@ -685,7 +653,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))); @@ -696,7 +664,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)); @@ -719,8 +687,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)); @@ -744,7 +712,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; @@ -766,8 +734,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; @@ -777,8 +745,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; @@ -788,8 +756,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; @@ -815,7 +783,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; @@ -830,7 +798,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; @@ -843,7 +811,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; @@ -865,8 +833,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; @@ -876,8 +844,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; @@ -887,8 +855,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; @@ -904,8 +872,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; @@ -917,8 +885,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; @@ -943,7 +911,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; @@ -955,7 +923,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; @@ -967,7 +935,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)); { @@ -990,7 +958,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; @@ -1004,7 +972,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; @@ -1031,8 +999,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)); { @@ -1091,7 +1059,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)); { @@ -1117,8 +1085,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", @@ -1131,8 +1099,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)); { @@ -1156,7 +1124,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]; @@ -1172,7 +1140,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)); @@ -1198,8 +1166,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", @@ -1219,8 +1187,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)); { @@ -1237,7 +1205,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]; @@ -1259,7 +1227,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, @@ -1279,8 +1247,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", @@ -1297,7 +1265,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; @@ -1315,8 +1283,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", @@ -1326,8 +1294,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)); { @@ -1344,7 +1312,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]; @@ -1357,7 +1325,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)); @@ -1376,8 +1344,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]; @@ -1398,8 +1366,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)); { @@ -1417,7 +1385,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; @@ -1441,7 +1409,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)); @@ -1461,8 +1429,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", @@ -1474,8 +1442,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))); { @@ -1485,8 +1453,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)); { @@ -1504,7 +1472,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]; @@ -1523,7 +1491,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)); { @@ -1533,7 +1501,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)); @@ -1595,8 +1563,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", @@ -1610,8 +1578,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)); @@ -1620,8 +1588,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)); { @@ -1641,7 +1609,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]; @@ -1662,7 +1630,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)); @@ -1673,7 +1641,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)); @@ -1745,8 +1713,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", @@ -1759,8 +1727,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)); { @@ -1777,7 +1745,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]; @@ -1794,7 +1762,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)); @@ -1812,8 +1780,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", @@ -1826,8 +1794,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)); { @@ -1839,8 +1807,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)); { @@ -1852,8 +1820,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)); { @@ -1872,7 +1840,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]; @@ -1889,7 +1857,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)); @@ -1907,8 +1875,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", @@ -1921,8 +1889,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)); { @@ -1932,8 +1900,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; @@ -1943,8 +1911,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)); { @@ -1962,7 +1930,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]; @@ -1979,7 +1947,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)); @@ -1992,7 +1960,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)); { @@ -2002,7 +1970,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)); @@ -2021,8 +1989,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", @@ -2032,8 +2000,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))); @@ -2051,7 +2019,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]; @@ -2066,7 +2034,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, @@ -2290,8 +2258,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", @@ -2304,8 +2272,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))); { @@ -2316,8 +2284,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)); { @@ -2336,7 +2304,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]; @@ -2356,7 +2324,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))); @@ -2368,7 +2336,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)); @@ -2390,8 +2358,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; @@ -2407,7 +2375,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; @@ -2425,9 +2393,7 @@ public: AioTestDataEC() : m_cluster(NULL), m_ioctx(NULL), - m_init(false), - m_complete(false), - m_safe(false) + m_init(false) { } @@ -2464,17 +2430,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) { } @@ -2511,40 +2473,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)); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", @@ -2557,8 +2493,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)); ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo", my_completion2, buf, sizeof(buf), 0)); { @@ -2579,7 +2515,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", @@ -2597,7 +2533,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)); { @@ -2613,8 +2549,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", @@ -2629,7 +2565,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]; @@ -2648,8 +2584,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", @@ -2662,8 +2598,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)); { @@ -2680,8 +2616,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", @@ -2694,8 +2630,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)); { @@ -2712,7 +2648,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]; @@ -2728,7 +2664,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)); @@ -2747,7 +2683,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]; @@ -2763,7 +2699,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)); @@ -2825,7 +2761,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]; @@ -2843,7 +2779,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)); @@ -2861,8 +2797,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); @@ -2884,8 +2820,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)); { @@ -2894,8 +2830,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)); { @@ -2907,8 +2843,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)); { @@ -2931,7 +2867,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; @@ -2959,7 +2895,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)); @@ -2970,7 +2906,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)); @@ -2982,7 +2918,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)); @@ -3006,8 +2942,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", @@ -3020,8 +2956,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)); { @@ -3045,7 +2981,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]; @@ -3061,7 +2997,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)); @@ -3087,8 +3023,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", @@ -3108,8 +3044,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)); { @@ -3126,7 +3062,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]; @@ -3148,7 +3084,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, @@ -3168,8 +3104,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", @@ -3186,7 +3122,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; @@ -3204,8 +3140,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", @@ -3215,8 +3151,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)); { @@ -3233,7 +3169,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]; @@ -3246,7 +3182,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)); @@ -3265,8 +3201,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]; @@ -3287,8 +3223,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)); { @@ -3306,7 +3242,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; @@ -3330,7 +3266,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)); @@ -3350,8 +3286,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", @@ -3363,8 +3299,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))); { @@ -3374,8 +3310,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)); { @@ -3393,7 +3329,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]; @@ -3412,7 +3348,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)); { @@ -3422,7 +3358,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)); @@ -3484,8 +3420,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", @@ -3498,8 +3434,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)); { @@ -3516,7 +3452,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]; @@ -3533,7 +3469,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)); @@ -3551,8 +3487,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", @@ -3565,8 +3501,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)); { @@ -3578,8 +3514,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)); { @@ -3591,8 +3527,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)); { @@ -3611,7 +3547,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]; @@ -3628,7 +3564,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)); @@ -3646,8 +3582,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", @@ -3660,8 +3596,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)); { @@ -3671,8 +3607,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; @@ -3682,8 +3618,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)); { @@ -3701,7 +3637,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]; @@ -3718,7 +3654,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)); @@ -3731,7 +3667,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)); { @@ -3741,7 +3677,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)); @@ -3760,8 +3696,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", @@ -3772,8 +3708,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))); @@ -3791,7 +3727,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]; @@ -3806,7 +3742,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, @@ -3858,8 +3794,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", @@ -3872,8 +3808,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))); { @@ -3884,8 +3820,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)); { @@ -3903,7 +3839,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]; @@ -3923,7 +3859,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))); @@ -3935,7 +3871,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)); @@ -3955,14 +3891,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, @@ -3983,7 +3919,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]; @@ -4002,7 +3938,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)); { @@ -4016,7 +3952,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.47.3