From 773dabfcd6f263a0039e8596659276b33c637eb8 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 11 Feb 2022 14:49:35 -0500 Subject: [PATCH] librados: stop using c++20 keyword 'requires' Signed-off-by: Casey Bodley --- src/librados/RadosClient.cc | 14 ++++++------ src/librados/RadosClient.h | 2 +- src/librados/librados_c.cc | 6 +++--- src/librados/librados_cxx.cc | 4 ++-- src/test/librados/TestCase.cc | 24 ++++++++++----------- src/test/librados/aio.cc | 6 +++--- src/test/librados/aio_cxx.cc | 6 +++--- src/test/librados/testcase_cxx.cc | 36 +++++++++++++++---------------- src/tools/rados/rados.cc | 6 +++--- src/tracing/librados.tp | 4 ++-- 10 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index 3d4563c8bf1e6..7f2f73ed1a8f7 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -92,22 +92,22 @@ int64_t librados::RadosClient::lookup_pool(const char *name) bool librados::RadosClient::pool_requires_alignment(int64_t pool_id) { - bool requires; - int r = pool_requires_alignment2(pool_id, &requires); + bool required; + int r = pool_requires_alignment2(pool_id, &required); if (r < 0) { // Cast answer to false, this is a little bit problematic // since we really don't know the answer yet, say. return false; } - return requires; + return required; } // a safer version of pool_requires_alignment int librados::RadosClient::pool_requires_alignment2(int64_t pool_id, - bool *requires) + bool *req) { - if (!requires) + if (!req) return -EINVAL; int r = wait_for_osdmap(); @@ -115,11 +115,11 @@ int librados::RadosClient::pool_requires_alignment2(int64_t pool_id, return r; } - return objecter->with_osdmap([requires, pool_id](const OSDMap& o) { + return objecter->with_osdmap([req, pool_id](const OSDMap& o) { if (!o.have_pg_pool(pool_id)) { return -ENOENT; } - *requires = o.get_pg_pool(pool_id)->requires_aligned_append(); + *req = o.get_pg_pool(pool_id)->requires_aligned_append(); return 0; }); } diff --git a/src/librados/RadosClient.h b/src/librados/RadosClient.h index 00a273b82d30d..052249a76db36 100644 --- a/src/librados/RadosClient.h +++ b/src/librados/RadosClient.h @@ -121,7 +121,7 @@ public: int get_fsid(std::string *s); int64_t lookup_pool(const char *name); bool pool_requires_alignment(int64_t pool_id); - int pool_requires_alignment2(int64_t pool_id, bool *requires); + int pool_requires_alignment2(int64_t pool_id, bool *req); uint64_t pool_required_alignment(int64_t pool_id); int pool_required_alignment2(int64_t pool_id, uint64_t *alignment); int pool_get_name(uint64_t pool_id, std::string *name, diff --git a/src/librados/librados_c.cc b/src/librados/librados_c.cc index a403a4b97623c..89c568ad1b390 100644 --- a/src/librados/librados_c.cc +++ b/src/librados/librados_c.cc @@ -1607,7 +1607,7 @@ LIBRADOS_C_API_BASE_DEFAULT(rados_ioctx_pool_requires_alignment); extern "C" int LIBRADOS_C_API_DEFAULT_F(rados_ioctx_pool_requires_alignment2)( rados_ioctx_t io, - int *requires) + int *req) { tracepoint(librados, rados_ioctx_pool_requires_alignment_enter2, io); librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io; @@ -1616,8 +1616,8 @@ extern "C" int LIBRADOS_C_API_DEFAULT_F(rados_ioctx_pool_requires_alignment2)( &requires_alignment); tracepoint(librados, rados_ioctx_pool_requires_alignment_exit2, retval, requires_alignment); - if (requires) - *requires = requires_alignment; + if (req) + *req = requires_alignment; return retval; } LIBRADOS_C_API_BASE_DEFAULT(rados_ioctx_pool_requires_alignment2); diff --git a/src/librados/librados_cxx.cc b/src/librados/librados_cxx.cc index 75e3e797a9aff..452b9c90b2e9e 100644 --- a/src/librados/librados_cxx.cc +++ b/src/librados/librados_cxx.cc @@ -1203,9 +1203,9 @@ bool librados::IoCtx::pool_requires_alignment() return io_ctx_impl->client->pool_requires_alignment(get_id()); } -int librados::IoCtx::pool_requires_alignment2(bool *requires) +int librados::IoCtx::pool_requires_alignment2(bool *req) { - return io_ctx_impl->client->pool_requires_alignment2(get_id(), requires); + return io_ctx_impl->client->pool_requires_alignment2(get_id(), req); } uint64_t librados::IoCtx::pool_required_alignment() diff --git a/src/test/librados/TestCase.cc b/src/test/librados/TestCase.cc index 1066587b5ec91..1399370c1b42b 100644 --- a/src/test/librados/TestCase.cc +++ b/src/test/librados/TestCase.cc @@ -26,9 +26,9 @@ void RadosTestNS::SetUp() { cluster = RadosTestNS::s_cluster; ASSERT_EQ(0, rados_ioctx_create(cluster, pool_name.c_str(), &ioctx)); - int requires; - ASSERT_EQ(0, rados_ioctx_pool_requires_alignment2(ioctx, &requires)); - ASSERT_FALSE(requires); + int req; + ASSERT_EQ(0, rados_ioctx_pool_requires_alignment2(ioctx, &req)); + ASSERT_FALSE(req); } void RadosTestNS::TearDown() @@ -78,9 +78,9 @@ void RadosTestECNS::SetUp() { cluster = RadosTestECNS::s_cluster; ASSERT_EQ(0, rados_ioctx_create(cluster, pool_name.c_str(), &ioctx)); - int requires; - ASSERT_EQ(0, rados_ioctx_pool_requires_alignment2(ioctx, &requires)); - ASSERT_TRUE(requires); + int req; + ASSERT_EQ(0, rados_ioctx_pool_requires_alignment2(ioctx, &req)); + ASSERT_TRUE(req); ASSERT_EQ(0, rados_ioctx_pool_required_alignment2(ioctx, &alignment)); ASSERT_NE(0U, alignment); } @@ -112,9 +112,9 @@ void RadosTest::SetUp() ASSERT_EQ(0, rados_ioctx_create(cluster, pool_name.c_str(), &ioctx)); nspace = get_temp_pool_name(); rados_ioctx_set_namespace(ioctx, nspace.c_str()); - int requires; - ASSERT_EQ(0, rados_ioctx_pool_requires_alignment2(ioctx, &requires)); - ASSERT_FALSE(requires); + int req; + ASSERT_EQ(0, rados_ioctx_pool_requires_alignment2(ioctx, &req)); + ASSERT_FALSE(req); } void RadosTest::TearDown() @@ -172,9 +172,9 @@ void RadosTestEC::SetUp() ASSERT_EQ(0, rados_ioctx_create(cluster, pool_name.c_str(), &ioctx)); nspace = get_temp_pool_name(); rados_ioctx_set_namespace(ioctx, nspace.c_str()); - int requires; - ASSERT_EQ(0, rados_ioctx_pool_requires_alignment2(ioctx, &requires)); - ASSERT_TRUE(requires); + int req; + ASSERT_EQ(0, rados_ioctx_pool_requires_alignment2(ioctx, &req)); + ASSERT_TRUE(req); ASSERT_EQ(0, rados_ioctx_pool_required_alignment2(ioctx, &alignment)); ASSERT_NE(0U, alignment); } diff --git a/src/test/librados/aio.cc b/src/test/librados/aio.cc index 8e9662bff52e0..e3652bc3bfdfd 100644 --- a/src/test/librados/aio.cc +++ b/src/test/librados/aio.cc @@ -1147,9 +1147,9 @@ TEST(LibRadosAioEC, RoundTripAppend) { ASSERT_EQ("", test_data.init()); ASSERT_EQ(0, rados_aio_create_completion2(nullptr, nullptr, &my_completion)); - int requires; - ASSERT_EQ(0, rados_ioctx_pool_requires_alignment2(test_data.m_ioctx, &requires)); - ASSERT_NE(0, requires); + int req; + ASSERT_EQ(0, rados_ioctx_pool_requires_alignment2(test_data.m_ioctx, &req)); + ASSERT_NE(0, req); uint64_t alignment; ASSERT_EQ(0, rados_ioctx_pool_required_alignment2(test_data.m_ioctx, &alignment)); ASSERT_NE(0U, alignment); diff --git a/src/test/librados/aio_cxx.cc b/src/test/librados/aio_cxx.cc index 28360b3d93833..0aca54dbe031f 100644 --- a/src/test/librados/aio_cxx.cc +++ b/src/test/librados/aio_cxx.cc @@ -1560,9 +1560,9 @@ TEST(LibRadosAioEC, RoundTripAppendPP) { ASSERT_EQ("", test_data.init()); auto my_completion = std::unique_ptr{Rados::aio_create_completion()}; ASSERT_TRUE(my_completion); - bool requires; - ASSERT_EQ(0, test_data.m_ioctx.pool_requires_alignment2(&requires)); - ASSERT_TRUE(requires); + bool req; + ASSERT_EQ(0, test_data.m_ioctx.pool_requires_alignment2(&req)); + ASSERT_TRUE(req); uint64_t alignment; ASSERT_EQ(0, test_data.m_ioctx.pool_required_alignment2(&alignment)); ASSERT_NE((unsigned)0, alignment); diff --git a/src/test/librados/testcase_cxx.cc b/src/test/librados/testcase_cxx.cc index b660014be1cb4..135b36e8eee46 100644 --- a/src/test/librados/testcase_cxx.cc +++ b/src/test/librados/testcase_cxx.cc @@ -41,9 +41,9 @@ void RadosTestPPNS::TearDownTestCase() void RadosTestPPNS::SetUp() { ASSERT_EQ(0, cluster.ioctx_create(pool_name.c_str(), ioctx)); - bool requires; - ASSERT_EQ(0, ioctx.pool_requires_alignment2(&requires)); - ASSERT_FALSE(requires); + bool req; + ASSERT_EQ(0, ioctx.pool_requires_alignment2(&req)); + ASSERT_FALSE(req); } void RadosTestPPNS::TearDown() @@ -124,9 +124,9 @@ void RadosTestParamPPNS::SetUp() } ASSERT_EQ(0, cluster.ioctx_create(pool_name.c_str(), ioctx)); - bool requires; - ASSERT_EQ(0, ioctx.pool_requires_alignment2(&requires)); - ASSERT_FALSE(requires); + bool req; + ASSERT_EQ(0, ioctx.pool_requires_alignment2(&req)); + ASSERT_FALSE(req); } void RadosTestParamPPNS::TearDown() @@ -166,9 +166,9 @@ void RadosTestECPPNS::TearDownTestCase() void RadosTestECPPNS::SetUp() { ASSERT_EQ(0, cluster.ioctx_create(pool_name.c_str(), ioctx)); - bool requires; - ASSERT_EQ(0, ioctx.pool_requires_alignment2(&requires)); - ASSERT_TRUE(requires); + bool req; + ASSERT_EQ(0, ioctx.pool_requires_alignment2(&req)); + ASSERT_TRUE(req); ASSERT_EQ(0, ioctx.pool_required_alignment2(&alignment)); ASSERT_NE(0U, alignment); } @@ -201,9 +201,9 @@ void RadosTestPP::SetUp() ASSERT_EQ(0, cluster.ioctx_create(pool_name.c_str(), ioctx)); nspace = get_temp_pool_name(); ioctx.set_namespace(nspace); - bool requires; - ASSERT_EQ(0, ioctx.pool_requires_alignment2(&requires)); - ASSERT_FALSE(requires); + bool req; + ASSERT_EQ(0, ioctx.pool_requires_alignment2(&req)); + ASSERT_FALSE(req); } void RadosTestPP::TearDown() @@ -322,9 +322,9 @@ void RadosTestParamPP::SetUp() ASSERT_EQ(0, cluster.ioctx_create(pool_name.c_str(), ioctx)); nspace = get_temp_pool_name(); ioctx.set_namespace(nspace); - bool requires; - ASSERT_EQ(0, ioctx.pool_requires_alignment2(&requires)); - ASSERT_FALSE(requires); + bool req; + ASSERT_EQ(0, ioctx.pool_requires_alignment2(&req)); + ASSERT_FALSE(req); } void RadosTestParamPP::TearDown() @@ -373,9 +373,9 @@ void RadosTestECPP::SetUp() ASSERT_EQ(0, cluster.ioctx_create(pool_name.c_str(), ioctx)); nspace = get_temp_pool_name(); ioctx.set_namespace(nspace); - bool requires; - ASSERT_EQ(0, ioctx.pool_requires_alignment2(&requires)); - ASSERT_TRUE(requires); + bool req; + ASSERT_EQ(0, ioctx.pool_requires_alignment2(&req)); + ASSERT_TRUE(req); ASSERT_EQ(0, ioctx.pool_required_alignment2(&alignment)); ASSERT_NE(0U, alignment); } diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc index 23c2a732d6442..42d1a00c03573 100644 --- a/src/tools/rados/rados.cc +++ b/src/tools/rados/rados.cc @@ -2202,15 +2202,15 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, // align op_size { - bool requires; - ret = io_ctx.pool_requires_alignment2(&requires); + bool req; + ret = io_ctx.pool_requires_alignment2(&req); if (ret < 0) { cerr << "error checking pool alignment requirement" << cpp_strerror(ret) << std::endl; return 1; } - if (requires) { + if (req) { uint64_t align = 0; ret = io_ctx.pool_required_alignment2(&align); if (ret < 0) { diff --git a/src/tracing/librados.tp b/src/tracing/librados.tp index 80bb79f9ce43e..e6f8ade099fb7 100644 --- a/src/tracing/librados.tp +++ b/src/tracing/librados.tp @@ -1230,10 +1230,10 @@ TRACEPOINT_EVENT(librados, rados_ioctx_pool_requires_alignment_enter2, TRACEPOINT_EVENT(librados, rados_ioctx_pool_requires_alignment_exit2, TP_ARGS( int, retval, - int, requires), + int, req), TP_FIELDS( ctf_integer(int, retval, retval) - ctf_integer(int, requires, requires) + ctf_integer(int, requires, req) ) ) -- 2.39.5