]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
librados: stop using c++20 keyword 'requires'
authorCasey Bodley <cbodley@redhat.com>
Fri, 11 Feb 2022 19:49:35 +0000 (14:49 -0500)
committerKefu Chai <tchaikov@gmail.com>
Thu, 17 Mar 2022 14:00:35 +0000 (22:00 +0800)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/librados/RadosClient.cc
src/librados/RadosClient.h
src/librados/librados_c.cc
src/librados/librados_cxx.cc
src/test/librados/TestCase.cc
src/test/librados/aio.cc
src/test/librados/aio_cxx.cc
src/test/librados/testcase_cxx.cc
src/tools/rados/rados.cc
src/tracing/librados.tp

index 3d4563c8bf1e6f1edfd671ae22d628d91d5f2ab5..7f2f73ed1a8f7ed1706684f00a52aaf2a100b6a0 100644 (file)
@@ -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;
     });
 }
index 00a273b82d30dab7486c9a969b81c5e5993d7372..052249a76db36953f16836d492e8148b361fadf1 100644 (file)
@@ -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,
index a403a4b97623c17ad078e1d3c590184c0c4d8d2d..89c568ad1b3904cb9fdbf3a9fab54637943445ff 100644 (file)
@@ -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);
index 75e3e797a9aff6544a8ce3668bb7a46b64ae91e3..452b9c90b2e9e3d06062b3a25cb614edcd8d9500 100644 (file)
@@ -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()
index 1066587b5ec91b2ff2f9e7563d267f55ea1a2416..1399370c1b42ba1f4d139546ee37f9c61a511ef7 100644 (file)
@@ -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);
 }
index 8e9662bff52e079ff7e987413c547fe35a850a43..e3652bc3bfdfd51030e8386dbbf55a5c4660b672 100644 (file)
@@ -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);
index 28360b3d93833f73e2ffb905d89d965fa221f018..0aca54dbe031fc5359ffc0572c923e850d41d8d9 100644 (file)
@@ -1560,9 +1560,9 @@ TEST(LibRadosAioEC, RoundTripAppendPP) {
   ASSERT_EQ("", test_data.init());
   auto my_completion = std::unique_ptr<AioCompletion>{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);
index b660014be1cb4ff12514b65e503f73f83dfe48c8..135b36e8eee46bd61bd52c8cebd73703a05bc539 100644 (file)
@@ -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);
 }
index 23c2a732d64426196f622ecdd2356672cb53f4cd..42d1a00c03573b7cca28fe44c8f533698e2b755a 100644 (file)
@@ -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) {
index 80bb79f9ce43e55293e79ca58838ffd2e345ba88..e6f8ade099fb7196cff4af4a5a6401eb843d9343 100644 (file)
@@ -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)
     )
 )