infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8360401: [AIX] java/lang/ProcessBuilder/FDLeakTest/FDLeakTest.java fails since JDK-8210549

Browse Source 
Reviewed-by: mdoerr, stuefe
This commit is contained in:
Joachim Kern 2025-09-24 07:38:23 +00:00
parent 303686684c
commit f993f90c86
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/java.base/unix/native/libjava/childproc.c
View File

@ -67,24 +67,39 @@ markCloseOnExec(int fd)
return 0;
}
#if !defined(_AIX)
/* The /proc file system on AIX does not contain open system files
* like /dev/random. Therefore we use a different approach and do
* not need isAsciiDigit() or FD_DIR */
static int
isAsciiDigit(char c)
{
return c >= '0' && c <= '9';
}
#if defined(_AIX)
/* AIX does not understand '/proc/self' - it requires the real process ID */
#define FD_DIR aix_fd_dir
#elif defined(_ALLBSD_SOURCE)
#define FD_DIR "/dev/fd"
#else
#define FD_DIR "/proc/self/fd"
#if defined(_ALLBSD_SOURCE)
#define FD_DIR "/dev/fd"
#else
#define FD_DIR "/proc/self/fd"
#endif
#endif
static int
markDescriptorsCloseOnExec(void)
{
#if defined(_AIX)
/* On AIX, we cannot rely on proc file system iteration to find all open files. Since
* iteration over all possible file descriptors, and subsequently closing them, can
* take a very long time, we use a bulk close via `ioctl` that is available on AIX.
* Since we hard-close, we need to make sure to keep the fail pipe file descriptor
* alive until the exec call. Therefore we mark the fail pipe fd with close on exec
* like the other OSes do, but then proceed to hard-close file descriptors beyond that.
*/
if (fcntl(FAIL_FILENO + 1, F_CLOSEM, 0) == -1 ||
(markCloseOnExec(FAIL_FILENO) == -1 && errno != EBADF)) {
return -1;
}
#else
DIR *dp;
struct dirent *dirp;
/* This function marks all file descriptors beyond stderr as CLOEXEC.
@ -93,12 +108,6 @@ markDescriptorsCloseOnExec(void)
* execve. */
const int fd_from = STDERR_FILENO + 1;
#if defined(_AIX)
/* AIX does not understand '/proc/self' - it requires the real process ID */
char aix_fd_dir[32]; /* the pid has at most 19 digits */
snprintf(aix_fd_dir, 32, "/proc/%d/fd", getpid());
#endif
if ((dp = opendir(FD_DIR)) == NULL)
return -1;
@ -114,6 +123,7 @@ markDescriptorsCloseOnExec(void)
}
closedir(dp);
#endif
return 0;
}
@ -406,6 +416,10 @@ childProcess(void *arg)
/* We moved the fail pipe fd */
fail_pipe_fd = FAIL_FILENO;
/* For AIX: The code in markDescriptorsCloseOnExec() relies on the current
* semantic of this function. When this point here is reached only the
* FDs 0,1,2 and 3 are further used until the exec() or the exit(-1). */
/* close everything */
if (markDescriptorsCloseOnExec() == -1) { /* failed, close the old way */
int max_fd = (int)sysconf(_SC_OPEN_MAX);