vgsp-diag: thread STREAM_ANCHOR_RETRY_S into the guest scanner (r1410: strict-anchor pins land at +23.5 s = one 20 s throttle while the GL setup generation lives ~6-12 s, so the 60216-byte init push is consumed unreadable before its pins land; allows STREAM_ANCHOR_RETRY_S=2 cycles)

1 files changed, 9 insertions, 1 deletions

diff --git a/tools/guest-diag/pin_gr_stream.py b/tools/guest-diag/pin_gr_stream.py
index b2ba9b8..eb48aa5 100644
--- a/tools/guest-diag/pin_gr_stream.py
+++ b/tools/guest-diag/pin_gr_stream.py
@@ -157,6 +157,13 @@ def _start_cmd():
     prefixes = os.environ.get("CLIENT_PREFIXES",
                               "cdt,va,victory,Xorg,X,glxgears,gzdoom")
     vma_every = os.environ.get("STREAM_VMA_EVERY", "1")
+    # r1410: the strict-anchor retry throttle paces the setup-push pin at
+    # +23.5 s (one 20 s ANCHOR_RETRY_S window) while the GL client's setup
+    # generation lives ~6-12 s, so the 60216-byte init push is consumed
+    # unreadable before its pins land. Thread the guest scanner's throttle
+    # so a cycle can shorten it (STREAM_ANCHOR_RETRY_S=2) without editing
+    # the guest script.
+    anchor_retry = os.environ.get("STREAM_ANCHOR_RETRY_S", "20")
     # Kill EVERY existing scanner, not just the pid-file one: a retry after
     # a partially-failed first attempt (pid file not written yet) used to
     # leave the first scanner alive, and multiple scanners each re-assert
@@ -172,10 +179,11 @@ def _start_cmd():
             "sudo rm -f /tmp/guest_pin_stream.pid; "
             "sudo setsid nohup env CLIENT_PREFIXES='%s' "
             "STREAM_VMA_EVERY='%s' "
+            "STREAM_ANCHOR_RETRY_S='%s' "
             "python3 /tmp/guest_pin_stream.py %d %d %s %s %s "
             ">/tmp/guest_pin_stream.log 2>&1 & sleep 2; "
             "sudo cat /tmp/guest_pin_stream.pid 2>/dev/null"
-            % (prefixes, vma_every, 2, PORT, LO, HI, PAMAX))
+            % (prefixes, vma_every, anchor_retry, 2, PORT, LO, HI, PAMAX))
 
 
 def install_and_start():