diff options
| author | Tom Pollard <tom.pollard@codethink.co.uk> | 2019-06-13 12:41:00 +0100 |
|---|---|---|
| committer | Tom Pollard <tom.pollard@codethink.co.uk> | 2019-06-13 12:41:00 +0100 |
| commit | f9c0ca3ed8bc87c77eed24e49c3f6fc28d2d487b (patch) | |
| tree | 48fc1329367377bd03f9dedc4e73813aa6a2cd1a | |
| parent | 147190b6dc5094cdc550e1250c5bda027796b0d9 (diff) | |
| download | buildstream-tpollard/elapsedtime.tar.gz | |
_scheduler/scheduler.py: Remove unused elapsed_time() callstpollard/elapsedtime
Both run() and the App callback _ticker_callback() call & return
elapsed_time(), which is the unused by the respective callers and
as such is unnecessary.
| -rw-r--r-- | src/buildstream/_frontend/app.py | 2 | ||||
| -rw-r--r-- | src/buildstream/_scheduler/scheduler.py | 7 | ||||
| -rw-r--r-- | src/buildstream/_stream.py | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/buildstream/_frontend/app.py b/src/buildstream/_frontend/app.py index 7aff52af6..a9dd46b34 100644 --- a/src/buildstream/_frontend/app.py +++ b/src/buildstream/_frontend/app.py @@ -513,7 +513,7 @@ class App(): elif choice == 'continue': click.echo("\nContinuing\n", err=True) - def _tick(self, elapsed): + def _tick(self): self._maybe_render_status() def _job_started(self, job): diff --git a/src/buildstream/_scheduler/scheduler.py b/src/buildstream/_scheduler/scheduler.py index da3016b59..0ee629338 100644 --- a/src/buildstream/_scheduler/scheduler.py +++ b/src/buildstream/_scheduler/scheduler.py @@ -126,8 +126,6 @@ class Scheduler(): # queues (list): A list of Queue objects # # Returns: - # (timedelta): The amount of time since the start of the session, - # discounting any time spent while jobs were suspended # (SchedStatus): How the scheduling terminated # # Elements in the 'plan' will be processed by each @@ -175,7 +173,7 @@ class Scheduler(): else: status = SchedStatus.SUCCESS - return self.elapsed_time(), status + return status # terminate_jobs() # @@ -597,6 +595,5 @@ class Scheduler(): # Regular timeout for driving status in the UI def _tick(self): - elapsed = self.elapsed_time() - self._ticker_callback(elapsed) + self._ticker_callback() self.loop.call_later(1, self._tick) diff --git a/src/buildstream/_stream.py b/src/buildstream/_stream.py index 537671679..76a6ba1c0 100644 --- a/src/buildstream/_stream.py +++ b/src/buildstream/_stream.py @@ -1210,7 +1210,7 @@ class Stream(): if self._session_start_callback is not None: self._session_start_callback() - _, status = self._scheduler.run(self.queues) + status = self._scheduler.run(self.queues) if status == SchedStatus.ERROR: raise StreamError() |