diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-10-07 19:30:51 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-10-07 19:30:51 -0700 |
commit | 00d168d306635ab407dec3db50dd36e99bb44375 (patch) | |
tree | 93b43af2086481ae9d0de13f16877c7b317e0923 /pym/_emerge | |
parent | 83577043ac769db95e490ef180de14d01072f13a (diff) | |
download | portage-00d168d306635ab407dec3db50dd36e99bb44375.tar.gz portage-00d168d306635ab407dec3db50dd36e99bb44375.tar.bz2 portage-00d168d306635ab407dec3db50dd36e99bb44375.zip |
PollScheduler: rename sched_iface to _sched_iface
It isn't used externally anymore, since SchedulerInterface is used
directly in those places now. Many of the self.sched_iface references
updated here, it's more appropriate to use self._event_loop.
Diffstat (limited to 'pym/_emerge')
-rw-r--r-- | pym/_emerge/PollScheduler.py | 2 | ||||
-rw-r--r-- | pym/_emerge/Scheduler.py | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py index 8d5c290d7..1a81e2d17 100644 --- a/pym/_emerge/PollScheduler.py +++ b/pym/_emerge/PollScheduler.py @@ -36,7 +36,7 @@ class PollScheduler(object): self._event_loop = global_event_loop() else: self._event_loop = EventLoop(main=False) - self.sched_iface = SchedulerInterface(self._event_loop, + self._sched_iface = SchedulerInterface(self._event_loop, is_background=self._is_background) def _is_background(self): diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index d64468af0..40033c2c3 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -1337,12 +1337,12 @@ class Scheduler(PollScheduler): blocker_db.discardBlocker(pkg) def _main_loop(self): - term_check_id = self.sched_iface.idle_add(self._termination_check) + term_check_id = self._event_loop.idle_add(self._termination_check) loadavg_check_id = None if self._max_load is not None: # We have to schedule periodically, in case the load # average has changed since the last call. - loadavg_check_id = self.sched_iface.timeout_add( + loadavg_check_id = self._event_loop.timeout_add( self._loadavg_latency, self._schedule) try: @@ -1354,17 +1354,17 @@ class Scheduler(PollScheduler): # Loop while there are jobs to be scheduled. while self._keep_scheduling(): - self.sched_iface.iteration() + self._event_loop.iteration() # Clean shutdown of previously scheduled jobs. In the # case of termination, this allows for basic cleanup # such as flushing of buffered output to logs. while self._is_work_scheduled(): - self.sched_iface.iteration() + self._event_loop.iteration() finally: - self.sched_iface.source_remove(term_check_id) + self._event_loop.source_remove(term_check_id) if loadavg_check_id is not None: - self.sched_iface.source_remove(loadavg_check_id) + self._event_loop.source_remove(loadavg_check_id) def _merge(self): @@ -1378,7 +1378,7 @@ class Scheduler(PollScheduler): portage.elog.add_listener(self._elog_listener) display_timeout_id = None if self._status_display._isatty and not self._status_display.quiet: - display_timeout_id = self.sched_iface.timeout_add( + display_timeout_id = self._event_loop.timeout_add( self._max_display_latency, self._status_display.display) rval = os.EX_OK @@ -1389,7 +1389,7 @@ class Scheduler(PollScheduler): portage.locks._quiet = False portage.elog.remove_listener(self._elog_listener) if display_timeout_id is not None: - self.sched_iface.source_remove(display_timeout_id) + self._event_loop.source_remove(display_timeout_id) if failed_pkgs: rval = failed_pkgs[-1].returncode |