ominfra 0.0.0.dev79__py3-none-any.whl → 0.0.0.dev80__py3-none-any.whl

ominfra/scripts/supervisor.py

@@ -596,81 +596,88 @@ class PollPoller(BasePoller):
         return False
 
 
-class KqueuePoller(BasePoller):
-    max_events = 1000
+if sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
+    class KqueuePoller(BasePoller):
+        max_events = 1000
 
-    def __init__(self) -> None:
-        super().__init__()
+        def __init__(self) -> None:
+            super().__init__()
 
-        self._kqueue: ta.Optional[ta.Any] = select.kqueue()
-        self._readables: set[int] = set()
-        self._writables: set[int] = set()
+            self._kqueue: ta.Optional[ta.Any] = select.kqueue()
+            self._readables: set[int] = set()
+            self._writables: set[int] = set()
 
-    def register_readable(self, fd: int) -> None:
-        self._readables.add(fd)
-        kevent = select.kevent(fd, filter=select.KQ_FILTER_READ, flags=select.KQ_EV_ADD)
-        self._kqueue_control(fd, kevent)
+        def register_readable(self, fd: int) -> None:
+            self._readables.add(fd)
+            kevent = select.kevent(fd, filter=select.KQ_FILTER_READ, flags=select.KQ_EV_ADD)
+            self._kqueue_control(fd, kevent)
 
-    def register_writable(self, fd: int) -> None:
-        self._writables.add(fd)
-        kevent = select.kevent(fd, filter=select.KQ_FILTER_WRITE, flags=select.KQ_EV_ADD)
-        self._kqueue_control(fd, kevent)
+        def register_writable(self, fd: int) -> None:
+            self._writables.add(fd)
+            kevent = select.kevent(fd, filter=select.KQ_FILTER_WRITE, flags=select.KQ_EV_ADD)
+            self._kqueue_control(fd, kevent)
 
-    def unregister_readable(self, fd: int) -> None:
-        kevent = select.kevent(fd, filter=select.KQ_FILTER_READ, flags=select.KQ_EV_DELETE)
-        self._readables.discard(fd)
-        self._kqueue_control(fd, kevent)
+        def unregister_readable(self, fd: int) -> None:
+            kevent = select.kevent(fd, filter=select.KQ_FILTER_READ, flags=select.KQ_EV_DELETE)
+            self._readables.discard(fd)
+            self._kqueue_control(fd, kevent)
 
-    def unregister_writable(self, fd: int) -> None:
-        kevent = select.kevent(fd, filter=select.KQ_FILTER_WRITE, flags=select.KQ_EV_DELETE)
-        self._writables.discard(fd)
-        self._kqueue_control(fd, kevent)
+        def unregister_writable(self, fd: int) -> None:
+            kevent = select.kevent(fd, filter=select.KQ_FILTER_WRITE, flags=select.KQ_EV_DELETE)
+            self._writables.discard(fd)
+            self._kqueue_control(fd, kevent)
 
-    def _kqueue_control(self, fd: int, kevent: 'select.kevent') -> None:
-        try:
-            self._kqueue.control([kevent], 0)  # type: ignore
-        except OSError as error:
-            if error.errno == errno.EBADF:
-                log.debug('EBADF encountered in kqueue. Invalid file descriptor %s', fd)
-            else:
-                raise
+        def _kqueue_control(self, fd: int, kevent: 'select.kevent') -> None:
+            try:
+                self._kqueue.control([kevent], 0)  # type: ignore
+            except OSError as error:
+                if error.errno == errno.EBADF:
+                    log.debug('EBADF encountered in kqueue. Invalid file descriptor %s', fd)
+                else:
+                    raise
 
-    def poll(self, timeout: ta.Optional[float]) -> ta.Tuple[ta.List[int], ta.List[int]]:
-        readables, writables = [], []  # type: ignore
+        def poll(self, timeout: ta.Optional[float]) -> ta.Tuple[ta.List[int], ta.List[int]]:
+            readables, writables = [], []  # type: ignore
 
