Forcefully terminate

jenshnielsen · jenshnielsen · commit ebee64b85e62 · 2014-10-29T23:01:45.000Z
If process did not return within 5 sec assume that it is hanging and forcefully terminate
diff --git a/setupext.py b/setupext.py
@@ -1788,17 +1788,26 @@ def check_requirements(self):
         except:
             return "unknown (can not use multiprocessing to determine)"
         try:
-             res = p.map_async(backend_gtk3agg_internal_check, [0])
-             success, msg = res.get(timeout=5)[0]
+            res = p.map_async(backend_gtk3agg_internal_check, [0])
+            success, msg = res.get(timeout=5)[0]
+        except Queue.Empty:
+            p.terminate()
+            # No result returned. Probaly hanging, terminate the process.
+            success = False
+            raise
         except:
+            p.close()
+            # Some other error.
             success = False
             msg = "Could not determine"
-        finally:
+            raise
+        else:
             p.close()
+        finally:
             p.join()
+
         if success:
             BackendAgg.force = True
-
             return msg
         else:
             raise CheckFailed(msg)
@@ -1856,15 +1865,22 @@ def check_requirements(self):
         try:
             res = p.map_async(backend_gtk3cairo_internal_check, [0])
             success, msg = res.get(timeout=5)[0]
+        except Queue.Empty:
+            p.terminate()
+            # No result returned. Probaly hanging, terminate the process.
+            success = False
+            raise
         except:
+            p.close()
             success = False
             raise
-        finally:
+        else:
             p.close()
+        finally:
             p.join()
+
         if success:
             BackendAgg.force = True
-
             return msg
         else:
             raise CheckFailed(msg)
@@ -1997,12 +2013,19 @@ def check_requirements(self):
             try:
                 res = p.map_async(self.callback, [self])
                 msg = res.get(timeout=5)[0]
+            except Queue.Empty:
+                p.terminate()
+                # No result returned. Probaly hanging, terminate the process.
+                raise
             except:
-                # If we hit an error on multiprocessing raise it
+                # Some other error.
+                p.close()
                 raise
+            else:
+                # Clean exit
+                p.close()
             finally:
                 # Tidy up multiprocessing
-                p.close()
                 p.join()
 
         return msg
