Scheduler: simplify _terminate_tasks

This should also fix bugs related to CompositeTask instances waiting
for queued tasks to start and not being properly terminated in this
case.

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 2574d3de4994554a13a9e56c7dc99aace02d3d6f..1b3a03421aaa6e309b05dad221ba41964b747140 100644 (file)
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -229,7 +229,7 @@ class Scheduler(PollScheduler):
 
                self._prefetchers = weakref.WeakValueDictionary()
                self._pkg_queue = []
-               self._running_tasks = set()
+               self._running_tasks = {}
                self._completed_tasks = set()
 
                self._failed_pkgs = []
@@ -291,20 +291,9 @@ class Scheduler(PollScheduler):
 
        def _terminate_tasks(self):
                self._status_display.quiet = True
-               # Remove running_tasks that have been added to queues but
-               # haven't been started yet, since we're going to discard
-               # them and their start/exit handlers won't be called.
-               for build in self._task_queues.jobs._task_queue:
-                       self._running_tasks.remove(build.pkg)
-               if self._merge_wait_queue:
-                       for merge in self._merge_wait_queue:
-                               self._running_tasks.remove(merge.merge.pkg)
-                       self._merge_wait_queue.clear()
-               for merge in self._task_queues.merge._task_queue:
-                       # Setup phases may be scheduled in this queue, but
-                       # we're only interested in the PackageMerge instances.
-                       if isinstance(merge, PackageMerge):
-                               self._running_tasks.remove(merge.merge.pkg)
+               while self._running_tasks:
+                       task_id, task = self._running_tasks.popitem()
+                       task.cancel()
                for q in self._task_queues.values():
                        q.clear()
 
@@ -1311,6 +1300,7 @@ class Scheduler(PollScheduler):
                self._merge_exit(task)
 
        def _merge_exit(self, merge):
+               self._running_tasks.pop(id(merge), None)
                self._do_merge_exit(merge)
                self._deallocate_config(merge.merge.settings)
                if merge.returncode == os.EX_OK and \
@@ -1321,7 +1311,6 @@ class Scheduler(PollScheduler):
 
        def _do_merge_exit(self, merge):
                pkg = merge.merge.pkg
-               self._running_tasks.remove(pkg)
                if merge.returncode != os.EX_OK:
                        settings = merge.merge.settings
                        build_dir = settings.get("PORTAGE_BUILDDIR")
@@ -1366,15 +1355,16 @@ class Scheduler(PollScheduler):
                mtimedb.commit()
 
        def _build_exit(self, build):
+               self._running_tasks.pop(id(build), None)
                if build.returncode == os.EX_OK and self._terminated_tasks:
                        # We've been interrupted, so we won't
                        # add this to the merge queue.
                        self.curval += 1
-                       self._running_tasks.remove(build.pkg)
                        self._deallocate_config(build.settings)
                elif build.returncode == os.EX_OK:
                        self.curval += 1
                        merge = PackageMerge(merge=build)
+                       self._running_tasks[id(merge)] = merge
                        if not build.build_opts.buildpkgonly and \
                                build.pkg in self._deep_system_deps:
                                # Since dependencies on system packages are frequently
@@ -1386,7 +1376,6 @@ class Scheduler(PollScheduler):
                                self._task_queues.merge.add(merge)
                                self._status_display.merges = len(self._task_queues.merge)
                else:
-                       self._running_tasks.remove(build.pkg)
                        settings = build.settings
                        build_dir = settings.get("PORTAGE_BUILDDIR")
                        build_log = settings.get("PORTAGE_LOG_FILE")
@@ -1672,7 +1661,7 @@ class Scheduler(PollScheduler):
                                self._pkg_count.curval += 1
 
                        task = self._task(pkg)
-                       self._running_tasks.add(pkg)
+                       self._running_tasks[id(task)] = task
 
                        if pkg.installed:
                                merge = PackageMerge(merge=task)