bmdwire 1.5.1__tar.gz → 1.5.3__tar.gz

{bmdwire-1.5.1/bmdwire.egg-info → bmdwire-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bmdwire
-Version: 1.5.1
+Version: 1.5.3
 Summary: Python libraries for Blackmagic Design broadcast devices: ATEM switchers, HyperDeck recorders, Ultimatte keyers and Videohub routers
 Author: Lucas Romanenko, Martijn Braam and the OpenAtem contributors
 License-Expression: LGPL-3.0-only AND MIT
@@ -49,7 +49,7 @@ pip install bmdwire
 | **`ultimattewire`** | Ultimatte 12 keyers: archive and restore over the native TCP protocol, Smart Remote 4 compatible zips | MIT | [ultimattewire/README.md](ultimattewire/README.md) |
 | **`videohubwire`** | Videohub routers: state snapshot, crosspoint routing, labels over TCP 9990 | MIT | [videohubwire/README.md](videohubwire/README.md) |
 
-All four are pure standard library except atemwire, whose small C extension ships prebuilt for Linux, macOS and Windows on CPython 3.10 to 3.14, so installing needs no compiler. Pin the version in a requirements file (`bmdwire==1.5.1`) so a later release cannot change your install under you.
+All four are pure standard library except atemwire, whose small C extension ships prebuilt for Linux, macOS and Windows on CPython 3.10 to 3.14, so installing needs no compiler. Pin the version in a requirements file (`bmdwire==1.5.3`) so a later release cannot change your install under you.
 
 ## atemwire stands on pyatem
 

{bmdwire-1.5.1 → bmdwire-1.5.3}/README.md

@@ -15,7 +15,7 @@ pip install bmdwire
 | **`ultimattewire`** | Ultimatte 12 keyers: archive and restore over the native TCP protocol, Smart Remote 4 compatible zips | MIT | [ultimattewire/README.md](ultimattewire/README.md) |
 | **`videohubwire`** | Videohub routers: state snapshot, crosspoint routing, labels over TCP 9990 | MIT | [videohubwire/README.md](videohubwire/README.md) |
 
-All four are pure standard library except atemwire, whose small C extension ships prebuilt for Linux, macOS and Windows on CPython 3.10 to 3.14, so installing needs no compiler. Pin the version in a requirements file (`bmdwire==1.5.1`) so a later release cannot change your install under you.
+All four are pure standard library except atemwire, whose small C extension ships prebuilt for Linux, macOS and Windows on CPython 3.10 to 3.14, so installing needs no compiler. Pin the version in a requirements file (`bmdwire==1.5.3`) so a later release cannot change your install under you.
 
 ## atemwire stands on pyatem
 

{bmdwire-1.5.1 → bmdwire-1.5.3}/atemwire/docs/MEDIA_LOCK.md

@@ -227,6 +227,13 @@ two of them captured on the ASC machine.
   thumbnails while the other client downloaded; the download paused 38 s
   for ASC's 20 and went on. Alone, 20 uploads take 14.2 s, against
   12.7 s with 1.5.0 and about 12 s for ASC.
+* That has to follow every release, work queued or not (`1b30449`).
+  WebATEM's media pool watcher queues one still at a time, the next
+  after decoding the last, so nothing is queued at the release; 1.5.1
+  yielded only when something was, and the watcher's next request went
+  out a moment after the release, beside ASC's. With the yield after
+  every release, ASC loaded all 20 thumbnails while a client downloaded
+  as the watcher does.
 * atemwire 1.4.0 waited for its own release's `LKST` echo before asking
   again, so it waited out a client handed the store too, by accident.
   bmdctl, which mirrors this code, saw that as unexplained pauses of 2 to

{bmdwire-1.5.1 → bmdwire-1.5.3}/atemwire/docs/SURFACE.md

@@ -918,7 +918,7 @@ Items 1, 2 and 4 were fixed after 1.2.0, in the commits named in each; they stil
 10, the split-mono bullet of item 8, the float and `sourceId` bullets of item 9, items 15, 16,
 18, 19 and 20, and part of item 17 were fixed after 1.3.0 and still apply to it. Items 21 to 25
 were fixed after 1.4.0 and still apply to it. Item 26 was fixed after 1.5.0 and still applies to
-it.
+it; item 27 was fixed after 1.5.1.
 
 1. **Profile video mode does not round-trip at fractional rates** (1.2.0). Save writes
    `get_label()` (`1080p59.94`); apply only knows `1080p5994`-style names, so it skips the mode as
@@ -1089,6 +1089,24 @@ it.
     while another client is seen holding the store, and with no announcement waits while anyone
     is seen at work, asking after `LOCK_QUIET` (10 s) of quiet. `UdpProtocol.wake_at` wakes the
     protocol for it.
+27. **A transfer queued after the release doesn't wait its turn** (1.5.1). Item 26's fix starts
+    the wait only after a release with more work queued. A caller that queues its transfers one at
+    a time (WebATEM's media pool watcher, the next still after decoding the last) has nothing
+    queued at the release, and its next request goes out at once, beside another client's,
+    aborting it as before. *Fixed in `1b30449`:* every per-frame release starts the wait, after an
+    FTDE 6 too, and so does any client's announced release.
+28. **The UDP thread can wait on itself for good** (1.5.0). `thread_queue` is a `SocketQueue`:
+    each put writes a byte to a socketpair (278 fit on Linux) that only the UDP thread reads.
+    `drain_queue` puts a whole upload budget, up to 768 chunks, at once, and the UDP thread queued
+    its own packets too, the ACK for every reliable packet received among them. A packet arriving
+    mid-budget (another session's lock or transfer broadcast, say) left both threads waiting in
+    `SocketQueue.put` for good: the upload stops, and a caller's timeout never runs if its pump is
+    the protocol thread. *Fixed in `81955c1`:* what the UDP thread sends goes to the socket at once.
+29. **A caller's Wakeup runs the trigger in every yield** (1.5.2). `_service_yields` ran on
+    every `Wakeup`, a caller's included, and triggered each store with work queued before its
+    turn was due: two INFO lines per `Wakeup`, 100 a second under WebATEM's pump. *Fixed in
+    `81955c1`:* the trigger runs once the turn is due; before it, the protocol only wakes for the
+    due time again.
 
 ## Counts
 

{bmdwire-1.5.1 → bmdwire-1.5.3}/atemwire/protocol.py

@@ -397,11 +397,11 @@ class AtemProtocol:
             # and abort their transfer (TEST ATEM 2, 2026-10-15).
             y = self._yielding.get(contents.store)
             now = time.monotonic()
-            if y is None and self.transfer_queue.get(contents.store) and self._can_wake():
+            if y is None and self._can_wake():
                 self._yielding[contents.store] = [now, now]
-                self._wake_at(now + LOCK_COURTESY)
             elif y is not None and y[1] is None:
                 y[1] = now
+            if contents.store in self._yielding and self.transfer_queue.get(contents.store):
                 self._wake_at(now + LOCK_COURTESY)
             # The lock is free: whatever request we had outstanding is
             # either about to be granted (a queued PLCK — the switcher
@@ -955,11 +955,16 @@ class AtemProtocol:
                 self.send_commands([LockCommand(store, False)])
             except Exception:
                 self.log.exception('per-frame unlock send failed')
+            if self._can_wake():
+                # Every release, whether or not more work is queued now: a
+                # caller that queues its transfers one at a time (WebATEM's
+                # media pool watcher queues the next still after decoding the
+                # last) asks again a moment after the release, with nothing
+                # queued at it, and that request must wait its turn too. The
+                # trigger defers it and asks to be woken.
+                self._yielding[store] = [time.monotonic(), None]
             if not request_next:
                 return  # the store's release broadcast continues the queue
-            if self.transfer_queue.get(store) and self._can_wake():
-                # The trigger below defers the request and asks to be woken.
-                self._yielding[store] = [time.monotonic(), None]
         self._transfer_trigger(store)
 
     def _can_wake(self):
@@ -986,11 +991,23 @@ class AtemProtocol:
                 y[0] = now
 
     def _service_yields(self):
-        """Ask for each store we left free whose yield is over."""
+        """Ask for each store we left free whose yield is over; forget a
+        yield that is over with nothing waiting on it. A Wakeup comes from
+        callers too (WebATEM's pump sends one every 20 ms): a yield not yet
+        over is only woken for again, its time perhaps moved by someone at
+        work, so the trigger runs once per turn, not once per tick."""
+        now = time.monotonic()
         for store in list(self._yielding):
+            due = self._yield_due(store)
             if not self.transfer_queue.get(store):
-                del self._yielding[store]
-            elif not self.transfer_requested and not self.locks.get(store):
+                if now >= due:
+                    del self._yielding[store]
+            elif (self.transfer_requested or self.locks.get(store)
+                    or store in self._foreign_held):
+                continue                         # their release asks for us
+            elif now < due:
+                self._wake_at(due)
+            else:
                 self._transfer_trigger(store)
 
     def _transfer_trigger(self, store, retry=False):

{bmdwire-1.5.1 → bmdwire-1.5.3}/atemwire/transport.py

@@ -496,27 +496,12 @@ class UdpProtocol(BaseProtocol):
                 elif queue is self.thread_queue:
                     item = queue.get()
                     if item is None:
-                        # Defensive: tolerate a stray wake sentinel on the
-                        # send queue (no current producer).
+                        # wake_at's sentinel: select() returned, so the
+                        # next one takes the new timeout.
                         continue
                     try:
-                        self._send_packet_low(item)
+                        self._send_on_udp_thread(item)
                     except OSError as e:
-                        if e.errno in TRANSIENT_SEND_ERRNOS:
-                            # A momentary network hiccup (VPN blip, ICMP
-                            # unreachable burst, full socket buffer) must
-                            # not kill the transport thread: a dead thread
-                            # leaves a zombie connection whose worker
-                            # blocks forever while is_connected stays True
-                            # and send() silently drops (2026-07-06).
-                            # Only an ACK or a handshake packet gets here:
-                            # a reliable one keeps its sequence number in
-                            # _send_packet_low and is resent. ACKs go out
-                            # again with the next packet.
-                            self.log.error(
-                                f"Transient send error (packet dropped, "
-                                f"thread stays up): {e}")
-                            continue
                         self.log.error(e)
                         # Queue a None to signal the socket died
                         self.thread_recv_queue.put(None)
@@ -525,8 +510,34 @@ class UdpProtocol(BaseProtocol):
                     self.thread_recv_queue.put(None)
                     raise RuntimeError("Unexpected result from select()")
 
+    def _send_on_udp_thread(self, packet):
+        try:
+            self._send_packet_low(packet)
+        except OSError as e:
+            if e.errno not in TRANSIENT_SEND_ERRNOS:
+                raise
+            # A momentary network hiccup (VPN blip, ICMP unreachable
+            # burst, full socket buffer) must not kill the transport
+            # thread: a dead thread leaves a zombie connection whose
+            # worker blocks forever while is_connected stays True and
+            # send() silently drops (2026-07-06). Only an ACK or a
+            # handshake packet gets here: a reliable one keeps its
+            # sequence number in _send_packet_low and is resent. ACKs go
+            # out again with the next packet.
+            self.log.error(
+                f"Transient send error (packet dropped, thread stays up): {e}")
+
     def _send_packet(self, packet):
-        self.thread_queue.put(packet)
+        if threading.current_thread() is self.thread:
+            # The UDP thread is thread_queue's only reader, and a put waits
+            # while the socketpair under it is full: a few hundred entries,
+            # fewer than an upload budget drain_queue puts at once. Its own
+            # packets (the ACK for each reliable packet received, a SYN
+            # after a timeout) queued behind a budget had it wait on itself
+            # for good, and the upload with it (2026-10-15). They go now.
+            self._send_on_udp_thread(packet)
+        else:
+            self.thread_queue.put(packet)
         self.packet_success += 1
 
     def close_session(self):
@@ -853,8 +864,9 @@ class UdpProtocol(BaseProtocol):
         protocol's timed work, which its packets alone can't drive (the
         switcher's pings never reach it). The earliest of several wins."""
         with self._wake_lock:
-            if self._wake_due is None or when < self._wake_due:
-                self._wake_due = when
+            if self._wake_due is not None and self._wake_due <= when:
+                return                           # select() wakes sooner anyway
+            self._wake_due = when
         self.thread_queue.put(None)              # select() takes the new timeout
 
     def _fire_wake(self):

{bmdwire-1.5.1 → bmdwire-1.5.3/bmdwire.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bmdwire
-Version: 1.5.1
+Version: 1.5.3
 Summary: Python libraries for Blackmagic Design broadcast devices: ATEM switchers, HyperDeck recorders, Ultimatte keyers and Videohub routers
 Author: Lucas Romanenko, Martijn Braam and the OpenAtem contributors
 License-Expression: LGPL-3.0-only AND MIT
@@ -49,7 +49,7 @@ pip install bmdwire
 | **`ultimattewire`** | Ultimatte 12 keyers: archive and restore over the native TCP protocol, Smart Remote 4 compatible zips | MIT | [ultimattewire/README.md](ultimattewire/README.md) |
 | **`videohubwire`** | Videohub routers: state snapshot, crosspoint routing, labels over TCP 9990 | MIT | [videohubwire/README.md](videohubwire/README.md) |
 
-All four are pure standard library except atemwire, whose small C extension ships prebuilt for Linux, macOS and Windows on CPython 3.10 to 3.14, so installing needs no compiler. Pin the version in a requirements file (`bmdwire==1.5.1`) so a later release cannot change your install under you.
+All four are pure standard library except atemwire, whose small C extension ships prebuilt for Linux, macOS and Windows on CPython 3.10 to 3.14, so installing needs no compiler. Pin the version in a requirements file (`bmdwire==1.5.3`) so a later release cannot change your install under you.
 
 ## atemwire stands on pyatem
 

{bmdwire-1.5.1 → bmdwire-1.5.3}/pyproject.toml

@@ -13,7 +13,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bmdwire"
-version = "1.5.1"
+version = "1.5.3"
 description = "Python libraries for Blackmagic Design broadcast devices: ATEM switchers, HyperDeck recorders, Ultimatte keyers and Videohub routers"
 readme = "README.md"
 # atemwire is a fork of pyatem and stays LGPL-3.0-only; the other three were