stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jesper Wilhelmsson 2023-01-14 01:57:13 +00:00
commit 4be94e4350
4 changed files with 15 additions and 13 deletions

19
src/hotspot/os/bsd/os_bsd.cpp

@ -1966,18 +1966,15 @@ jint os::init_2(void) {
log_info(os)("os::init_2 getrlimit failed: %s", os::strerror(errno));
} else {
nbr_files.rlim_cur = nbr_files.rlim_max;
status = setrlimit(RLIMIT_NOFILE, &nbr_files);
#ifdef __APPLE__
if (status != 0 && errno == EINVAL) {
// On macOS >= 10.6 if we define _DARWIN_UNLIMITED_STREAMS or _DARWIN_C_SOURCE
// (we define _DARWIN_C_SOURCE) we can ask for RLIM_INFINITY,
// however, on macOS < 10.6 Darwin returns RLIM_INFINITY for rlim_max,
// but fails with EINVAL if you attempt to use RLIM_INFINITY.
// As per setrlimit(2), OPEN_MAX must be used instead.
nbr_files.rlim_cur = MIN(OPEN_MAX, nbr_files.rlim_cur);
status = setrlimit(RLIMIT_NOFILE, &nbr_files);
}
#endif // __APPLE__
// Darwin returns RLIM_INFINITY for rlim_max, but fails with EINVAL if
// you attempt to use RLIM_INFINITY. As per setrlimit(2), OPEN_MAX must
// be used instead
nbr_files.rlim_cur = MIN(OPEN_MAX, nbr_files.rlim_cur);
#endif
status = setrlimit(RLIMIT_NOFILE, &nbr_files);
if (status != 0) {
log_info(os)("os::init_2 setrlimit failed: %s", os::strerror(errno));
}

1
test/hotspot/jtreg/ProblemList-Xcomp.txt

@ -29,6 +29,7 @@
vmTestbase/nsk/jvmti/AttachOnDemand/attach022/TestDescription.java 8277573 generic-all
vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/TestDescription.java 8205957 generic-all
vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/TestDescription.java 8205957 linux-x64,windows-x64
vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/TestDescription.java 8245680 windows-x64
vmTestbase/vm/mlvm/mixed/stress/regression/b6969574/INDIFY_Test.java 8265295 linux-x64,windows-x64

3
test/hotspot/jtreg/ProblemList-zgc.txt

@ -1,5 +1,5 @@
#
# Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@ -42,4 +42,5 @@ serviceability/sa/ClhsdbPstack.java#core 8248912 generic-
vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java 8289582 windows-x64
vmTestbase/nsk/monitoring/MemoryPoolMBean/isCollectionUsageThresholdExceeded/isexceeded002/TestDescription.java 8298302 generic-all
vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java 8298991 linux-x64
vmTestbase/nsk/sysdict/vm/stress/chain/chain008/chain008.java 8298596 linux-x64

5
test/jdk/ProblemList-zgc.txt

@ -1,5 +1,5 @@
#
# Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@ -26,3 +26,6 @@
# List of quarantined tests for testing with ZGC.
#
#############################################################################
jdk/internal/vm/Continuation/Fuzz.java#default 8298058 generic-x64
java/util/concurrent/locks/Lock/OOMEInAQS.java 8298066 windows-x64