Skip to content

Commit

Permalink
Improve error message output from the fork() utest (OpenMathLib#4753)
Browse files Browse the repository at this point in the history
* Add perror to report the reason for a fork failure
* reword the malloc failure message
  • Loading branch information
martin-frbg authored Jun 15, 2024
1 parent f13403b commit 33bb4b9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
7 changes: 5 additions & 2 deletions utest/test_fork.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include <sys/types.h>
#include <sys/wait.h>
#include <errno.h>
#include <cblas.h>
#include "openblas_utest.h"

Expand All @@ -41,7 +42,7 @@ static void* xmalloc(size_t n)
void* tmp;
tmp = malloc(n);
if (tmp == NULL) {
fprintf(stderr, "You are about to die\n");
fprintf(stderr, "Failed to allocate memory for the testcase.\n");
exit(1);
} else {
return tmp;
Expand Down Expand Up @@ -103,6 +104,7 @@ exit(0);

fork_pid = fork();
if (fork_pid == -1) {
perror("fork");
CTEST_ERR("Failed to fork process.");
} else if (fork_pid == 0) {
// Compute a DGEMM product in the child process to check that the
Expand All @@ -113,7 +115,8 @@ exit(0);
// recursively
fork_pid_nested = fork();
if (fork_pid_nested == -1) {
CTEST_ERR("Failed to fork process.");
perror("fork");
CTEST_ERR("Failed to fork nested process.");
exit(1);
} else if (fork_pid_nested == 0) {
check_dgemm(a, b, d, c, n);
Expand Down
9 changes: 7 additions & 2 deletions utest/test_post_fork.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include <sys/types.h>
#include <sys/wait.h>
#include <errno.h>
#include <cblas.h>
#ifdef USE_OPENMP
#include <omp.h>
Expand All @@ -44,7 +45,7 @@ static void* xmalloc(size_t n)
void* tmp;
tmp = malloc(n);
if (tmp == NULL) {
fprintf(stderr, "You are about to die\n");
fprintf(stderr, "Failed to allocate memory for the test payload.\n");
exit(1);
} else {
return tmp;
Expand Down Expand Up @@ -114,7 +115,11 @@ exit(0);

fork_pid = fork();
if (fork_pid == -1) {
CTEST_ERR("Failed to fork process.");
perror("fork");
CTEST_ERR("Failed to fork subprocesses in a loop.");
#ifdef USE_OPENMP
CTEST_ERR("Number of OpenMP threads was %d in this attempt.",i);
#endif
} else if (fork_pid == 0) {
// Just pretend to do something, e.g. call `uname`, then exit
exit(0);
Expand Down

0 comments on commit 33bb4b9

Please sign in to comment.