diff options
| author | Tristan Maat <tristan.maat@codethink.co.uk> | 2019-11-18 13:40:36 +0000 |
|---|---|---|
| committer | Tristan Maat <tristan.maat@codethink.co.uk> | 2019-11-22 11:41:31 +0000 |
| commit | aa25f6fcf49f0015fae34dfd79b4626a816bf886 (patch) | |
| tree | 71b2f8604f40abfe90f28cc35a1c7a1423327922 | |
| parent | 14e32a34f67df754d9146efafe9686bfe6c91e50 (diff) | |
| download | buildstream-aa25f6fcf49f0015fae34dfd79b4626a816bf886.tar.gz | |
Simplify queue management
| -rw-r--r-- | src/buildstream/_scheduler/queues/queue.py | 7 | ||||
| -rw-r--r-- | src/buildstream/_stream.py | 12 |
2 files changed, 4 insertions, 15 deletions
diff --git a/src/buildstream/_scheduler/queues/queue.py b/src/buildstream/_scheduler/queues/queue.py index 0dfc06d58..295161ed2 100644 --- a/src/buildstream/_scheduler/queues/queue.py +++ b/src/buildstream/_scheduler/queues/queue.py @@ -238,13 +238,6 @@ class Queue: for element in ready ] - # set_required_element_check() - # - # This ensures that, for the first non-track queue, we must check - # whether elements are required before enqueuing them - def set_required_element_check(self): - self._required_element_check = True - # any_failed_elements() # # Returns whether any elements in this queue have failed their jobs diff --git a/src/buildstream/_stream.py b/src/buildstream/_stream.py index 0ce2bbf11..e02cddb63 100644 --- a/src/buildstream/_stream.py +++ b/src/buildstream/_stream.py @@ -376,8 +376,8 @@ class Stream: self._scheduler.clear_queues() track_queue = TrackQueue(self._scheduler) - self._add_queue(track_queue, track=True) - self._enqueue_plan(elements, queue=track_queue) + self._add_queue(track_queue) + self._enqueue_plan(elements) self._run() # pull() @@ -1287,11 +1287,8 @@ class Stream: # queue (Queue): Queue to add to the pipeline # track (bool): Whether this is the tracking queue # - def _add_queue(self, queue, *, track=False): + def _add_queue(self, queue): self.queues.append(queue) - if not (track or self._first_non_track_queue): - self._first_non_track_queue = queue - self._first_non_track_queue.set_required_element_check() # _enqueue_plan() # @@ -1302,8 +1299,7 @@ class Stream: # queue (Queue): The target queue, defaults to the first non-track queue # def _enqueue_plan(self, plan, *, queue=None): - queue = queue or self._first_non_track_queue - + queue = queue or self.queues[0] queue.enqueue(plan) self.session_elements += plan |