From 0dafce96636d233d057600e063c5518637188857 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 23 Aug 2018 11:25:02 -0400 Subject: [PATCH] librados: Use ceph_assert for asserts. Signed-off-by: Adam C. Emerson --- src/librados/AioCompletionImpl.h | 8 ++--- src/librados/IoCtxImpl.cc | 10 +++--- src/librados/PoolAsyncCompletionImpl.h | 6 ++-- src/librados/RadosClient.cc | 10 +++--- src/librados/librados.cc | 48 +++++++++++++------------- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/librados/AioCompletionImpl.h b/src/librados/AioCompletionImpl.h index 020341c242bd3..e7b895358f6af 100644 --- a/src/librados/AioCompletionImpl.h +++ b/src/librados/AioCompletionImpl.h @@ -131,13 +131,13 @@ struct librados::AioCompletionImpl { lock.Unlock(); } void _get() { - assert(lock.is_locked()); - assert(ref > 0); + ceph_assert(lock.is_locked()); + ceph_assert(ref > 0); ++ref; } void release() { lock.Lock(); - assert(!released); + ceph_assert(!released); released = true; put_unlock(); } @@ -146,7 +146,7 @@ struct librados::AioCompletionImpl { put_unlock(); } void put_unlock() { - assert(ref > 0); + ceph_assert(ref > 0); int n = --ref; lock.Unlock(); if (!n) diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc index 51020c6306d6c..c148eb18f7bc1 100644 --- a/src/librados/IoCtxImpl.cc +++ b/src/librados/IoCtxImpl.cc @@ -285,7 +285,7 @@ void librados::IoCtxImpl::queue_aio_write(AioCompletionImpl *c) { get(); aio_write_list_lock.Lock(); - assert(c->io == this); + ceph_assert(c->io == this); c->aio_write_seq = ++aio_write_seq; ldout(client->cct, 20) << "queue_aio_write " << this << " completion " << c << " write_seq " << aio_write_seq << dendl; @@ -297,7 +297,7 @@ void librados::IoCtxImpl::complete_aio_write(AioCompletionImpl *c) { ldout(client->cct, 20) << "complete_aio_write " << c << dendl; aio_write_list_lock.Lock(); - assert(c->io == this); + ceph_assert(c->io == this); c->aio_write_list_item.remove_myself(); map >::iterator waiters = aio_write_waiters.begin(); @@ -1951,7 +1951,7 @@ librados::IoCtxImpl::C_aio_stat_Ack::C_aio_stat_Ack(AioCompletionImpl *_c, time_t *pm) : c(_c), pmtime(pm) { - assert(!c->io); + ceph_assert(!c->io); c->get(); } @@ -1979,7 +1979,7 @@ librados::IoCtxImpl::C_aio_stat2_Ack::C_aio_stat2_Ack(AioCompletionImpl *_c, struct timespec *pt) : c(_c), pts(pt) { - assert(!c->io); + ceph_assert(!c->io); c->get(); } @@ -2086,7 +2086,7 @@ int librados::IoCtxImpl::application_enable(const std::string& app_name, application_enable_async(app_name, force, c); int r = c->wait(); - assert(r == 0); + ceph_assert(r == 0); r = c->get_return_value(); c->release(); diff --git a/src/librados/PoolAsyncCompletionImpl.h b/src/librados/PoolAsyncCompletionImpl.h index e876db756fc85..9a3b1be4bdc07 100644 --- a/src/librados/PoolAsyncCompletionImpl.h +++ b/src/librados/PoolAsyncCompletionImpl.h @@ -64,13 +64,13 @@ namespace librados { } void get() { lock.Lock(); - assert(ref > 0); + ceph_assert(ref > 0); ref++; lock.Unlock(); } void release() { lock.Lock(); - assert(!released); + ceph_assert(!released); released = true; put_unlock(); } @@ -79,7 +79,7 @@ namespace librados { put_unlock(); } void put_unlock() { - assert(ref > 0); + ceph_assert(ref > 0); int n = --ref; lock.Unlock(); if (!n) diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index 111acec9c1429..58c24c42f25c1 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -543,7 +543,7 @@ bool librados::RadosClient::ms_handle_refused(Connection *con) bool librados::RadosClient::_dispatch(Message *m) { - assert(lock.is_locked()); + ceph_assert(lock.is_locked()); switch (m->get_type()) { // OSD case CEPH_MSG_OSD_MAP: @@ -569,7 +569,7 @@ bool librados::RadosClient::_dispatch(Message *m) int librados::RadosClient::wait_for_osdmap() { - assert(!lock.is_locked_by_me()); + ceph_assert(!lock.is_locked_by_me()); if (state != CONNECTED) { return -ENOTCONN; @@ -693,13 +693,13 @@ int librados::RadosClient::get_fs_stats(ceph_statfs& stats) void librados::RadosClient::get() { Mutex::Locker l(lock); - assert(refcnt > 0); + ceph_assert(refcnt > 0); refcnt++; } bool librados::RadosClient::put() { Mutex::Locker l(lock); - assert(refcnt > 0); + ceph_assert(refcnt > 0); refcnt--; return (refcnt == 0); } @@ -1030,7 +1030,7 @@ int librados::RadosClient::monitor_log(const string& level, void librados::RadosClient::handle_log(MLog *m) { - assert(lock.is_locked()); + ceph_assert(lock.is_locked()); ldout(cct, 10) << __func__ << " version " << m->version << dendl; if (log_last_version < m->version) { diff --git a/src/librados/librados.cc b/src/librados/librados.cc index ee5cec2db5000..33ee1ba2c6008 100644 --- a/src/librados/librados.cc +++ b/src/librados/librados.cc @@ -820,7 +820,7 @@ librados::ObjectCursor librados::NObjectIteratorImpl::get_cursor() void librados::NObjectIteratorImpl::set_filter(const bufferlist &bl) { - assert(ctx); + ceph_assert(ctx); ctx->nlc->filter = bl; } @@ -900,18 +900,18 @@ bool librados::NObjectIterator::operator!=(const librados::NObjectIterator& rhs) } const librados::ListObject& librados::NObjectIterator::operator*() const { - assert(impl); + ceph_assert(impl); return *(impl->get_listobjectp()); } const librados::ListObject* librados::NObjectIterator::operator->() const { - assert(impl); + ceph_assert(impl); return impl->get_listobjectp(); } librados::NObjectIterator& librados::NObjectIterator::operator++() { - assert(impl); + ceph_assert(impl); impl->get_next(); return *this; } @@ -925,19 +925,19 @@ librados::NObjectIterator librados::NObjectIterator::operator++(int) uint32_t librados::NObjectIterator::seek(uint32_t pos) { - assert(impl); + ceph_assert(impl); return impl->seek(pos); } uint32_t librados::NObjectIterator::seek(const ObjectCursor& cursor) { - assert(impl); + ceph_assert(impl); return impl->seek(cursor); } librados::ObjectCursor librados::NObjectIterator::get_cursor() { - assert(impl); + ceph_assert(impl); return impl->get_cursor(); } @@ -948,13 +948,13 @@ void librados::NObjectIterator::set_filter(const bufferlist &bl) void librados::NObjectIterator::get_next() { - assert(impl); + ceph_assert(impl); impl->get_next(); } uint32_t librados::NObjectIterator::get_pg_hash_position() const { - assert(impl); + ceph_assert(impl); return impl->get_pg_hash_position(); } @@ -2288,7 +2288,7 @@ librados::Rados::Rados() : client(NULL) librados::Rados::Rados(IoCtx &ioctx) { client = ioctx.io_ctx_impl->client; - assert(client != NULL); + ceph_assert(client != NULL); client->get(); } @@ -2799,7 +2799,7 @@ librados::AioCompletion *librados::Rados::aio_create_completion(void *cb_arg, { AioCompletionImpl *c; int r = rados_aio_create_completion(cb_arg, cb_complete, cb_safe, (void**)&c); - assert(r == 0); + ceph_assert(r == 0); return new AioCompletion(c); } @@ -3016,7 +3016,7 @@ extern "C" int rados_conf_parse_argv_remainder(rados_t cluster, int argc, return ret; } conf.apply_changes(NULL); - assert(args.size() <= (unsigned int)argc); + ceph_assert(args.size() <= (unsigned int)argc); for (i = 0; i < (unsigned int)argc; ++i) { if (i < args.size()) remargv[i] = args[i]; @@ -4520,7 +4520,7 @@ extern "C" int rados_object_list(rados_ioctx_t io, rados_object_list_item *result_items, rados_object_list_cursor *next) { - assert(next); + ceph_assert(next); librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io; @@ -4548,7 +4548,7 @@ extern "C" int rados_object_list(rados_ioctx_t io, &cond); hobject_t *next_hobj = (hobject_t*)(*next); - assert(next_hobj); + ceph_assert(next_hobj); int r = cond.wait(); if (r < 0) { @@ -4556,7 +4556,7 @@ extern "C" int rados_object_list(rados_ioctx_t io, return r; } - assert(result.size() <= result_item_count); // Don't overflow! + ceph_assert(result.size() <= result_item_count); // Don't overflow! int k = 0; for (std::list::iterator i = result.begin(); @@ -4576,7 +4576,7 @@ extern "C" void rados_object_list_free( const size_t result_size, rados_object_list_item *results) { - assert(results); + ceph_assert(results); for (unsigned int i = 0; i < result_size; ++i) { rados_buffer_free(results[i].oid); @@ -6506,12 +6506,12 @@ CEPH_RADOS_API void rados_object_list_slice( { librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io; - assert(split_start); - assert(split_finish); + ceph_assert(split_start); + ceph_assert(split_finish); hobject_t *split_start_hobj = (hobject_t*)(*split_start); hobject_t *split_finish_hobj = (hobject_t*)(*split_finish); - assert(split_start_hobj); - assert(split_finish_hobj); + ceph_assert(split_start_hobj); + ceph_assert(split_finish_hobj); hobject_t *start_hobj = (hobject_t*)(start); hobject_t *finish_hobj = (hobject_t*)(finish); @@ -6636,8 +6636,8 @@ int librados::IoCtx::object_list(const ObjectCursor &start, std::vector *result, ObjectCursor *next) { - assert(result != nullptr); - assert(next != nullptr); + ceph_assert(result != nullptr); + ceph_assert(next != nullptr); result->clear(); C_SaferCond cond; @@ -6682,8 +6682,8 @@ void librados::IoCtx::object_list_slice( ObjectCursor *split_start, ObjectCursor *split_finish) { - assert(split_start != nullptr); - assert(split_finish != nullptr); + ceph_assert(split_start != nullptr); + ceph_assert(split_finish != nullptr); io_ctx_impl->object_list_slice( *((hobject_t*)(start.c_cursor)), -- 2.39.5