Skip to content

Make videos on the computer you already own. FreeVideo runs MiniMax H3 in as little as 8 GB of VRAM and 16 GB of RAM, and adapts its acceleration path to your hardware.

Keep a foreign module's arguments out of the lock holder report

Bowen Xue93b00be25a3c
diff --git a/freevideo_engine/failure_details.py b/freevideo_engine/failure_details.py
index 99ded67..1a88a9c 100644
--- a/freevideo_engine/failure_details.py
+++ b/freevideo_engine/failure_details.py
@@ -902,7 +902,7 @@ def generation_failure(run, exit_code=None, *, repair=None):
# diagnostics. Other output must never acquire a busy classification.
busy_lines = [line for line in _read(run / 'generate.log', 8192).splitlines() if line.strip()]
if exit_code == 1 and busy_lines[:1] == [ENGINE_BUSY] \
- and all(line.startswith('Lock holder:') for line in busy_lines[1:]):
+ and all(line.startswith('Lock file open:') for line in busy_lines[1:]):
lines.extend(busy_lines)
# What the worker found when cuDNN refused its own files, ahead of the trace.
explained = _runtime_explanation(report, REPAIR_MARK)
diff --git a/freevideo_engine/locking.py b/freevideo_engine/locking.py
index 9748aa9..2acd4a4 100644
--- a/freevideo_engine/locking.py
+++ b/freevideo_engine/locking.py
@@ -82,7 +82,10 @@ def _lock_command(cmdline):
index += 1
words = []
if index < len(arguments) and arguments[index] == '-m':
- for word in arguments[index + 1:index + 4]:
+ # Words after the module are that program's own arguments. Only our own
+ # modules have subcommands known not to carry private values.
+ own = arguments[index + 1].startswith('freevideo_engine') if index + 1 < len(arguments) else False
+ for word in arguments[index + 1:index + (4 if own else 2)]:
if not _COMMAND_WORD.fullmatch(word):
break # Never skip an option/path to expose its value as a word.
words.append(word)
@@ -90,7 +93,7 @@ def _lock_command(cmdline):
def _holder_line(pid, executable, command='', seconds=None):
- line = f'Lock holder: pid {int(pid)}, {_executable_basename(executable)}'
+ line = f'Lock file open: pid {int(pid)}, {_executable_basename(executable)}'
if command:
line += f' ({command})'
if seconds is not None and math.isfinite(seconds) and seconds >= 0:
@@ -203,7 +206,7 @@ def _windows_lock_holders(paths, deadline, lines):
if handle:
kernel.CloseHandle(handle)
if len(holders) > 5:
- lines.append(f'Lock holder: and {len(holders) - 5} more')
+ lines.append(f'Lock file open: and {len(holders) - 5} more')
finally:
manager.RmEndSession(session)
@@ -228,7 +231,7 @@ def describe_lock_holders(paths) -> list[str]:
return
lines.append(_linux_holder(pid))
if len(holders) > 5:
- lines.append(f'Lock holder: and {len(holders) - 5} more')
+ lines.append(f'Lock file open: and {len(holders) - 5} more')
except Exception:
pass
finally:
diff --git a/web/error_panel.js b/web/error_panel.js
index e5792a4..97c4d05 100644
--- a/web/error_panel.js
+++ b/web/error_panel.js
@@ -89,7 +89,7 @@ const PLAIN_ERRORS = [
// line counts (after an optional "ValueError: "), or the line right under the
// worker's "FreeVideo generation failed" header, so an input echoed inside or
// below another error, even one line of a longer prompt, never turns into this advice.
-// Optional "Lock holder:" diagnostic lines follow the engine-busy cause; keep
+// Optional "Lock file open:" diagnostic lines follow the engine-busy cause; keep
// matching its exact first line, so those details cannot become a new signature.
function knownError(text) {
const lines = String(text).slice(0, 65536).split(/\r?\n/).map(line => line.trim()).filter(Boolean);