-        try:
-            kevents = self._kqueue.control(None, self.max_events, timeout)  # type: ignore
-        except OSError as error:
-            if error.errno == errno.EINTR:
-                log.debug('EINTR encountered in poll')
-                return readables, writables
-            raise
+            try:
+                kevents = self._kqueue.control(None, self.max_events, timeout)  # type: ignore
+            except OSError as error:
+                if error.errno == errno.EINTR:
+                    log.debug('EINTR encountered in poll')
+                    return readables, writables
+                raise
 
-        for kevent in kevents:
-            if kevent.filter == select.KQ_FILTER_READ:
-                readables.append(kevent.ident)
-            if kevent.filter == select.KQ_FILTER_WRITE:
-                writables.append(kevent.ident)
+            for kevent in kevents:
+                if kevent.filter == select.KQ_FILTER_READ:
+                    readables.append(kevent.ident)
+                if kevent.filter == select.KQ_FILTER_WRITE:
+                    writables.append(kevent.ident)
 
-        return readables, writables
+            return readables, writables
 
-    def before_daemonize(self) -> None:
-        self.close()
+        def before_daemonize(self) -> None:
+            self.close()
 
-    def after_daemonize(self) -> None:
-        self._kqueue = select.kqueue()
-        for fd in self._readables:
-            self.register_readable(fd)
-        for fd in self._writables:
-            self.register_writable(fd)
+        def after_daemonize(self) -> None:
+            self._kqueue = select.kqueue()
+            for fd in self._readables:
+                self.register_readable(fd)
+            for fd in self._writables:
+                self.register_writable(fd)
 
-    def close(self) -> None:
-        self._kqueue.close()  # type: ignore
-        self._kqueue = None
+        def close(self) -> None:
+            self._kqueue.close()  # type: ignore
+            self._kqueue = None
+
+else:
+    KqueuePoller = None
 
 
 Poller: ta.Type[BasePoller]
-if hasattr(select, 'kqueue'):
+if (
+        sys.platform == 'darwin' or sys.platform.startswith('freebsd') and
+        hasattr(select, 'kqueue') and KqueuePoller is not None
+):
     Poller = KqueuePoller
 elif hasattr(select, 'poll'):
     Poller = PollPoller

ominfra/supervisor/poller.py

@@ -3,6 +3,7 @@ import abc
 import errno
 import logging
 import select
+import sys
 import typing as ta
 
 
@@ -150,81 +151,88 @@ class PollPoller(BasePoller):
         return False
 
 
-class KqueuePoller(BasePoller):
-    max_events = 1000
+if sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
+    class KqueuePoller(BasePoller):
+        max_events = 1000
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self._kqueue: ta.Optional[ta.Any] = select.kqueue()
-        self._readables: set[int] = set()
-        self._writables: set[int] = set()
+        def __init__(self) -> None:
+            super().__init__()
 
-    def register_readable(self, fd: int) -> None:
-        self._readables.add(fd)
-        kevent = select.kevent(fd, filter=select.KQ_FILTER_READ, flags=select.KQ_EV_ADD)
-        self._kqueue_control(fd, kevent)
+            self._kqueue: ta.Optional[ta.Any] = select.kqueue()
+            self._readables: set[int] = set()
+            self._writables: set[int] = set()
 
-    def register_writable(self, fd: int) -> None:
-        self._writables.add(fd)
-        kevent = select.kevent(fd, filter=select.KQ_FILTER_WRITE, flags=select.KQ_EV_ADD)
-        self._kqueue_control(fd, kevent)
+        def register_readable(self, fd: int) -> None:
+            self._readables.add(fd)
+            kevent = select.kevent(fd, filter=select.KQ_FILTER_READ, flags=select.KQ_EV_ADD)
+            self._kqueue_control(fd, kevent)
 
-    def unregister_readable(self, fd: int) -> None:
-        kevent = select.kevent(fd, filter=select.KQ_FILTER_READ, flags=select.KQ_EV_DELETE)
-        self._readables.discard(fd)
-        self._kqueue_control(fd, kevent)
+        def register_writable(self, fd: int) -> None:
+            self._writables.add(fd)
+            kevent = select.kevent(fd, filter=select.KQ_FILTER_WRITE, flags=select.KQ_EV_ADD)
+            self._kqueue_control(fd, kevent)
 
