aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2021-07-15 20:29:25 +0200
committerDimitri Staessens <dimitri@ouroboros.rocks>2021-07-15 20:29:25 +0200
commit63571bf5567ef22c88d1c29dcfe41f263db8e063 (patch)
treee82cb968eb86d4b6b37534d58d0499f49f3ef843
parent345a65fc563332289b2e997febddff8ac0612457 (diff)
downloadrumba-63571bf5567ef22c88d1c29dcfe41f263db8e063.zip
rumba-63571bf5567ef22c88d1c29dcfe41f263db8e063.tar.gz
prototypes: More robust termination of Ouroboros
In case of dumpsterfire, exp.terminate_prototype(force=True) will now wipe the prototype Ouroboros completely.
-rw-r--r--rumba/prototypes/ouroboros.py19
1 files 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: