Disable auto_schedule on all of Scheduler._task_queues and schedule them

inside _schedule_tasks(). This should help solve a tight loop.

svn path=/main/trunk/; revision=11269

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 6951590dbcfca2663839593550f63b0282b11344..3fee85d0319912e61f2de42e73fc5959b8b06d45 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8826,13 +8826,7 @@ class Scheduler(PollScheduler):
                self._task_queues = self._task_queues_class()
                for k in self._task_queues.allowed_keys:
                        setattr(self._task_queues, k,
-                               SequentialTaskQueue(auto_schedule=True))
-
-               # Merge tasks currently run synchronously which makes
-               # it necessary to disable auto_schedule in order to
-               # avoid excess recursion which prevents tasks from
-               # being marked complete as soon as they should be.
-               self._task_queues.merge.auto_schedule = False
+                               SequentialTaskQueue())
 
                self._prefetchers = weakref.WeakValueDictionary()
                self._pkg_queue = []
@@ -9654,7 +9648,9 @@ class Scheduler(PollScheduler):
                        self._poll_loop()
 
        def _schedule_tasks(self):
-               self._task_queues.merge.schedule()
+               remaining, state_change = self._schedule_tasks_imp()
+               for q in self._task_queues.values():
+                       q.schedule()
 
                # Cancel prefetchers if they're the only reason
                # the main poll loop is still running.