diff -r 13588c901957 -r 9cf78a70fa4f src/hotspot/os/aix/os_perf_aix.cpp --- a/src/hotspot/os/aix/os_perf_aix.cpp Thu Oct 17 20:27:44 2019 +0100 +++ b/src/hotspot/os/aix/os_perf_aix.cpp Thu Oct 17 20:53:35 2019 +0100 @@ -443,12 +443,9 @@ } bool CPUPerformanceInterface::CPUPerformance::initialize() { - size_t tick_array_size = (_counters.nProcs +1) * sizeof(CPUPerfTicks); - _counters.cpus = (CPUPerfTicks*)NEW_C_HEAP_ARRAY(char, tick_array_size, mtInternal); - if (NULL == _counters.cpus) { - return false; - } - memset(_counters.cpus, 0, tick_array_size); + size_t array_entry_count = _counters.nProcs + 1; + _counters.cpus = NEW_C_HEAP_ARRAY(CPUPerfTicks, array_entry_count, mtInternal); + memset(_counters.cpus, 0, array_entry_count * sizeof(*_counters.cpus)); // For the CPU load total get_total_ticks(-1, &_counters.cpus[_counters.nProcs]); @@ -535,7 +532,7 @@ bool CPUPerformanceInterface::initialize() { _impl = new CPUPerformanceInterface::CPUPerformance(); - return NULL == _impl ? false : _impl->initialize(); + return _impl->initialize(); } CPUPerformanceInterface::~CPUPerformanceInterface() { @@ -688,19 +685,17 @@ } if (size > 0) { cmdline = NEW_C_HEAP_ARRAY(char, size + 1, mtInternal); - if (cmdline != NULL) { - cmdline[0] = '\0'; - if (fseek(fp, 0, SEEK_SET) == 0) { - if (fread(cmdline, 1, size, fp) == size) { - // the file has the arguments separated by '\0', - // so we translate '\0' to ' ' - for (size_t i = 0; i < size; i++) { - if (cmdline[i] == '\0') { - cmdline[i] = ' '; - } + cmdline[0] = '\0'; + if (fseek(fp, 0, SEEK_SET) == 0) { + if (fread(cmdline, 1, size, fp) == size) { + // the file has the arguments separated by '\0', + // so we translate '\0' to ' ' + for (size_t i = 0; i < size; i++) { + if (cmdline[i] == '\0') { + cmdline[i] = ' '; } - cmdline[size] = '\0'; } + cmdline[size] = '\0'; } } } @@ -790,7 +785,7 @@ bool SystemProcessInterface::SystemProcesses::initialize() { _iterator = new SystemProcessInterface::SystemProcesses::ProcessIterator(); - return NULL == _iterator ? false : _iterator->initialize(); + return _iterator->initialize(); } SystemProcessInterface::SystemProcesses::~SystemProcesses() { @@ -837,7 +832,7 @@ bool SystemProcessInterface::initialize() { _impl = new SystemProcessInterface::SystemProcesses(); - return NULL == _impl ? false : _impl->initialize(); + return _impl->initialize(); } SystemProcessInterface::~SystemProcessInterface() { @@ -852,15 +847,11 @@ bool CPUInformationInterface::initialize() { _cpu_info = new CPUInformation(); - if (NULL == _cpu_info) { - return false; - } _cpu_info->set_number_of_hardware_threads(VM_Version_Ext::number_of_threads()); _cpu_info->set_number_of_cores(VM_Version_Ext::number_of_cores()); _cpu_info->set_number_of_sockets(VM_Version_Ext::number_of_sockets()); _cpu_info->set_cpu_name(VM_Version_Ext::cpu_name()); _cpu_info->set_cpu_description(VM_Version_Ext::cpu_description()); - return true; } @@ -928,7 +919,7 @@ bool NetworkPerformanceInterface::initialize() { _impl = new NetworkPerformanceInterface::NetworkPerformance(); - return _impl != NULL && _impl->initialize(); + return _impl->initialize(); } int NetworkPerformanceInterface::network_utilization(NetworkInterface** network_interfaces) const {