fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco/tests: Fix deadlock for too large test lists

Browse source 
The write() to the communication pipe shared with check_output.py would block
for large test output streams since the pipe's consumer wouldn't be launched
until the write already completed.

Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7461>
This commit is contained in:
Tony Wasserka 2020-11-05 16:21:49 +01:00 • committed by Marge Bot
parent a240341ec9
commit 6a246f5c6d
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/amd/compiler/tests/main.cpp
View file

@ -173,14 +173,28 @@ int check_output(char **argv)
int stdin_pipe[2]; int stdin_pipe[2];
pipe(stdin_pipe); pipe(stdin_pipe);
write(stdin_pipe[1], checker_stdin_data, checker_stdin_size); pid_t child_pid = fork();
close(stdin_pipe[1]); if (child_pid == -1) {
dup2(stdin_pipe[0], STDIN_FILENO); fprintf(stderr, "%s: fork() failed: %s\n", argv[0], strerror(errno));
return 99;
} else if (child_pid != 0) {
/* Evaluate test output externally using Python */
dup2(stdin_pipe[0], STDIN_FILENO);
close(stdin_pipe[0]);
close(stdin_pipe[1]);
execlp(ACO_TEST_PYTHON_BIN, ACO_TEST_PYTHON_BIN, ACO_TEST_SOURCE_DIR "/check_output.py", NULL); execlp(ACO_TEST_PYTHON_BIN, ACO_TEST_PYTHON_BIN, ACO_TEST_SOURCE_DIR "/check_output.py", NULL);
fprintf(stderr, "%s: execlp() failed: %s\n", argv[0], strerror(errno));
fprintf(stderr, "%s: execl() failed: %s\n", argv[0], strerror(errno)); return 99;
return 99; } else {
/* Feed input data to the Python process. Writing large streams to
* stdin will block eventually, so this is done in a forked process
* to let the test checker process chunks of data as they arrive */
write(stdin_pipe[1], checker_stdin_data, checker_stdin_size);
close(stdin_pipe[0]);
close(stdin_pipe[1]);
exit(0);
}
} }
bool match_test(std::string name, std::string pattern) bool match_test(std::string name, std::string pattern)