From aaab90fb07309d97896c53b0aefadc9bc5bce8db Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 22 Oct 2019 15:34:08 +0800 Subject: [PATCH] librados: add Rados::aio_create_completion(arg, cb) which does not take safe_cb, and will take the place of Rados::aio_create_completion(arg, cb_complete, cb_safe) Signed-off-by: Kefu Chai --- src/include/rados/librados.hpp | 4 +++- src/librados/librados_cxx.cc | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp index d65d7cadf07..69e9c249c67 100644 --- a/src/include/rados/librados.hpp +++ b/src/include/rados/librados.hpp @@ -1476,7 +1476,9 @@ inline namespace v14_2_0 { // -- aio -- static AioCompletion *aio_create_completion(); static AioCompletion *aio_create_completion(void *cb_arg, callback_t cb_complete, - callback_t cb_safe); + callback_t cb_safe) + __attribute__ ((deprecated)); + static AioCompletion *aio_create_completion(void *cb_arg, callback_t cb_complete); friend std::ostream& operator<<(std::ostream &oss, const Rados& r); private: diff --git a/src/librados/librados_cxx.cc b/src/librados/librados_cxx.cc index 3b2007270bb..c888d2d163b 100644 --- a/src/librados/librados_cxx.cc +++ b/src/librados/librados_cxx.cc @@ -2798,6 +2798,15 @@ librados::AioCompletion *librados::Rados::aio_create_completion(void *cb_arg, return new AioCompletion(c); } +librados::AioCompletion *librados::Rados::aio_create_completion(void *cb_arg, + callback_t cb_complete) +{ + AioCompletionImpl *c; + int r = rados_aio_create_completion(cb_arg, cb_complete, (void**)&c); + ceph_assert(r == 0); + return new AioCompletion(c); +} + librados::ObjectOperation::ObjectOperation() : impl(new ObjectOperationImpl) {} librados::ObjectOperation::ObjectOperation(ObjectOperation&& rhs) -- 2.39.5