<!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>[15253] twext/trunk/twext</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/15253">15253</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-30 07:40:20 -0700 (Fri, 30 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>M<erge thread deadlock fix from PyPy branch to trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextenterpriseadbapi2py">twext/trunk/twext/enterprise/adbapi2.py</a></li>
<li><a href="#twexttrunktwextenterprisefixturespy">twext/trunk/twext/enterprise/fixtures.py</a></li>
<li><a href="#twexttrunktwextenterprisejobstesttest_jobspy">twext/trunk/twext/enterprise/jobs/test/test_jobs.py</a></li>
<li><a href="#twexttrunktwextinternetthreadutilspy">twext/trunk/twext/internet/threadutils.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextenterpriseadbapi2py"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/adbapi2.py (15252 => 15253)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/adbapi2.py 2015-10-29 19:04:13 UTC (rev 15252)
+++ twext/trunk/twext/enterprise/adbapi2.py 2015-10-30 14:40:20 UTC (rev 15253)
</span><span class="lines">@@ -751,6 +751,7 @@
</span><span class="cx"> """
</span><span class="cx"> spooledBase = self._baseTxn
</span><span class="cx"> self._baseTxn = baseTxn
</span><ins>+ self._baseTxn._label = self._label
</ins><span class="cx"> spooledBase._unspool(baseTxn)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1046,6 +1047,7 @@
</span><span class="cx"> def _reallyClose():
</span><span class="cx"> if self._connection:
</span><span class="cx"> self._connection.close()
</span><ins>+ self._connection = None
</ins><span class="cx">
</span><span class="cx"> self._holder.submit(_reallyClose)
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextenterprisefixturespy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/fixtures.py (15252 => 15253)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/fixtures.py 2015-10-29 19:04:13 UTC (rev 15252)
+++ twext/trunk/twext/enterprise/fixtures.py 2015-10-30 14:40:20 UTC (rev 15253)
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx"> from zope.interface.verify import verifyClass
</span><span class="cx">
</span><span class="cx"> from twisted.internet.interfaces import IReactorThreads
</span><ins>+from twisted.internet.defer import Deferred
+from twisted.internet.task import Clock
</ins><span class="cx"> from twisted.python.threadpool import ThreadPool
</span><span class="cx">
</span><del>-from twisted.internet.task import Clock
-
</del><span class="cx"> from twext.enterprise.adbapi2 import ConnectionPool
</span><span class="cx"> from twext.enterprise.ienterprise import SQLITE_DIALECT
</span><span class="cx"> from twext.enterprise.ienterprise import POSTGRES_DIALECT
</span><span class="lines">@@ -118,6 +118,10 @@
</span><span class="cx"> return super(FakeThreadHolder, self).start()
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def retry(self):
+ pass
+
+
</ins><span class="cx"> def stop(self):
</span><span class="cx"> result = super(FakeThreadHolder, self).stop()
</span><span class="cx"> self.stopped = True
</span><span class="lines">@@ -147,6 +151,10 @@
</span><span class="cx"> self._q_ = newq
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def callLater(self, f, *a, **k):
+ return Deferred()
+
+
</ins><span class="cx"> def callFromThread(self, f, *a, **k):
</span><span class="cx"> result = f(*a, **k)
</span><span class="cx"> return result
</span></span></pre></div>
<a id="twexttrunktwextenterprisejobstesttest_jobspy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/jobs/test/test_jobs.py (15252 => 15253)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/jobs/test/test_jobs.py 2015-10-29 19:04:13 UTC (rev 15252)
+++ twext/trunk/twext/enterprise/jobs/test/test_jobs.py 2015-10-30 14:40:20 UTC (rev 15253)
</span><span class="lines">@@ -1655,7 +1655,8 @@
</span><span class="cx"> @transactionally(self.store.newTransaction)
</span><span class="cx"> def _enqueue(txn):
</span><span class="cx"> return txn.enqueue(
</span><del>- DummyWorkPauseItem, a=30, b=40, workID=1
</del><ins>+ DummyWorkPauseItem, a=30, b=40, workID=1,
+ notBefore=datetime.datetime.utcnow() + datetime.timedelta(seconds=1)
</ins><span class="cx"> )
</span><span class="cx"> yield _enqueue
</span><span class="cx">
</span><span class="lines">@@ -1740,7 +1741,8 @@
</span><span class="cx"> @transactionally(self.store.newTransaction)
</span><span class="cx"> def _enqueue(txn):
</span><span class="cx"> return txn.enqueue(
</span><del>- DummyWorkPauseItem, a=30, b=40, workID=1
</del><ins>+ DummyWorkPauseItem, a=30, b=40, workID=1,
+ notBefore=datetime.datetime.utcnow() + datetime.timedelta(seconds=1)
</ins><span class="cx"> )
</span><span class="cx"> yield _enqueue
</span><span class="cx">
</span><span class="lines">@@ -1810,7 +1812,8 @@
</span><span class="cx"> @transactionally(self.store.newTransaction)
</span><span class="cx"> def _enqueue(txn):
</span><span class="cx"> return txn.enqueue(
</span><del>- DummyWorkPauseItem, a=30, b=40, workID=1
</del><ins>+ DummyWorkPauseItem, a=30, b=40, workID=1,
+ notBefore=datetime.datetime.utcnow() + datetime.timedelta(seconds=1)
</ins><span class="cx"> )
</span><span class="cx"> yield _enqueue
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextinternetthreadutilspy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/internet/threadutils.py (15252 => 15253)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/internet/threadutils.py 2015-10-29 19:04:13 UTC (rev 15252)
+++ twext/trunk/twext/internet/threadutils.py 2015-10-30 14:40:20 UTC (rev 15253)
</span><span class="lines">@@ -24,9 +24,10 @@
</span><span class="cx">
</span><span class="cx"> _DONE = object()
</span><span class="cx">
</span><del>-_STATE_STOPPED = 'STOPPED'
</del><ins>+_STATE_STARTING = 'STARTING'
</ins><span class="cx"> _STATE_RUNNING = 'RUNNING'
</span><span class="cx"> _STATE_STOPPING = 'STOPPING'
</span><ins>+_STATE_STOPPED = 'STOPPED'
</ins><span class="cx">
</span><span class="cx"> class ThreadHolder(object):
</span><span class="cx"> """
</span><span class="lines">@@ -39,12 +40,14 @@
</span><span class="cx"> self._state = _STATE_STOPPED
</span><span class="cx"> self._stopper = None
</span><span class="cx"> self._q = None
</span><ins>+ self._retryCallback = None
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _run(self):
</span><span class="cx"> """
</span><span class="cx"> Worker function which runs in a non-reactor thread.
</span><span class="cx"> """
</span><ins>+ self._state = _STATE_RUNNING
</ins><span class="cx"> while self._qpull():
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="lines">@@ -90,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> @return: L{Deferred} that fires with the result of L{work}
</span><span class="cx"> """
</span><del>- if self._state != _STATE_RUNNING:
</del><ins>+ if self._state not in (_STATE_RUNNING, _STATE_STARTING):
</ins><span class="cx"> raise RuntimeError("not running")
</span><span class="cx"> d = Deferred()
</span><span class="cx"> self._q.put((d, work))
</span><span class="lines">@@ -103,18 +106,31 @@
</span><span class="cx"> """
</span><span class="cx"> if self._state != _STATE_STOPPED:
</span><span class="cx"> raise RuntimeError("Not stopped.")
</span><del>- self._state = _STATE_RUNNING
</del><ins>+ self._state = _STATE_STARTING
</ins><span class="cx"> self._q = Queue(0)
</span><span class="cx"> self._reactor.callInThread(self._run)
</span><ins>+ self.retry()
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ def retry(self):
+ if self._state == _STATE_STARTING:
+ if self._retryCallback is not None:
+ self._reactor.threadpool._startSomeWorkers()
+ self._retryCallback = self._reactor.callLater(0.1, self.retry)
+ else:
+ self._retryCallback = None
+
+
</ins><span class="cx"> def stop(self):
</span><span class="cx"> """
</span><span class="cx"> Stop this thing and release its thread, if it's running.
</span><span class="cx"> """
</span><del>- if self._state != _STATE_RUNNING:
</del><ins>+ if self._state not in (_STATE_RUNNING, _STATE_STARTING):
</ins><span class="cx"> raise RuntimeError("Not running.")
</span><span class="cx"> s = self._stopper = Deferred()
</span><span class="cx"> self._state = _STATE_STOPPING
</span><span class="cx"> self._q.put(_DONE)
</span><ins>+ if self._retryCallback:
+ self._retryCallback.cancel()
+ self._retryCallback = None
</ins><span class="cx"> return s
</span></span></pre>
</div>
</div>
</body>
</html>