From 7db7eff0f44981822d93207dadd908b3340b2ea5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jacek=20J=2E=20=C5=81akis?= Date: Tue, 3 Nov 2015 13:00:16 +0100 Subject: [PATCH] OSD / ShardData: Pass ctx to mutex constructors in sdata and sdata_ordering lock to allow gain perfcounter values. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jacek J. Łakis --- src/osd/OSD.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 996e7777af2..404679df79f 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1601,9 +1601,9 @@ private: PrioritizedQueue< pair, entity_inst_t> pqueue; ShardData( string lock_name, string ordering_lock, - uint64_t max_tok_per_prio, uint64_t min_cost) - : sdata_lock(lock_name.c_str()), - sdata_op_ordering_lock(ordering_lock.c_str()), + uint64_t max_tok_per_prio, uint64_t min_cost, CephContext *cct) + : sdata_lock(lock_name.c_str(), false, true, false, cct), + sdata_op_ordering_lock(ordering_lock.c_str(), false, true, false, cct), pqueue(max_tok_per_prio, min_cost) {} }; @@ -1625,7 +1625,7 @@ private: ShardData* one_shard = new ShardData( lock_name, order_lock, osd->cct->_conf->osd_op_pq_max_tokens_per_priority, - osd->cct->_conf->osd_op_pq_min_cost); + osd->cct->_conf->osd_op_pq_min_cost, osd->cct); shard_list.push_back(one_shard); } } -- 2.47.3