From d0b1f72cf83c4e623f56157d74546661420de782 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 21 Mar 2012 10:33:58 -0700 Subject: [PATCH] ObjectCacher: add some asserts about when the lock is held Signed-off-by: Josh Durgin --- src/osdc/ObjectCacher.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index 70d1f3f6a5f2b..eec119f63dbe8 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -460,7 +460,7 @@ void ObjectCacher::bh_read(BufferHead *bh) void ObjectCacher::bh_read_finish(int64_t poolid, sobject_t oid, loff_t start, uint64_t length, bufferlist &bl, int r) { - //lock.Lock(); + assert(lock.is_locked()); ldout(cct, 7) << "bh_read_finish " << oid << " " << start << "~" << length @@ -535,7 +535,6 @@ void ObjectCacher::bh_read_finish(int64_t poolid, sobject_t oid, loff_t start, ob->try_merge_bh(bh); } } - //lock.Unlock(); } @@ -629,8 +628,7 @@ void ObjectCacher::lock_ack(int64_t poolid, list& oids, tid_t tid) void ObjectCacher::bh_write_commit(int64_t poolid, sobject_t oid, loff_t start, uint64_t length, tid_t tid, int r) { - //lock.Lock(); - + assert(lock.is_locked()); ldout(cct, 7) << "bh_write_commit " << oid << " tid " << tid @@ -701,7 +699,6 @@ void ObjectCacher::bh_write_commit(int64_t poolid, sobject_t oid, loff_t start, flush_set_callback(flush_set_callback_arg, oset); } } - //lock.Unlock(); } void ObjectCacher::flush(loff_t amount) @@ -788,6 +785,7 @@ bool ObjectCacher::is_cached(ObjectSet *oset, vector& extents, sna */ int ObjectCacher::readx(OSDRead *rd, ObjectSet *oset, Context *onfinish) { + assert(lock.is_locked()); bool success = true; list hit_ls; map stripe_map; // final buffer offset -> substring @@ -930,6 +928,7 @@ int ObjectCacher::readx(OSDRead *rd, ObjectSet *oset, Context *onfinish) int ObjectCacher::writex(OSDWrite *wr, ObjectSet *oset) { + assert(lock.is_locked()); utime_t now = ceph_clock_now(cct); for (vector::iterator ex_it = wr->extents.begin(); -- 2.39.5