From patchwork Fri Jun 17 23:12:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Faggioli X-Patchwork-Id: 9185145 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 158DB601C0 for ; Fri, 17 Jun 2016 23:14:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0137921327 for ; Fri, 17 Jun 2016 23:14:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E83BE27BE5; Fri, 17 Jun 2016 23:14:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E919D21327 for ; Fri, 17 Jun 2016 23:14:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bE2wM-0003ct-UA; Fri, 17 Jun 2016 23:12:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bE2wK-0003bb-Tj for xen-devel@lists.xenproject.org; Fri, 17 Jun 2016 23:12:41 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 17/5A-27600-8E384675; Fri, 17 Jun 2016 23:12:40 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHIsWRWlGSWpSXmKPExsXiVRvkovu8OSX c4McPCYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPF1g7Wgq/yFfMmXWZuYOwU72Lk4hASmMEo sePAXCYQh0VgDavE97c7mUEcCYFLrBL31lxn7GLkBHJiJDbu2swGYVdILFs5hxXEFhJQkbi5f RUThL2ISWLNGyMQW1hAT+LI0R/sEHaExPajk8Bq2AQMJN7s2AvWKyKgJHFv1WSwzcwCCxglbh 9vAkpwAJ2hKvG2NwSkhlfAR+L5tEfMIDangK/E6iu72CB2+UhcPPcIzBYVkJNYebmFFaJeUOL kzCcsIGOYBTQl1u/SBwkzC8hLbH87h3kCo8gsJFWzEKpmIalawMi8ilGjOLWoLLVI19BYL6ko Mz2jJDcxM0fX0NBELze1uDgxPTUnMalYLzk/dxMjMPzrGRgYdzDu2u55iFGSg0lJlPdKZUq4E F9SfkplRmJxRnxRaU5q8SFGDQ4OgQln505nkmLJy89LVZLg3dAEVCdYlJqeWpGWmQOMUJhSCQ 4eJRHeKpA0b3FBYm5xZjpE6hSjLseWqffWMgmBzZAS590MUiQAUpRRmgc3ApYsLjHKSgnzMjI wMAjxFKQW5WaWoMq/YhTnYFQS5p0JMoUnM68EbtMroCOYgI7QnJcMckRJIkJKqoHRNGaX+ISQ 2vt8TQmflButC9fNnPLfK0H0b6rz8hu25XOfJf1XZZsXcez2z1fLPXd7xRy6fK3usvBGBcGGq dO/TeeT+FpUqau6x0aG1/6X3iMnkcDViWej3LXW/nM5Erxo749n/FcKqvbye0V915H4W2IjsF XZOyuXk//efT37nsjkM7ZsOpFKLMUZiYZazEXFiQDZqZ2nEQMAAA== X-Env-Sender: raistlin.df@gmail.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1466205159!48442968!1 X-Originating-IP: [74.125.82.68] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36961 invoked from network); 17 Jun 2016 23:12:39 -0000 Received: from mail-wm0-f68.google.com (HELO mail-wm0-f68.google.com) (74.125.82.68) by server-15.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 17 Jun 2016 23:12:39 -0000 Received: by mail-wm0-f68.google.com with SMTP id m124so1076929wme.3 for ; Fri, 17 Jun 2016 16:12:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=6pY6CGFt3M1lkNNyVc6WRtUM4WYHomrEz6N8td9CkaQ=; b=tc8sTMaR8LlqFL7sK6FdcaYOQt3MWVYUoquUj3f1Gfjnzj1hHypavGWBLFs7rpqCrt j0BQxzMnIBbJAjMXed5Img+6nhWxTliPCZa6yqlQyOSN8BpOChNY4s06CtQtknIE402t qIpkdDPltal7NZjHTd3nMdEB8kPPZFtI9pLoqhXf2EK1clQ4daRKaXe5eB4vLc+5MvKO gjCrjFQihqXjkrPAiBHehrIjhZZOZtCY/UethTqI+MrtJG1XWpBNzx7vGfYYavDsP92U jrxa2/dgrA5tCgv5XgrrNauRKdxhbcLLoED0TRBby5XKWZZprxtj9m6gGOrCqKkCfRVE ZAyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:from:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=6pY6CGFt3M1lkNNyVc6WRtUM4WYHomrEz6N8td9CkaQ=; b=kCJWOLP8e0tKD2UuXxW/nikyhgYGgfca40LdJAxzD98G+RD92TPZc8HzobH1+s2hgj CW7oCUFez6cubGnWRX8imKc5nVrdE5VB9N4hsTAGceFqJuBDrd+ncGrcd81NOOCbOvND NwaVjrxKGR1kumeAYnXDLRNq17mWq9My3PQxt/eHHbx5dFB8+tst6hMkCxarHKZsL1gx DM3IlgSVFPS2U0T14OtCZ7Ch9O3WYUgX+0FsfwfOk9Nd32AsJYQCYL/ZWXllMeerIQ7d xnELpKE56RkqTym7/AxJH+IZdo+ncmUKXTVqytSixa8CBETdarl8hA/my+PF3BMDhfE/ 4B9A== X-Gm-Message-State: ALyK8tKvSqg/fEFNvNYFJ9Qb9+Gca6qDZxAy7iTrjXmvorUWk4h0RJp89Fb+ZahOc7sODQ== X-Received: by 10.28.91.145 with SMTP id p139mr737172wmb.50.1466205158861; Fri, 17 Jun 2016 16:12:38 -0700 (PDT) Received: from Solace.fritz.box (net-93-65-149-191.cust.vodafonedsl.it. [93.65.149.191]) by smtp.gmail.com with ESMTPSA id bo1sm21342982wjb.35.2016.06.17.16.12.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jun 2016 16:12:38 -0700 (PDT) From: Dario Faggioli To: xen-devel@lists.xenproject.org Date: Sat, 18 Jun 2016 01:12:36 +0200 Message-ID: <146620515674.29766.14348018029281182306.stgit@Solace.fritz.box> In-Reply-To: <146620492155.29766.10321123657058307698.stgit@Solace.fritz.box> References: <146620492155.29766.10321123657058307698.stgit@Solace.fritz.box> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Cc: Wei Liu , Anshul Makkar , Ian Jackson , George Dunlap Subject: [Xen-devel] [PATCH 11/19] tools: tracing: adapt Credit2 load tracking events to new format X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP in both xenalyze and formats (for xentrace_format). In particular, in xenalyze, now that we have the precision of the fixed point load values in the tracepoint, show both the raw value and the (easier to interpreet) percentage. Signed-off-by: Dario Faggioli --- Cc: George Dunlap Cc: Ian Jackson Cc: Wei Liu Cc: Anshul Makkar --- tools/xentrace/formats | 4 ++-- tools/xentrace/xenalyze.c | 25 ++++++++++++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/tools/xentrace/formats b/tools/xentrace/formats index d204351..2e58d03 100644 --- a/tools/xentrace/formats +++ b/tools/xentrace/formats @@ -53,8 +53,8 @@ 0x00022208 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:sched_tasklet 0x00022209 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:update_load 0x0002220a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:runq_assign [ dom:vcpu = 0x%(1)08x, rq_id = %(2)d ] -0x0002220b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:updt_vcpu_load [ dom:vcpu = 0x%(1)08x, avgload = %(2)d ] -0x0002220c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:updt_runq_load [ rq_load[4]:rq_avgload[28] = 0x%(1)08x, rq_id[4]:b_avgload[28] = 0x%(2)08x ] +0x0002220b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:updt_vcpu_load [ dom:vcpu = 0x%(3)08x, vcpuload = 0x%(2)08x%(1)08x, wshift = %(4)d ] +0x0002220c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:updt_runq_load [ rq_load[16]:rq_id[8]:wshift[8] = 0x%(5)08x, rq_avgload = 0x%(2)08x%(1)08x, b_avgload = 0x%(4)08x%(3)08x ] 0x00022801 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:tickle [ cpu = %(1)d ] 0x00022802 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:runq_pick [ dom:vcpu = 0x%(1)08x, cur_deadline = 0x%(3)08x%(2)08x, cur_budget = 0x%(5)08x%(4)08x ] diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 01ead8b..f2f97bd 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -7802,25 +7802,36 @@ void sched_process(struct pcpu_info *p) case TRC_SCHED_CLASS_EVT(CSCHED2, 11): /* UPDATE_VCPU_LOAD */ if(opt.dump_all) { struct { + uint64_t vcpuload; unsigned int vcpuid:16, domid:16; - unsigned int avgload; + unsigned int shift; } *r = (typeof(r))ri->d; + double vcpuload; - printf(" %s csched2:update_vcpu_load d%uv%u, avg_load = %u\n", - ri->dump_header, r->domid, r->vcpuid, r->avgload); + vcpuload = (r->vcpuload * 100.0) / (1ULL << r->shift); + + printf(" %s csched2:update_vcpu_load d%uv%u, " + "vcpu_load = %4.3f%% (%"PRIu64")\n", + ri->dump_header, r->domid, r->vcpuid, vcpuload, + r->vcpuload); } break; case TRC_SCHED_CLASS_EVT(CSCHED2, 12): /* UPDATE_RUNQ_LOAD */ if(opt.dump_all) { struct { - unsigned int rq_load:4, rq_avgload:28; - unsigned int rq_id:4, b_avgload:28; + uint64_t rq_avgload, b_avgload; + unsigned int rq_load:16, rq_id:8, shift:8; } *r = (typeof(r))ri->d; + double avgload, b_avgload; + + avgload = (r->rq_avgload * 100.0) / (1ULL << r->shift); + b_avgload = (r->b_avgload * 100.0) / (1ULL << r->shift); printf(" %s csched2:update_rq_load rq# %u, load = %u, " - "avgload = %u, b_avgload = %u\n", + "avgload = %4.3f%% (%"PRIu64"), " + "b_avgload = %4.3f%% (%"PRIu64")\n", ri->dump_header, r->rq_id, r->rq_load, - r->rq_avgload, r->b_avgload); + avgload, r->rq_avgload, b_avgload, r->b_avgload); } break; /* RTDS (TRC_RTDS_xxx) */