From 63571bf5567ef22c88d1c29dcfe41f263db8e063 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Thu, 15 Jul 2021 20:29:25 +0200 Subject: prototypes: More robust termination of Ouroboros In case of dumpsterfire, exp.terminate_prototype(force=True) will now wipe the prototype Ouroboros completely. --- rumba/prototypes/ouroboros.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py index eb6a230..926c822 100644 --- a/rumba/prototypes/ouroboros.py +++ b/rumba/prototypes/ouroboros.py @@ -415,7 +415,7 @@ class Experiment(mod.Experiment): logger.info("Enrolling IPCPs...") for enrolls, flows in zip(self.enrollments, - self.flows): + self.flows): self.enroll_dif(enrolls) self.setup_flows(flows) @@ -427,9 +427,22 @@ class Experiment(mod.Experiment): if force is True: kill = 'killall -9 ' cmds.append(kill + 'irmd') - cmds.append(kill + 'ipcpd-normal') - cmds.append(kill + 'ipcpd-shim-eth-llc') + cmds.append(kill + 'ipcpd-unicast') + cmds.append(kill + 'ipcpd-broadcast') + cmds.append(kill + 'ipcpd-eth-llc') + cmds.append(kill + 'ipcpd-eth-dix') + cmds.append(kill + 'ipcpd-udp') cmds.append(kill + 'ipcpd-local') + cmds.append(kill + 'ocbr') + cmds.append(kill + 'oping') + cmds.append(kill + 'operf') + cmds.append(kill + 'oecho') + cmds.append(kill + 'ioquake3.x86_64') + cmds.append(kill + 'ioq3ded.x86_64') + cmds.append(kill + 'ouroborosio') + cmds.append('rm -rf /dev/shm/ouroboros.*') + cmds.append('for i in /tmp/ouroboros/*; do fusermount -u $i; rmdir $i; done') + cmds.append('rm -rf /tmp/ouroboros') cmds.append('kill -9 $(ps axjf | grep \'sudo irmd\' ' '| grep -v grep | cut -f4 -d " "') else: -- cgit v1.2.3