Processing: suggest increasing --processing-timeout when child process timeouts

CarterLi · CarterLi · commit 36a0c273f992 · 2024-04-30T14:52:47.000+08:00
diff --git a/src/common/processing_linux.c b/src/common/processing_linux.c
@@ -68,7 +68,7 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
             {
                 kill(childPid, SIGTERM);
                 waitpid(childPid, NULL, 0);
-                return "poll(&pollfd, 1, timeout) timeout";
+                return "poll(&pollfd, 1, timeout) timeout (try increasing --processing-timeout)";
             }
             else if (pollfd.revents & POLLERR)
             {
diff --git a/src/common/processing_windows.c b/src/common/processing_windows.c
@@ -96,7 +96,7 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
                 {
                     CancelIo(hChildPipeRead);
                     TerminateProcess(hProcess, 1);
-                    return "WaitForSingleObject(hChildPipeRead) failed or timeout";
+                    return "WaitForSingleObject(hChildPipeRead) failed or timeout (try increasing --processing-timeout)";
                 }
 
                 if (!GetOverlappedResult(hChildPipeRead, &overlapped, &nRead, FALSE))

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use`
`68`	`68`	`{`
`69`	`69`	`kill(childPid, SIGTERM);`
`70`	`70`	`waitpid(childPid, NULL, 0);`
`71`		`- return "poll(&pollfd, 1, timeout) timeout";`
	`71`	`+ return "poll(&pollfd, 1, timeout) timeout (try increasing --processing-timeout)";`
`72`	`72`	`}`
`73`	`73`	`else if (pollfd.revents & POLLERR)`
`74`	`74`	`{`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use`
`96`	`96`	`{`
`97`	`97`	`CancelIo(hChildPipeRead);`
`98`	`98`	`TerminateProcess(hProcess, 1);`
`99`		`- return "WaitForSingleObject(hChildPipeRead) failed or timeout";`
	`99`	`+ return "WaitForSingleObject(hChildPipeRead) failed or timeout (try increasing --processing-timeout)";`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if (!GetOverlappedResult(hChildPipeRead, &overlapped, &nRead, FALSE))`