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

8327171: Fix more NULL usage backsliding

Browse Source 
Reviewed-by: gli, jwaters, dholmes
This commit is contained in:
Kim Barrett 2024-03-04 08:06:20 +00:00
parent f3b15abcb7
commit 97dc0edde0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/os/aix/os_aix.cpp
View File

@ -278,7 +278,7 @@ julong os::Aix::available_memory() {
jlong os::total_swap_space() {
perfstat_memory_total_t memory_info;
if (libperfstat::perfstat_memory_total(NULL, &memory_info, sizeof(perfstat_memory_total_t), 1) == -1) {
if (libperfstat::perfstat_memory_total(nullptr, &memory_info, sizeof(perfstat_memory_total_t), 1) == -1) {
return -1;
}
return (jlong)(memory_info.pgsp_total * 4 * K);
@ -286,7 +286,7 @@ jlong os::total_swap_space() {
jlong os::free_swap_space() {
perfstat_memory_total_t memory_info;
if (libperfstat::perfstat_memory_total(NULL, &memory_info, sizeof(perfstat_memory_total_t), 1) == -1) {
if (libperfstat::perfstat_memory_total(nullptr, &memory_info, sizeof(perfstat_memory_total_t), 1) == -1) {
return -1;
}
return (jlong)(memory_info.pgsp_free * 4 * K);

4
src/hotspot/os/bsd/os_bsd.cpp
View File

@ -184,7 +184,7 @@ jlong os::total_swap_space() {
#if defined(__APPLE__)
struct xsw_usage vmusage;
size_t size = sizeof(vmusage);
if (sysctlbyname("vm.swapusage", &vmusage, &size, NULL, 0) != 0) {
if (sysctlbyname("vm.swapusage", &vmusage, &size, nullptr, 0) != 0) {
return -1;
}
return (jlong)vmusage.xsu_total;
@ -197,7 +197,7 @@ jlong os::free_swap_space() {
#if defined(__APPLE__)
struct xsw_usage vmusage;
size_t size = sizeof(vmusage);
if (sysctlbyname("vm.swapusage", &vmusage, &size, NULL, 0) != 0) {
if (sysctlbyname("vm.swapusage", &vmusage, &size, nullptr, 0) != 0) {
return -1;
}
return (jlong)vmusage.xsu_avail;

2
test/hotspot/gtest/runtime/test_os_linux.cpp
View File

@ -356,7 +356,7 @@ TEST_VM(os_linux, pretouch_thp_and_use_concurrent) {
const bool useThp = UseTransparentHugePages;
UseTransparentHugePages = true;
char* const heap = os::reserve_memory(size, false, mtInternal);
EXPECT_NE(heap, (char*)NULL);
EXPECT_NE(heap, nullptr);
EXPECT_TRUE(os::commit_memory(heap, size, false));
{