| 1 |
commit: 618ad1f92b6f768e5cc2f783cd1756ffe65b3fef |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 8 04:35:36 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 8 04:35:36 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=618ad1f9 |
| 7 |
|
| 8 |
PollScheduler: remove _schedule_wait |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/PollScheduler.py | 48 +----------------------------------------- |
| 12 |
pym/_emerge/Scheduler.py | 2 +- |
| 13 |
2 files changed, 2 insertions(+), 48 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py |
| 16 |
index 9ddcd96..0e510b3 100644 |
| 17 |
--- a/pym/_emerge/PollScheduler.py |
| 18 |
+++ b/pym/_emerge/PollScheduler.py |
| 19 |
@@ -62,7 +62,7 @@ class PollScheduler(object): |
| 20 |
iteration=self._iteration, |
| 21 |
output=self._task_output, |
| 22 |
register=self._register, |
| 23 |
- schedule=self._schedule_wait, |
| 24 |
+ schedule=self._poll_loop, |
| 25 |
source_remove=self._unregister, |
| 26 |
timeout_add=self._timeout_add, |
| 27 |
unregister=self._unregister) |
| 28 |
@@ -462,52 +462,6 @@ class PollScheduler(object): |
| 29 |
del self._poll_event_handlers[f] |
| 30 |
return True |
| 31 |
|
| 32 |
- def _schedule_wait(self, wait_ids=None, timeout=None, condition=None): |
| 33 |
- """ |
| 34 |
- Schedule until wait_id is not longer registered |
| 35 |
- for poll() events. |
| 36 |
- @type wait_id: int |
| 37 |
- @param wait_id: a task id to wait for |
| 38 |
- """ |
| 39 |
- event_handlers = self._poll_event_handlers |
| 40 |
- handler_ids = self._poll_event_handler_ids |
| 41 |
- event_handled = False |
| 42 |
- |
| 43 |
- if isinstance(wait_ids, int): |
| 44 |
- wait_ids = frozenset([wait_ids]) |
| 45 |
- |
| 46 |
- start_time = None |
| 47 |
- remaining_timeout = timeout |
| 48 |
- timed_out = False |
| 49 |
- if timeout is not None: |
| 50 |
- start_time = time.time() |
| 51 |
- try: |
| 52 |
- while (wait_ids is None and event_handlers) or \ |
| 53 |
- (wait_ids is not None and wait_ids.intersection(handler_ids)): |
| 54 |
- f, event = self._next_poll_event(timeout=remaining_timeout) |
| 55 |
- x = event_handlers[f] |
| 56 |
- if not x.callback(f, event, *x.args): |
| 57 |
- self._unregister(x.source_id) |
| 58 |
- event_handled = True |
| 59 |
- if condition is not None and condition(): |
| 60 |
- break |
| 61 |
- if timeout is not None: |
| 62 |
- elapsed_time = time.time() - start_time |
| 63 |
- if elapsed_time < 0: |
| 64 |
- # The system clock has changed such that start_time |
| 65 |
- # is now in the future, so just assume that the |
| 66 |
- # timeout has already elapsed. |
| 67 |
- timed_out = True |
| 68 |
- break |
| 69 |
- remaining_timeout = timeout - 1000 * elapsed_time |
| 70 |
- if remaining_timeout <= 0: |
| 71 |
- timed_out = True |
| 72 |
- break |
| 73 |
- except StopIteration: |
| 74 |
- event_handled = True |
| 75 |
- |
| 76 |
- return event_handled |
| 77 |
- |
| 78 |
def _task_output(self, msg, log_path=None, background=None, |
| 79 |
level=0, noiselevel=-1): |
| 80 |
""" |
| 81 |
|
| 82 |
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py |
| 83 |
index e22ef46..afcdda8 100644 |
| 84 |
--- a/pym/_emerge/Scheduler.py |
| 85 |
+++ b/pym/_emerge/Scheduler.py |
| 86 |
@@ -223,7 +223,7 @@ class Scheduler(PollScheduler): |
| 87 |
io_add_watch=self._register, |
| 88 |
iteration=self._iteration, |
| 89 |
register=self._register, |
| 90 |
- schedule=self._schedule_wait, |
| 91 |
+ schedule=self._poll_loop, |
| 92 |
scheduleSetup=self._schedule_setup, |
| 93 |
scheduleUnpack=self._schedule_unpack, |
| 94 |
source_remove=self._unregister, |
Archives