[PATCH 2/3] isar-events: Improve umount handler

[Jan Kiszka <jan.kiszka@siemens.com>]

From: Jan Kiszka <jan.kiszka@siemens.com>

Using lazy umount avoids having to loop over the mount points.
Furthermore, also triggering on runQueueExitWait allows to perform the
umount earlier. Finally, filter for the events we actually want.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/isar-events.bbclass | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass
index b3ce434..05b27e5 100644
--- a/meta/classes/isar-events.bbclass
+++ b/meta/classes/isar-events.bbclass
@@ -6,34 +6,22 @@
 
 addhandler isar_handler
 
-python isar_handler () {
+python isar_handler() {
     import subprocess
-    import time
+    import bb.runqueue
 
-    def umount_all(basepath):
-        # '/proc/mounts' contains all the active mounts, so knowing basepath
-        # we can get the list of mounts for the specific multiconfig and
-        # clean them.
-        result = True
+    tmpdir = d.getVar('TMPDIR', True)
+    if not tmpdir:
+        return
+
+    basepath = tmpdir + '/work/'
+
+    with open(os.devnull, 'w') as devnull:
         with open('/proc/mounts', 'rU') as f:
             for line in f:
                 if basepath in line:
-                    if subprocess.call('sudo umount ' + line.split()[1],
-                                       stdout=devnull, stderr=devnull,
-                                       shell=True) != 0:
-                        result = False
-        return result
-
-    devnull = open(os.devnull, 'w')
-
-    if isinstance(e, bb.event.BuildCompleted):
-        tmpdir = d.getVar('TMPDIR', True)
-
-        if tmpdir:
-            basepath = tmpdir + '/work/'
-
-            while not umount_all(basepath):
-                time.sleep(1)
-
-    devnull.close()
+                    subprocess.call('sudo umount -l ' + line.split()[1],
+                                    stdout=devnull, stderr=devnull, shell=True)
 }
+
+isar_handler[eventmask] = "bb.runqueue.runQueueExitWait bb.event.BuildCompleted"
-- 
2.16.4