<!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>[12237] twext/trunk/twext/application/masterchild.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/12237">12237</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-03 15:33:05 -0800 (Fri, 03 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Span more children as needed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextapplicationmasterchildpy">twext/trunk/twext/application/masterchild.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextapplicationmasterchildpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/application/masterchild.py (12236 => 12237)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/application/masterchild.py 2014-01-03 22:12:36 UTC (rev 12236)
+++ twext/trunk/twext/application/masterchild.py 2014-01-03 23:33:05 UTC (rev 12237)
</span><span class="lines">@@ -327,14 +327,24 @@
</span><span class="cx"> pluginName = b"child"
</span><span class="cx">
</span><span class="cx">
</span><del>- def __init__(self, dispatcher, maxProcessCount=8):
</del><ins>+ def __init__(
+ self, dispatcher, maxProcessCount=8, highWaterMark=3
+ ):
</ins><span class="cx"> """
</span><del>- @param protocol: The name of the protocol for the child to use
- to handle connections.
- @type protocol: L{str} naming an L{IProtocol} implementer.
</del><ins>+ @param dispatcher: The dispatcher managing inbound connections.
+ @type dispatcher: L{InheritedSocketDispatcher}
+
+ @param maxProcessCount: The maximum number of child processes that may
+ be spawned.
+ @type maxProcessCount: L{int}
+
+ @param highWaterMark: The high-end number of connections that each
+ process should be given before new processes should be spawned.
+ @type highWaterMark: L{int}
</ins><span class="cx"> """
</span><span class="cx"> self.dispatcher = dispatcher
</span><span class="cx"> self.maxProcessCount = maxProcessCount
</span><ins>+ self.highWaterMark = highWaterMark
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def startService(self):
</span><span class="lines">@@ -347,16 +357,44 @@
</span><span class="cx"> del(self.children)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def totalEffectiveLoad(self):
+ """
+ Compute the sum of the effective load of all child process.
+
+ @return: The total effective load accross all processes.
+ @rtype: L{float}
+ """
+ return sum(s.effectiveLoad() for s in self.dispatcher.statuses)
+
+
</ins><span class="cx"> def socketWillArriveForProtocol(self, protocolName):
</span><span class="cx"> """
</span><span class="cx"> This method is where this service makes sure that there are
</span><span class="cx"> sufficient child processes available to handle additional
</span><span class="cx"> connections.
</span><span class="cx"> """
</span><del>- if len(self.children) == 0:
</del><ins>+ numChildren = len(self.children)
+
+ if numChildren == 0:
+ self.log.info("Spawning first child.")
</ins><span class="cx"> self.spawnChild(protocolName)
</span><ins>+ return
</ins><span class="cx">
</span><ins>+ totalLoad = self.totalEffectiveLoad()
+ averageLoad = float(totalLoad) / float(numChildren)
</ins><span class="cx">
</span><ins>+ # self.log.info(
+ # "Load: {totalLoad} / {childCount} = {averageLoad}",
+ # totalLoad=totalLoad,
+ # childCount=numChildren,
+ # averageLoad=averageLoad,
+ # )
+
+ if averageLoad >= self.highWaterMark:
+ if numChildren < self.maxProcessCount:
+ self.spawnChild(protocolName)
+
+
</ins><span class="cx"> def spawnChild(self, protocolName):
</span><span class="cx"> """
</span><span class="cx"> Spawn a child process to handle connections.
</span></span></pre>
</div>
</div>
</body>
</html>