From 9e71c5ee8a7914520e65dc24950796c6bbc43358 Mon Sep 17 00:00:00 2001 From: Haomai Wang Date: Fri, 6 May 2016 17:05:41 +0800 Subject: [PATCH] DispatchQueue: add name to separte different instance Signed-off-by: Haomai Wang --- src/msg/DispatchQueue.h | 8 ++++---- src/msg/async/AsyncMessenger.cc | 2 +- src/msg/simple/SimpleMessenger.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/msg/DispatchQueue.h b/src/msg/DispatchQueue.h index 561ebb28a68d..18328c0ce997 100644 --- a/src/msg/DispatchQueue.h +++ b/src/msg/DispatchQueue.h @@ -202,17 +202,17 @@ class DispatchQueue { void shutdown(); bool is_started() const {return dispatch_thread.is_started();} - DispatchQueue(CephContext *cct, Messenger *msgr) + DispatchQueue(CephContext *cct, Messenger *msgr, string &name) : cct(cct), msgr(msgr), - lock("Messenger::DispatchQueue::lock"), + lock("Messenger::DispatchQueue::lock" + name), mqueue(cct->_conf->ms_pq_max_tokens_per_priority, cct->_conf->ms_pq_min_cost), next_pipe_id(1), dispatch_thread(this), - local_delivery_lock("Messenger::DispatchQueue::local_delivery_lock"), + local_delivery_lock("Messenger::DispatchQueue::local_delivery_lock" + name), stop_local_delivery(false), local_delivery_thread(this), - dispatch_throttler(cct, string("msgr_dispatch_throttler-") + msgr->get_myname(), + dispatch_throttler(cct, string("msgr_dispatch_throttler-") + name, cct->_conf->ms_dispatch_throttle_bytes), stop(false) {} diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc index 78937a140639..8a6d0428d154 100644 --- a/src/msg/async/AsyncMessenger.cc +++ b/src/msg/async/AsyncMessenger.cc @@ -377,7 +377,7 @@ AsyncMessenger::AsyncMessenger(CephContext *cct, entity_name_t name, string mname, uint64_t _nonce, uint64_t features) : SimplePolicyMessenger(cct, name,mname, _nonce), processor(this, cct, _nonce), - dispatch_queue(cct, this), + dispatch_queue(cct, this, mname), lock("AsyncMessenger::lock"), nonce(_nonce), need_addr(true), did_bind(false), global_seq(0), deleted_lock("AsyncMessenger::deleted_lock"), diff --git a/src/msg/simple/SimpleMessenger.cc b/src/msg/simple/SimpleMessenger.cc index 491aa40900db..246ac0742f81 100644 --- a/src/msg/simple/SimpleMessenger.cc +++ b/src/msg/simple/SimpleMessenger.cc @@ -42,7 +42,7 @@ SimpleMessenger::SimpleMessenger(CephContext *cct, entity_name_t name, string mname, uint64_t _nonce, uint64_t features) : SimplePolicyMessenger(cct, name,mname, _nonce), accepter(this, _nonce), - dispatch_queue(cct, this), + dispatch_queue(cct, this, mname), reaper_thread(this), nonce(_nonce), lock("SimpleMessenger::lock"), need_addr(true), did_bind(false), -- 2.47.3