<!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>[13770] CalendarServer/branches/users/gaya/groupsharee2</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/13770">13770</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-07-17 11:54:14 -0700 (Thu, 17 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>merge in trunk to <a href="http://trac.calendarserver.org//changeset/13769">r13769</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2contribtoolsstatsanalysispy">CalendarServer/branches/users/gaya/groupsharee2/contrib/tools/statsanalysis.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2twistedcaldavstdconfigpy">CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/stdconfig.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2contribtools__init__py">CalendarServer/branches/users/gaya/groupsharee2/contrib/tools/__init__.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayagroupsharee2contribtools__init__pyfromrev13769CalendarServertrunkcontribtools__init__py"></a>
<div class="copfile"><h4>Copied: CalendarServer/branches/users/gaya/groupsharee2/contrib/tools/__init__.py (from rev 13769, CalendarServer/trunk/contrib/tools/__init__.py) (0 => 13770)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/contrib/tools/__init__.py (rev 0)
+++ CalendarServer/branches/users/gaya/groupsharee2/contrib/tools/__init__.py 2014-07-17 18:54:14 UTC (rev 13770)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+##
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
</ins></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2contribtoolsstatsanalysispy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/contrib/tools/statsanalysis.py (13769 => 13770)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/contrib/tools/statsanalysis.py 2014-07-17 02:05:24 UTC (rev 13769)
+++ CalendarServer/branches/users/gaya/groupsharee2/contrib/tools/statsanalysis.py 2014-07-17 18:54:14 UTC (rev 13770)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #!/usr/bin/env python
</span><span class="cx"> ##
</span><del>-# Copyright (c) 2010-2014 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> # you may not use this file except in compliance with the License.
</span><span class="lines">@@ -24,19 +24,35 @@
</span><span class="cx"> dataset = {}
</span><span class="cx">
</span><span class="cx"> def analyze(fpath, title):
</span><ins>+ """
+ Analyze a readStats data file.
</ins><span class="cx">
</span><del>- print("Analyzing data for %s" % (fpath,))
</del><ins>+ @param fpath: path of file to analyze
+ @type fpath: L{str}
+ @param title: title to use for data set
+ @type title: L{str}
+ """
+
+ print("Analyzing data for %s" % (title,))
</ins><span class="cx"> dataset[title] = {}
</span><span class="cx"> with open(fpath) as f:
</span><span class="cx"> for line in f:
</span><span class="cx"> if line.startswith("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"):
</span><span class="cx"> analyzeRecord(f, title)
</span><span class="cx">
</span><del>- print("Stored %d data points" % (len(dataset[title]),))
</del><ins>+ print("Read %d data points\n" % (len(dataset[title]),))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def analyzeRecord(liter, title):
</span><ins>+ """
+ Analyze one entry from the readStats data file.
</ins><span class="cx">
</span><ins>+ @param liter: iterator over lines in the file
+ @type liter: L{iter}
+ @param title: title to use for data set
+ @type title: L{str}
+ """
+
</ins><span class="cx"> dt = liter.next()
</span><span class="cx"> time = dt[11:]
</span><span class="cx"> seconds = 60 * (60 * int(time[0:2]) + int(time[3:5])) + int(time[6:8])
</span><span class="lines">@@ -49,8 +65,15 @@
</span><span class="cx"> dataset[title][seconds].update(methods)
</span><span class="cx"> break
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def parseOverall(line):
</span><ins>+ """
+ Parse the "Overall:" stats summary line.
</ins><span class="cx">
</span><ins>+ @param line: the line to parse
+ @type line: L{str}
+ """
+
</ins><span class="cx"> splits = line.split("|")
</span><span class="cx"> overall = {}
</span><span class="cx"> keys = (
</span><span class="lines">@@ -73,7 +96,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def parseMethods(liter):
</span><ins>+ """
+ Parse the "Method Count" table from a data file entry.
</ins><span class="cx">
</span><ins>+ @param liter: iterator over lines in the file
+ @type liter: L{iter}
+ """
+
</ins><span class="cx"> while liter.next()[1] != "-":
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="lines">@@ -97,17 +126,24 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def plotSeries(key, ymin=None, ymax=None):
</span><ins>+ """
+ Plot the chosen dataset key for each scanned data file.
</ins><span class="cx">
</span><ins>+ @param key: data set key to use
+ @type key: L{str}
+ @param ymin: minimum value for y-axis or L{None} for default
+ @type ymin: L{int} or L{float}
+ @param ymax: maximum value for y-axis or L{None} for default
+ @type ymax: L{int} or L{float}
+ """
</ins><span class="cx">
</span><del>- color = iter(("b+", "r+", "g+",))
- for _ignore_title, data in sorted(dataset.items(), key=lambda x: x[0]):
- x1, y1 = zip(*[(k / 3600.0, v[key]) for k, v in sorted(data.items(), key=lambda x: x[0]) if key in v])
</del><ins>+ titles = []
+ for title, data in sorted(dataset.items(), key=lambda x: x[0]):
+ titles.append(title)
+ x, y = zip(*[(k / 3600.0, v[key]) for k, v in sorted(data.items(), key=lambda x: x[0]) if key in v])
</ins><span class="cx">
</span><del>- # print("".join(["{}\t{}\n".format(x, y) for x, y in zip(x1, y1)]))
-
- plt.plot(x1, y1, color.next())
</del><ins>+ plt.plot(x, y)
</ins><span class="cx">
</span><del>- #plt.legend((key,), 'upper left', shadow=True, fancybox=True)
</del><span class="cx"> plt.xlabel("Hours")
</span><span class="cx"> plt.ylabel(key)
</span><span class="cx"> plt.xlim(0, 24)
</span><span class="lines">@@ -119,6 +155,7 @@
</span><span class="cx"> (1, 4, 7, 10, 13, 16, 19, 22,),
</span><span class="cx"> (18, 21, 0, 3, 6, 9, 12, 15,),
</span><span class="cx"> )
</span><ins>+ plt.legend(titles, 'upper left', shadow=True, fancybox=True)
</ins><span class="cx"> plt.show()
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -161,6 +198,7 @@
</span><span class="cx">
</span><span class="cx"> pwd = os.getcwd()
</span><span class="cx">
</span><ins>+ # Scan data directory and read in data from each file found
</ins><span class="cx"> fnames = os.listdir(scanDir)
</span><span class="cx"> count = 1
</span><span class="cx"> for name in fnames:
</span><span class="lines">@@ -173,6 +211,8 @@
</span><span class="cx"> analyze(os.path.join(scanDir, name), trailer)
</span><span class="cx"> count += 1
</span><span class="cx">
</span><ins>+ # Build the set of data set keys that can be plotted and let the user
+ # choose which one
</ins><span class="cx"> keys = set()
</span><span class="cx"> for data in dataset.values():
</span><span class="cx"> for items in data.values():
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2twistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/stdconfig.py (13769 => 13770)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/stdconfig.py 2014-07-17 02:05:24 UTC (rev 13769)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/stdconfig.py 2014-07-17 18:54:14 UTC (rev 13770)
</span><span class="lines">@@ -1078,7 +1078,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> "GroupAttendees" : {
</span><del>- "Enabled": False,
</del><ins>+ "Enabled": True,
</ins><span class="cx"> "ReconciliationDelaySeconds" : 5,
</span><span class="cx"> "UpdateOldEventLimitSeconds" : 1 * 24 * 60 * 60, # 1 day
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>