<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15681] CalendarServer/trunk/calendarserver/tools/dashtime.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15681">15681</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-06-17 11:28:09 -0700 (Fri, 17 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve stacked chart layout. Make sure perHost y-max operates on the same measurement type.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsdashtimepy">CalendarServer/trunk/calendarserver/tools/dashtime.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsdashtimepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dashtime.py (15680 => 15681)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dashtime.py 2016-06-17 13:51:36 UTC (rev 15680)
+++ CalendarServer/trunk/calendarserver/tools/dashtime.py 2016-06-17 18:28:09 UTC (rev 15681)
</span><span class="lines">@@ -475,18 +475,18 @@
</span><span class="cx"> # Offset data that is averaged over the previous minute. Also determine
</span><span class="cx"> # the highest max value of all the per-host measurements and scale each
</span><span class="cx"> # per-host plot to the same range.
</span><del>- overall_ymax = 0
</del><ins>+ overall_ymax = defaultdict(int)
</ins><span class="cx"> for host in hosts:
</span><span class="cx"> for measurement in perhostkeys:
</span><span class="cx"> ykey = "{}={}".format(measurement, host)
</span><del>- overall_ymax = max(overall_ymax, max(y[ykey]))
</del><ins>+ overall_ymax[measurement] = max(overall_ymax[measurement], max(y[ykey]))
</ins><span class="cx"> if DataType.skip(measurement):
</span><span class="cx"> y[ykey] = y[ykey][60:]
</span><span class="cx"> y[ykey].extend([None] * 60)
</span><span class="cx"> for host in hosts:
</span><span class="cx"> for measurement in perhostkeys:
</span><span class="cx"> ykey = "{}={}".format(measurement, host)
</span><del>- ymaxes[ykey] = overall_ymax
</del><ins>+ ymaxes[ykey] = overall_ymax[measurement]
</ins><span class="cx">
</span><span class="cx"> for measurement in combinedkeys:
</span><span class="cx"> if DataType.skip(measurement):
</span><span class="lines">@@ -516,7 +516,16 @@
</span><span class="cx"> # JobQueueDataType.key,
</span><span class="cx"> # ))
</span><span class="cx">
</span><ins>+ # Generic aggregated data for all hosts
+ combinedHosts((
+ CPUDataType.key,
+ RequestsDataType.key,
+ ResponseDataType.key,
+ JobsCompletedDataType.key,
+ JobQueueDataType.key,
+ ))
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> # Data aggregated for all hosts - method detail
</span><span class="cx"> # combinedHosts((
</span><span class="cx"> # CPUDataType.key,
</span><span class="lines">@@ -537,27 +546,23 @@
</span><span class="cx"> # ))
</span><span class="cx">
</span><span class="cx"> # Per-host job completion, and total CPU, total jobs queued
</span><del>-# singleHost((
</del><ins>+# perHost((
+# JobsCompletedDataType.key,
+# ), (
</ins><span class="cx"> # CPUDataType.key,
</span><del>-# JobsCompletedDataType.key,
</del><span class="cx"> # JobQueueDataType.key,
</span><span class="cx"> # ))
</span><del>- perHost((
- JobsCompletedDataType.key,
- ), (
- CPUDataType.key,
- JobQueueDataType.key,
- ))
</del><span class="cx">
</span><span class="cx"> # Generate a single stacked plot of the data
</span><ins>+ plotmax = len(y.keys())
</ins><span class="cx"> for plotnum, measurement in enumerate(y.keys()):
</span><span class="cx"> plt.subplot(len(y), 1, plotnum + 1)
</span><del>- plotSeries(titles[measurement], x, y[measurement], 0, ymaxes[measurement])
</del><ins>+ plotSeries(titles[measurement], x, y[measurement], 0, ymaxes[measurement], plotnum == plotmax - 1)
</ins><span class="cx"> plt.show()
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def plotSeries(title, x, y, ymin=None, ymax=None):
</del><ins>+def plotSeries(title, x, y, ymin=None, ymax=None, last_subplot=True):
</ins><span class="cx"> """
</span><span class="cx"> Plot the chosen dataset key for each scanned data file.
</span><span class="cx">
</span><span class="lines">@@ -571,8 +576,12 @@
</span><span class="cx">
</span><span class="cx"> plt.plot(x, y)
</span><span class="cx">
</span><del>- plt.xlabel("Time")
- plt.ylabel(title)
</del><ins>+ if last_subplot:
+ plt.xlabel("Time")
+ else:
+ frame = plt.gca()
+ frame.axes.xaxis.set_ticklabels([])
+ plt.ylabel(title, fontsize="small", horizontalalignment="right", rotation="horizontal")
</ins><span class="cx"> if ymin is not None:
</span><span class="cx"> plt.ylim(ymin=ymin)
</span><span class="cx"> if ymax is not None:
</span></span></pre>
</div>
</div>
</body>
</html>