<p>Holger Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13088">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">process: Introduce and use an asyncio strategy for killing<br><br>Use asyncio to concurrently terminate all processes.<br><br>Change-Id: I3441e280241a5ee1404623f1f0b5faf56271227d<br>---<br>M src/osmo_gsm_tester/process.py<br>M src/osmo_gsm_tester/suite.py<br>2 files changed, 51 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/88/13088/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py</span><br><span>index bb13131..c3ca4ba 100644</span><br><span>--- a/src/osmo_gsm_tester/process.py</span><br><span>+++ b/src/osmo_gsm_tester/process.py</span><br><span>@@ -17,6 +17,7 @@</span><br><span> # You should have received a copy of the GNU General Public License</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import asyncio</span><br><span> import os</span><br><span> import time</span><br><span> import subprocess</span><br><span>@@ -118,6 +119,22 @@</span><br><span> self._poll_for_termination()</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+class AsyncioTerminationStrategy(TerminationStrategy):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Using asyncio to terminate all processes."""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # The asyncio event loop to use.</span><br><span style="color: hsl(120, 100%, 40%);">+ loop = asyncio.get_event_loop()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def terminate_all(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ # TODO(zecke): Make this use asyncio.run when moving to python 3.7.</span><br><span style="color: hsl(120, 100%, 40%);">+ self.loop.run_until_complete(self.do_terminate_all())</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log("Deletion completed")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ async def do_terminate_all(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ calls = [proc.terminate_async() for proc in self._processes]</span><br><span style="color: hsl(120, 100%, 40%);">+ await asyncio.gather(*calls)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> class Process(log.Origin):</span><br><span> </span><br><span> def __init__(self, name, run_dir, popen_args, **popen_kwargs):</span><br><span>@@ -207,6 +224,22 @@</span><br><span> time.sleep(wait_step)</span><br><span> return False</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ async def _poll_termination_async(self, time_to_wait_for_term=5):</span><br><span style="color: hsl(120, 100%, 40%);">+ wait_step = 0.001</span><br><span style="color: hsl(120, 100%, 40%);">+ waited_time = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ while True:</span><br><span style="color: hsl(120, 100%, 40%);">+ # poll returns None if proc is still running</span><br><span style="color: hsl(120, 100%, 40%);">+ self.result = self.process_obj.poll()</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.result is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ return True</span><br><span style="color: hsl(120, 100%, 40%);">+ waited_time += wait_step</span><br><span style="color: hsl(120, 100%, 40%);">+ # make wait_step approach 1.0</span><br><span style="color: hsl(120, 100%, 40%);">+ wait_step = (1. + 5. * wait_step) / 6.</span><br><span style="color: hsl(120, 100%, 40%);">+ if waited_time >= time_to_wait_for_term:</span><br><span style="color: hsl(120, 100%, 40%);">+ break</span><br><span style="color: hsl(120, 100%, 40%);">+ asyncio.sleep(wait_step)</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def send_signal(self, sig):</span><br><span> os.kill(self.process_obj.pid, sig)</span><br><span> </span><br><span>@@ -221,6 +254,22 @@</span><br><span> self.send_signal(sig)</span><br><span> self.killed = sig</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ async def terminate_async(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Terminates this process using asyncio."""</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.process_obj is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ return</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.result is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ return</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for sig in [signal.SIGTERM, signal.SIGINT, signal.SIGKILL]:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.kill(sig)</span><br><span style="color: hsl(120, 100%, 40%);">+ if sig == signal.SIGKILL:</span><br><span style="color: hsl(120, 100%, 40%);">+ continue</span><br><span style="color: hsl(120, 100%, 40%);">+ if await self._poll_termination_async():</span><br><span style="color: hsl(120, 100%, 40%);">+ break</span><br><span style="color: hsl(120, 100%, 40%);">+ self.process_obj.wait()</span><br><span style="color: hsl(120, 100%, 40%);">+ self.cleanup()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def terminate(self):</span><br><span> if self.process_obj is None:</span><br><span> return</span><br><span>@@ -240,7 +289,7 @@</span><br><span> </span><br><span> # out of patience</span><br><span> self.kill(signal.SIGKILL)</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ break</span><br><span> </span><br><span> self.process_obj.wait()</span><br><span> self.cleanup()</span><br><span>diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py</span><br><span>index 39da917..1a32963 100644</span><br><span>--- a/src/osmo_gsm_tester/suite.py</span><br><span>+++ b/src/osmo_gsm_tester/suite.py</span><br><span>@@ -246,7 +246,7 @@</span><br><span> self._processes.insert(0, (process, respawn))</span><br><span> </span><br><span> def stop_processes(self):</span><br><span style="color: hsl(0, 100%, 40%);">- strategy = process.ParallelTerminationStrategy()</span><br><span style="color: hsl(120, 100%, 40%);">+ strategy = process.AsyncioTerminationStrategy()</span><br><span> while self._processes:</span><br><span> proc, _ = self._processes.pop()</span><br><span> strategy.add_process(proc)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13088">change 13088</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13088"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I3441e280241a5ee1404623f1f0b5faf56271227d </div>
<div style="display:none"> Gerrit-Change-Number: 13088 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>