-    def unregister_writable(self, fd: int) -> None:
-        kevent = select.kevent(fd, filter=select.KQ_FILTER_WRITE, flags=select.KQ_EV_DELETE)
-        self._writables.discard(fd)
-        self._kqueue_control(fd, kevent)
+        def unregister_readable(self, fd: int) -> None:
+            kevent = select.kevent(fd, filter=select.KQ_FILTER_READ, flags=select.KQ_EV_DELETE)
+            self._readables.discard(fd)
+            self._kqueue_control(fd, kevent)
 
-    def _kqueue_control(self, fd: int, kevent: 'select.kevent') -> None:
-        try:
-            self._kqueue.control([kevent], 0)  # type: ignore
-        except OSError as error:
-            if error.errno == errno.EBADF:
-                log.debug('EBADF encountered in kqueue. Invalid file descriptor %s', fd)
-            else:
+        def unregister_writable(self, fd: int) -> None:
+            kevent = select.kevent(fd, filter=select.KQ_FILTER_WRITE, flags=select.KQ_EV_DELETE)
+            self._writables.discard(fd)
+            self._kqueue_control(fd, kevent)
+
+        def _kqueue_control(self, fd: int, kevent: 'select.kevent') -> None:
+            try:
+                self._kqueue.control([kevent], 0)  # type: ignore
+            except OSError as error:
+                if error.errno == errno.EBADF:
+                    log.debug('EBADF encountered in kqueue. Invalid file descriptor %s', fd)
+                else:
+                    raise
+
+        def poll(self, timeout: ta.Optional[float]) -> ta.Tuple[ta.List[int], ta.List[int]]:
+            readables, writables = [], []  # type: ignore
+
+            try:
+                kevents = self._kqueue.control(None, self.max_events, timeout)  # type: ignore
+            except OSError as error:
+                if error.errno == errno.EINTR:
+                    log.debug('EINTR encountered in poll')
+                    return readables, writables
                 raise
 
-    def poll(self, timeout: ta.Optional[float]) -> ta.Tuple[ta.List[int], ta.List[int]]:
-        readables, writables = [], []  # type: ignore
+            for kevent in kevents:
+                if kevent.filter == select.KQ_FILTER_READ:
+                    readables.append(kevent.ident)
+                if kevent.filter == select.KQ_FILTER_WRITE:
+                    writables.append(kevent.ident)
 
-        try:
-            kevents = self._kqueue.control(None, self.max_events, timeout)  # type: ignore
-        except OSError as error:
-            if error.errno == errno.EINTR:
-                log.debug('EINTR encountered in poll')
-                return readables, writables
-            raise
+            return readables, writables
 
-        for kevent in kevents:
-            if kevent.filter == select.KQ_FILTER_READ:
-                readables.append(kevent.ident)
-            if kevent.filter == select.KQ_FILTER_WRITE:
-                writables.append(kevent.ident)
+        def before_daemonize(self) -> None:
+            self.close()
 
-        return readables, writables
+        def after_daemonize(self) -> None:
+            self._kqueue = select.kqueue()
+            for fd in self._readables:
+                self.register_readable(fd)
+            for fd in self._writables:
+                self.register_writable(fd)
 
-    def before_daemonize(self) -> None:
-        self.close()
+        def close(self) -> None:
+            self._kqueue.close()  # type: ignore
+            self._kqueue = None
 
-    def after_daemonize(self) -> None:
-        self._kqueue = select.kqueue()
-        for fd in self._readables:
-            self.register_readable(fd)
-        for fd in self._writables:
-            self.register_writable(fd)
-
-    def close(self) -> None:
-        self._kqueue.close()  # type: ignore
-        self._kqueue = None
+else:
+    KqueuePoller = None
 
 
 Poller: ta.Type[BasePoller]
-if hasattr(select, 'kqueue'):
+if (
+        sys.platform == 'darwin' or sys.platform.startswith('freebsd') and
+        hasattr(select, 'kqueue') and KqueuePoller is not None
+):
     Poller = KqueuePoller
 elif hasattr(select, 'poll'):
     Poller = PollPoller

