tools subcmd: Add non-waitpid check_if_command_finished()

Using waitpid can cause stdout/stderr of the child process to be
lost. Use Linux's /prod/<pid>/status file to determine if the process
has reached the zombie state. Use the 'status' file rather than 'stat'
to avoid issues around skipping the process name.

Tested-by: James Clark <[email protected]>
Signed-off-by: Ian Rogers <[email protected]>
Cc: Colin Ian King <[email protected]>
Cc: Howard Chu <[email protected]>
Cc: Weilin Wang <[email protected]>
Cc: Ilya Leoshkevich <[email protected]>
Cc: Thomas Richter <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: Dapeng Mi <[email protected]>
Cc: Athira Jajeev <[email protected]>
Cc: Michael Petlan <[email protected]>
Cc: Veronika Molnarova <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Namhyung Kim <[email protected]>
This commit is contained in:
Ian Rogers authored and Namhyung Kim committed 2024-10-28 09:32:57 -07:00
1 parent 150dab31d5
commit 5ce42b5de4
1 file changed
+33
+33
View File
@@ -2,6 +2,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
#include <fcntl.h>
#include <string.h>
#include <linux/string.h>
@@ -217,8 +218,40 @@ static int wait_or_whine(struct child_process *cmd, bool block)
int check_if_command_finished(struct child_process *cmd)
{
#ifdef __linux__
char filename[FILENAME_MAX + 12];
char status_line[256];
FILE *status_file;
/*
* Check by reading /proc/<pid>/status as calling waitpid causes
* stdout/stderr to be closed and data lost.
*/
sprintf(filename, "/proc/%d/status", cmd->pid);
status_file = fopen(filename, "r");
if (status_file == NULL) {
/* Open failed assume finish_command was called. */
return true;
}
while (fgets(status_line, sizeof(status_line), status_file) != NULL) {
char *p;
if (strncmp(status_line, "State:", 6))
continue;
fclose(status_file);
p = status_line + 6;
while (isspace(*p))
p++;
return *p == 'Z' ? 1 : 0;
}
/* Read failed assume finish_command was called. */
fclose(status_file);
return 1;
#else
wait_or_whine(cmd, /*block=*/false);
return cmd->finished;
#endif
}
int finish_command(struct child_process *cmd)