From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dario Faggioli Subject: [PATCH] xen: sched: rename vcpu_destroy perf counter to vcpu_remove Date: Thu, 24 Sep 2015 17:43:08 +0200 Message-ID: <20150924154308.1262.24171.stgit@Solace.station> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zf8fz-0006YN-Ps for xen-devel@lists.xenproject.org; Thu, 24 Sep 2015 15:43:15 +0000 Received: by wicge5 with SMTP id ge5so257833619wic.0 for ; Thu, 24 Sep 2015 08:43:13 -0700 (PDT) List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: George Dunlap , Juergen Gross , Meng Xu , Jan Beulich List-Id: xen-devel@lists.xenproject.org It seems this have had to be done as part of 7e6b926a ("cpupools: Make interface more consistent"), which renamed the function but not the counter. In fact, because of cpupools, vcpus are not only removed from a scheduler when they are destroyed, but also when domains move between pools. Make the related statistics counter reflect that more properly. Signed-off-by: Dario Faggioli --- Cc: George Dunlap Cc: Juergen Gross Cc: Meng Xu Cc: Jan Beulich --- xen/common/sched_credit.c | 2 +- xen/common/sched_credit2.c | 2 +- xen/common/sched_rt.c | 2 +- xen/include/xen/perfc_defn.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index a1945ac..fb05276 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -927,7 +927,7 @@ csched_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) struct csched_dom * const sdom = svc->sdom; unsigned long flags; - SCHED_STAT_CRANK(vcpu_destroy); + SCHED_STAT_CRANK(vcpu_remove); if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) { diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 75e0321..135cf88 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -917,7 +917,7 @@ csched2_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) { spinlock_t *lock; - SCHED_STAT_CRANK(vcpu_destroy); + SCHED_STAT_CRANK(vcpu_remove); /* Remove from runqueue */ lock = vcpu_schedule_lock_irq(vc); diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 4372486..31b0a9e 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -648,7 +648,7 @@ rt_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) struct rt_dom * const sdom = svc->sdom; spinlock_t *lock; - SCHED_STAT_CRANK(vcpu_destroy); + SCHED_STAT_CRANK(vcpu_remove); BUG_ON( sdom == NULL ); diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index 526002d..43d1dfd 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -20,7 +20,7 @@ PERFCOUNTER(schedule, "sched: specific scheduler") PERFCOUNTER(dom_init, "sched: dom_init") PERFCOUNTER(dom_destroy, "sched: dom_destroy") PERFCOUNTER(vcpu_init, "sched: vcpu_init") -PERFCOUNTER(vcpu_destroy, "sched: vcpu_destroy") +PERFCOUNTER(vcpu_remove, "sched: vcpu_remove") PERFCOUNTER(vcpu_sleep, "sched: vcpu_sleep") PERFCOUNTER(vcpu_wake_running, "sched: vcpu_wake_running") PERFCOUNTER(vcpu_wake_onrunq, "sched: vcpu_wake_onrunq")