{ominfra-0.0.0.dev79.dist-info → ominfra-0.0.0.dev80.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev79
+Version: 0.0.0.dev80
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omdev ==0.0.0.dev79
-Requires-Dist: omlish ==0.0.0.dev79
+Requires-Dist: omdev ==0.0.0.dev80
+Requires-Dist: omlish ==0.0.0.dev80
 Provides-Extra: all
 Requires-Dist: paramiko ~=3.5 ; extra == 'all'
 Requires-Dist: asyncssh ~=2.17 ; (python_version < "3.13") and extra == 'all'

{ominfra-0.0.0.dev79.dist-info → ominfra-0.0.0.dev80.dist-info}/RECORD

@@ -47,7 +47,7 @@ ominfra/pyremote/_runcommands.py,sha256=2UVHaUJjmWP8jMZE79j2Qk1E5IOyVV1qNSUbdr-z
 ominfra/pyremote/bootstrap.py,sha256=RvMO3YGaN1E4sgUi1JEtiPak8cjvqtc_vRCq1yqbeZg,3370
 ominfra/pyremote/runcommands.py,sha256=bviS0_TDIoZVAe4h-_iavbvJtVSFu8lnk7fQ5iasCWE,1571
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/supervisor.py,sha256=eVD0NeSsnv-ckzb3c-EgzDRq7Kyr2dpvpPquW3Y690w,105707
+ominfra/scripts/supervisor.py,sha256=EU989AXWM-QJF4BmvKSlxkkBvRR3n2rz6yeXhjzo100,106149
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=usW9jjq5JPe_2SL8H5PrjDdksO75MX85Ir0HFfb35eM,72
 ominfra/supervisor/compat.py,sha256=sqsvlCNF2iMFdrc0LuTfyCBxXSVACtQx2wCfeHwWvAQ,5044
@@ -57,7 +57,7 @@ ominfra/supervisor/datatypes.py,sha256=cq2p7wnLN0nvKT-jZxaBByqsnCIUz6pX9dPtm69h1
 ominfra/supervisor/dispatchers.py,sha256=4AVtJagOEalRnxwCZjNr8LpkCkykzzg2ncMZiYsC4Bc,10367
 ominfra/supervisor/events.py,sha256=wT-gPfvv2HCAyQXMq3jiek17Jq6kAZb0U2hekzjf3ks,7743
 ominfra/supervisor/exceptions.py,sha256=jq8Md--zmAHri1BB2XeDPFcTur81IRwArOcZoP7-6W0,746
-ominfra/supervisor/poller.py,sha256=oqNEA7i2XXtERBv552sr29a6mlogmosWjeGOZSul5Kg,7273
+ominfra/supervisor/poller.py,sha256=RwVnjEl63-mNQUsJcVEEsFrwuh5aOKr9e-rrB2lWCgs,7726
 ominfra/supervisor/process.py,sha256=phucIv2a-LHXypY3kJ9fCsKEki9G9XdiJtXCVMgGcZI,31291
 ominfra/supervisor/states.py,sha256=JMxXYTZhJkMNQZ2tTV6wId7wrvnWgiZteskACprKskM,1374
 ominfra/supervisor/supervisor.py,sha256=GnG8SAhJ5UUay7cM3oBJYb4TmIUaQUdWWqnhANpalPw,13811
@@ -66,9 +66,9 @@ ominfra/tailscale/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 ominfra/tailscale/cli.py,sha256=Ltg6RVFsMLLPjLzoGwM6sxjmwjEVEYHAdrqmCc4N1HM,3174
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=L4t5rszm9ulcdWyr7n48_R9d5Etg4S2a4WQhlbHDtnQ,6106
-ominfra-0.0.0.dev79.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev79.dist-info/METADATA,sha256=qHE4z-IH2J8uJL_TOTh54TNP6YYBUHZKzbci30YOnb8,799
-ominfra-0.0.0.dev79.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-ominfra-0.0.0.dev79.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev79.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev79.dist-info/RECORD,,
+ominfra-0.0.0.dev80.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev80.dist-info/METADATA,sha256=IXqQETkknBLUm_itqwrjNtBd6raZKEi1PE7dmfLwHes,799
+ominfra-0.0.0.dev80.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+ominfra-0.0.0.dev80.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev80.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev80.dist-info/RECORD,,