<!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>[15651] CalendarServer/trunk/contrib/performance/loadtest</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/15651">15651</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-06-03 09:55:17 -0700 (Fri, 03 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add % column to results tables.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtestloggerpy">CalendarServer/trunk/contrib/performance/loadtest/logger.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestpopulationpy">CalendarServer/trunk/contrib/performance/loadtest/population.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestprofilespy">CalendarServer/trunk/contrib/performance/loadtest/profiles.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcontribperformanceloadtestloggerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/logger.py (15650 => 15651)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/logger.py 2016-06-03 15:58:42 UTC (rev 15650)
+++ CalendarServer/trunk/contrib/performance/loadtest/logger.py 2016-06-03 16:55:17 UTC (rev 15651)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> output.write("%s\n" % ("-" * len(header),))
</span><span class="cx">
</span><span class="cx">
</span><del>- def _summarizeData(self, operation, data):
</del><ins>+ def _summarizeData(self, operation, data, total_count):
</ins><span class="cx"> failed = 0
</span><span class="cx"> thresholds = [0] * len(self._thresholds)
</span><span class="cx"> durations = []
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> if thresholds[ctr] * 100.0 / count > fail_at:
</span><span class="cx"> failure = True
</span><span class="cx">
</span><del>- return (operation, count, failed,) + \
</del><ins>+ return (operation, count, ((100.0 * count) / total_count) if total_count else 0.0, failed,) + \
</ins><span class="cx"> tuple(thresholds) + \
</span><span class="cx"> (mean(durations), median(durations), stddev(durations), "FAIL" if failure else "")
</span><span class="cx">
</span><span class="lines">@@ -85,5 +85,6 @@
</span><span class="cx"> Each element is a two-tuple of whether the operation succeeded
</span><span class="cx"> (C{True} if so, C{False} if not) and how long the operation took.
</span><span class="cx"> """
</span><ins>+ total_count = sum(map(lambda x: len(x[1]), perOperationTimes))
</ins><span class="cx"> for method, data in perOperationTimes:
</span><del>- self._printRow(output, formats, self._summarizeData(method, data))
</del><ins>+ self._printRow(output, formats, self._summarizeData(method, data, total_count))
</ins></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestpopulationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/population.py (15650 => 15651)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/population.py 2016-06-03 15:58:42 UTC (rev 15650)
+++ CalendarServer/trunk/contrib/performance/loadtest/population.py 2016-06-03 16:55:17 UTC (rev 15651)
</span><span class="lines">@@ -412,6 +412,7 @@
</span><span class="cx"> _fields_init = [
</span><span class="cx"> ('request', -30, '%-30s'),
</span><span class="cx"> ('count', 8, '%8s'),
</span><ins>+ ('%', 6, '%6.1f'),
</ins><span class="cx"> ('failed', 8, '%8s'),
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -542,8 +543,8 @@
</span><span class="cx"> return ((value / test_mean) - 1.0) * weight + 1.0
</span><span class="cx">
</span><span class="cx">
</span><del>- def _summarizeData(self, operation, data):
- data = SummarizingMixin._summarizeData(self, operation, data)
</del><ins>+ def _summarizeData(self, operation, data, total_count):
+ data = SummarizingMixin._summarizeData(self, operation, data, total_count)
</ins><span class="cx"> value = self.qos_value(operation, data[-4])
</span><span class="cx"> if value is None:
</span><span class="cx"> value = 0.0
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestprofilespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/profiles.py (15650 => 15651)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/profiles.py 2016-06-03 15:58:42 UTC (rev 15650)
+++ CalendarServer/trunk/contrib/performance/loadtest/profiles.py 2016-06-03 16:55:17 UTC (rev 15651)
</span><span class="lines">@@ -584,6 +584,7 @@
</span><span class="cx"> 0, self._client.getAttachment, attachmentHref, managedId
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def _normalizeHref(self, href):
</span><span class="cx"> return urljoin(self._client._managed_attachments_server_url, urlparse(href).path)
</span><span class="cx">
</span><span class="lines">@@ -721,7 +722,6 @@
</span><span class="cx"> return Deferred()
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def modifyEvent(self, href, vevent):
</span><span class="cx"> """Overridden by subclasses"""
</span><span class="cx"> pass
</span><span class="lines">@@ -1096,6 +1096,7 @@
</span><span class="cx"> return self._newOperation("create", d)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class TimeRanger(ProfileBase):
</span><span class="cx"> """
</span><span class="cx"> A profile which does time queries
</span><span class="lines">@@ -1232,6 +1233,7 @@
</span><span class="cx"> _fields_init = [
</span><span class="cx"> ('operation', -30, '%-30s'),
</span><span class="cx"> ('count', 8, '%8s'),
</span><ins>+ ('%', 6, '%6.1f'),
</ins><span class="cx"> ('failed', 8, '%8s'),
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -1297,9 +1299,9 @@
</span><span class="cx"> dataset.append(lag)
</span><span class="cx">
</span><span class="cx">
</span><del>- def _summarizeData(self, operation, data):
</del><ins>+ def _summarizeData(self, operation, data, total_count):
</ins><span class="cx"> avglag = mean(self._perOperationLags.get(operation, [0.0])) * 1000.0
</span><del>- data = SummarizingMixin._summarizeData(self, operation, data)
</del><ins>+ data = SummarizingMixin._summarizeData(self, operation, data, total_count)
</ins><span class="cx"> return data[:-1] + (avglag,) + data[-1:]
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>