From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Ruw9H-0003Cw-VY for garchives@archives.gentoo.org; Wed, 08 Feb 2012 01:16:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80F46E073B; Wed, 8 Feb 2012 01:16:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 30F36E073B for ; Wed, 8 Feb 2012 01:16:32 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6296B1B402C for ; Wed, 8 Feb 2012 01:16:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D807880043 for ; Wed, 8 Feb 2012 01:16:30 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <610831146c27d46256df45f127474d509c9a7d31.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/AsynchronousLock.py pym/_emerge/EbuildIpcDaemon.py pym/_emerge/EbuildMetadataPhase.py pym/_emerge/PipeReader.py pym/_emerge/PollScheduler.py pym/_emerge/Scheduler.py pym/_emerge/SpawnProcess.py pym/portage/dbapi/_MergeProcess.py X-VCS-Directories: pym/portage/dbapi/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 610831146c27d46256df45f127474d509c9a7d31 Date: Wed, 8 Feb 2012 01:16:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: fab9479e-79d0-452d-a898-ed2eaa783062 X-Archives-Hash: 5765fd60537c85753c9d5d3ad74e014c commit: 610831146c27d46256df45f127474d509c9a7d31 Author: Zac Medico gentoo org> AuthorDate: Wed Feb 8 00:36:32 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Feb 8 01:15:47 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D61083114 PollScheduler: glib.io_add_watch() compatibility --- pym/_emerge/AsynchronousLock.py | 4 +++ pym/_emerge/EbuildIpcDaemon.py | 2 + pym/_emerge/EbuildMetadataPhase.py | 2 + pym/_emerge/PipeReader.py | 4 +++ pym/_emerge/PollScheduler.py | 50 ++++++++++++++++++++++++------= ----- pym/_emerge/Scheduler.py | 1 + pym/_emerge/SpawnProcess.py | 4 +++ pym/portage/dbapi/_MergeProcess.py | 2 + 8 files changed, 53 insertions(+), 16 deletions(-) diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLo= ck.py index 3593834..e166df3 100644 --- a/pym/_emerge/AsynchronousLock.py +++ b/pym/_emerge/AsynchronousLock.py @@ -143,6 +143,8 @@ class _LockThread(AbstractPollTask): self.returncode =3D os.EX_OK self.wait() =20 + return True + def _cancel(self): # There's currently no way to force thread termination. pass @@ -280,6 +282,8 @@ class _LockProcess(AbstractPollTask): self.returncode =3D os.EX_OK self.wait() =20 + return True + def _unregister(self): self._registered =3D False =20 diff --git a/pym/_emerge/EbuildIpcDaemon.py b/pym/_emerge/EbuildIpcDaemon= .py index 5dabe34..6a320cb 100644 --- a/pym/_emerge/EbuildIpcDaemon.py +++ b/pym/_emerge/EbuildIpcDaemon.py @@ -84,6 +84,8 @@ class EbuildIpcDaemon(FifoIpcDaemon): if reply_hook is not None: reply_hook() =20 + return True + def _send_reply(self, reply): # File streams are in unbuffered mode since we do atomic # read and write of whole pickles. Use non-blocking mode so diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetad= ataPhase.py index d4f5bc0..f8da866 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -128,6 +128,8 @@ class EbuildMetadataPhase(SubProcess): =20 self._unregister_if_appropriate(event) =20 + return True + def _set_returncode(self, wait_retval): SubProcess._set_returncode(self, wait_retval) # self._raw_metadata is None when _start returns diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py index 0f784cf..a85d794 100644 --- a/pym/_emerge/PipeReader.py +++ b/pym/_emerge/PipeReader.py @@ -74,6 +74,8 @@ class PipeReader(AbstractPollTask): =20 self._unregister_if_appropriate(event) =20 + return True + def _array_output_handler(self, fd, event): =20 for f in self.input_files.values(): @@ -93,6 +95,8 @@ class PipeReader(AbstractPollTask): =20 self._unregister_if_appropriate(event) =20 + return True + def _unregister(self): """ Unregister from the scheduler and close open files. diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py index 519a370..7cf8189 100644 --- a/pym/_emerge/PollScheduler.py +++ b/pym/_emerge/PollScheduler.py @@ -24,9 +24,12 @@ from _emerge.PollSelectAdapter import PollSelectAdapte= r class PollScheduler(object): =20 class _sched_iface_class(SlotObject): - __slots__ =3D ("output", "register", "schedule", + __slots__ =3D ("io_add_watch", "output", "register", "schedule", "source_remove", "timeout_add", "unregister") =20 + class _io_handler_class(SlotObject): + __slots__ =3D ("args", "callback", "fd", "source_id") + class _timeout_handler_class(SlotObject): __slots__ =3D ("args", "function", "interval", "source_id", "timestamp") @@ -49,6 +52,7 @@ class PollScheduler(object): self._scheduling =3D False self._background =3D False self.sched_iface =3D self._sched_iface_class( + io_add_watch=3Dself._register, output=3Dself._task_output, register=3Dself._register, schedule=3Dself._schedule_wait, @@ -248,8 +252,9 @@ class PollScheduler(object): try: while event_handlers: f, event =3D self._next_poll_event() - handler, reg_id =3D event_handlers[f] - handler(f, event) + x =3D event_handlers[f] + if not x.callback(f, event, *x.args): + self._unregister(x.source_id) event_handled =3D True except StopIteration: event_handled =3D True @@ -277,8 +282,9 @@ class PollScheduler(object): try: while event_handlers and self._poll_event_queue: f, event =3D self._next_poll_event() - handler, reg_id =3D event_handlers[f] - handler(f, event) + x =3D event_handlers[f] + if not x.callback(f, event, *x.args): + self._unregister(x.source_id) events_handled +=3D 1 except StopIteration: events_handled +=3D 1 @@ -332,20 +338,31 @@ class PollScheduler(object): =20 return bool(ready_timeouts) =20 - def _register(self, f, eventmask, handler): + def _register(self, f, condition, callback, *args): """ - @rtype: Integer - @return: A unique registration id, for use in schedule() or - unregister() calls. + Like glib.io_add_watch(), your function should return False to + stop being called, or True to continue being called. Any + additional positional arguments given here are passed to your + function when it's called. + + @type f: int or object with fileno() method + @param f: a file descriptor to monitor + @type condition: int + @param condition: a condition mask + @type callback: callable + @param callback: a function to call + @rtype: int + @return: an integer ID of the event source """ if f in self._poll_event_handlers: raise AssertionError("fd %d is already registered" % f) self._event_handler_id +=3D 1 - reg_id =3D self._event_handler_id - self._poll_event_handler_ids[reg_id] =3D f - self._poll_event_handlers[f] =3D (handler, reg_id) - self._poll_obj.register(f, eventmask) - return reg_id + source_id =3D self._event_handler_id + self._poll_event_handler_ids[source_id] =3D f + self._poll_event_handlers[f] =3D self._io_handler_class( + args=3Dargs, callback=3Dcallback, f=3Df, source_id=3Dsource_id) + self._poll_obj.register(f, condition) + return source_id =20 def _unregister(self, reg_id): """ @@ -409,8 +426,9 @@ class PollScheduler(object): while (wait_ids is None and event_handlers) or \ (wait_ids is not None and wait_ids.intersection(handler_ids)): f, event =3D self._next_poll_event(timeout=3Dremaining_timeout) - handler, reg_id =3D event_handlers[f] - handler(f, event) + x =3D event_handlers[f] + if not x.callback(f, event, *x.args): + self._unregister(x.source_id) event_handled =3D True if condition is not None and condition(): break diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index e6f3e0e..55e327f 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -218,6 +218,7 @@ class Scheduler(PollScheduler): schedule=3Dself._schedule_fetch) self._sched_iface =3D self._iface_class( fetch=3Dfetch_iface, output=3Dself._task_output, + io_add_watch=3Dself._register, register=3Dself._register, schedule=3Dself._schedule_wait, scheduleSetup=3Dself._schedule_setup, diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py index ec5bf7d..411e7c6 100644 --- a/pym/_emerge/SpawnProcess.py +++ b/pym/_emerge/SpawnProcess.py @@ -218,6 +218,8 @@ class SpawnProcess(SubProcess): =20 self._unregister_if_appropriate(event) =20 + return True + def _dummy_handler(self, fd, event): """ This method is mainly interested in detecting EOF, since @@ -240,6 +242,8 @@ class SpawnProcess(SubProcess): =20 self._unregister_if_appropriate(event) =20 + return True + def _unregister(self): super(SpawnProcess, self)._unregister() if self._log_file_real is not None: diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_Merg= eProcess.py index df501be..eed7bd4 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -83,6 +83,8 @@ class MergeProcess(SpawnProcess): reporter =3D getattr(portage.elog.messages, funcname) reporter(msg, phase=3Dphase, key=3Dkey, out=3Dout) =20 + return True + def _spawn(self, args, fd_pipes, **kwargs): """ Fork a subprocess, apply local settings, and call