mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 21:06:09 +00:00
fix: droiddeckctl pacing judges cadence per refresh-rate record and always turns timestats off (#894)
* fix: droiddeckctl pacing judges cadence per refresh-rate record and always turns timestats off Follow-up to the CodeRabbit reviews of #843/#855: - off-cadence is counted per layer record against that record's own cadence, allowing the neighbouring millisecond bucket (16.7 ms lands in 16 or 17); - refreshRates comes from the chosen layer records only; - records with no counted frames are skipped, so an empty game layer no longer hides the session's SurfaceView, and a capture with no frames exits NO_FRAMES; - adb failures while enabling or dumping map to PACING_FAILED, and timestats is disabled in every case. * fix: droiddeckctl pacing reports when timestats could not be turned off
This commit is contained in:
1 parent
a4f2c3b3f0
commit
cd04e056db
2 files changed
+100
-20
No files matched your search
+41
-20
@@ -300,27 +300,35 @@ def pacing_summary(text: str, package: str = PACKAGE) -> dict:
|
||||
frames shown, and 60 handed over can be 48 on screen with one in four held for two refreshes.
|
||||
"""
|
||||
records = {"game": [], "surface": []}
|
||||
for part in re.split(r"^layerName = ", text, flags=re.M)[1:]:
|
||||
name, _, body = part.partition("\n")
|
||||
for part in re.split(r"^displayRefreshRate = ", text, flags=re.M)[1:]:
|
||||
rate = re.match(r"(\d+)", part)
|
||||
layer = re.search(r"^layerName = (.*)$", part, re.M)
|
||||
frames = re.search(r"^totalFrames = (\d+)", part, re.M)
|
||||
hist = re.search(r"^present2present histogram is as below:\n(.*)", part, re.M)
|
||||
if not (rate and layer and frames and hist):
|
||||
continue
|
||||
name = layer.group(1)
|
||||
kind = ("game" if "droiddeck_wayland_game" in name
|
||||
else "surface" if f"SurfaceView[{package}/" in name else None)
|
||||
frames = re.search(r"^totalFrames = (\d+)", body, re.M)
|
||||
hist = re.search(r"^present2present histogram is as below:\n(.*)", body, re.M)
|
||||
if kind and frames and hist:
|
||||
records[kind].append((re.sub(r"#\d+$", "", name.strip()), int(frames.group(1)), hist.group(1)))
|
||||
if kind and int(frames.group(1)):
|
||||
bins = {int(ms): int(n) for ms, n in re.findall(r"(\d+)ms=(\d+)", hist.group(1)) if int(n)}
|
||||
records[kind].append((re.sub(r"#\d+$", "", name.strip()), int(frames.group(1)), bins, int(rate.group(1))))
|
||||
chosen = records["game"] or records["surface"]
|
||||
histogram: dict[int, int] = {}
|
||||
for _, _, hist in chosen:
|
||||
for ms, count in re.findall(r"(\d+)ms=(\d+)", hist):
|
||||
if int(count):
|
||||
histogram[int(ms)] = histogram.get(int(ms), 0) + int(count)
|
||||
off = 0
|
||||
for _, _, bins, _ in chosen:
|
||||
for ms, count in bins.items():
|
||||
histogram[ms] = histogram.get(ms, 0) + count
|
||||
if bins:
|
||||
# SurfaceFlinger bins by whole milliseconds, so one cadence spans two buckets (16.7 ms: 16 and 17).
|
||||
mode = max(bins, key=bins.get)
|
||||
off += sum(count for ms, count in bins.items() if abs(ms - mode) > 1)
|
||||
intervals = sum(histogram.values())
|
||||
cadence = max(histogram, key=histogram.get) if histogram else None
|
||||
off = intervals - histogram.get(cadence, 0) if histogram else 0
|
||||
return {
|
||||
"layers": sorted({name for name, _, _ in chosen}),
|
||||
"frames": sum(frames for _, frames, _ in chosen),
|
||||
"refreshRates": sorted({int(r) for r in re.findall(r"^displayRefreshRate = (\d+)", text, re.M)}),
|
||||
"layers": sorted({name for name, _, _, _ in chosen}),
|
||||
"frames": sum(frames for _, frames, _, _ in chosen),
|
||||
"refreshRates": sorted({rate for _, _, _, rate in chosen}),
|
||||
"presentToPresentMs": {str(ms): histogram[ms] for ms in sorted(histogram)},
|
||||
"cadenceMs": cadence,
|
||||
"offCadence": off,
|
||||
@@ -332,17 +340,30 @@ def pacing(adb: str, serial: str, seconds: float) -> dict:
|
||||
"""Frames on screen and their intervals over `seconds`, from SurfaceFlinger's timestats."""
|
||||
seconds = max(1.0, min(600.0, seconds))
|
||||
timestats = ("shell", "dumpsys", "SurfaceFlinger", "--timestats")
|
||||
if run_adb(adb, serial, *timestats, "-clear", "-enable").returncode != 0:
|
||||
try:
|
||||
enabled = run_adb(adb, serial, *timestats, "-clear", "-enable")
|
||||
except ControlError as exc:
|
||||
raise ControlError(str(exc), "PACING_FAILED") from exc
|
||||
if enabled.returncode != 0:
|
||||
raise ControlError("could not enable SurfaceFlinger timestats", "PACING_FAILED")
|
||||
started = time.monotonic()
|
||||
time.sleep(seconds)
|
||||
dump = run_adb(adb, serial, *timestats, "-dump", timeout=60)
|
||||
elapsed = time.monotonic() - started
|
||||
run_adb(adb, serial, *timestats, "-disable")
|
||||
try:
|
||||
time.sleep(seconds)
|
||||
dump = run_adb(adb, serial, *timestats, "-dump", timeout=60)
|
||||
except ControlError as exc:
|
||||
raise ControlError(str(exc), "PACING_FAILED") from exc
|
||||
finally:
|
||||
elapsed = time.monotonic() - started
|
||||
try:
|
||||
disabled = run_adb(adb, serial, *timestats, "-disable").returncode == 0
|
||||
except ControlError:
|
||||
disabled = False
|
||||
if dump.returncode != 0:
|
||||
raise ControlError(dump.stderr.decode(errors="replace").strip() or "timestats dump failed", "PACING_FAILED")
|
||||
if not disabled:
|
||||
raise ControlError("could not turn SurfaceFlinger timestats off", "PACING_FAILED")
|
||||
summary = pacing_summary(dump.stdout.decode(errors="replace"))
|
||||
if not summary["layers"]:
|
||||
if not summary["layers"] or not summary["frames"]:
|
||||
raise ControlError("No DroidDeck layer drew during the capture: is a session on screen?", "NO_FRAMES")
|
||||
summary["fpsOnScreen"] = round(summary["frames"] / elapsed, 1)
|
||||
return {"ok": True, "command": "pacing", "seconds": round(elapsed, 1), **summary}
|
||||
|
||||
Reference in new issue
Block a user