8301180: Replace NULL with nullptr in share/gc/parallel/

Reviewed-by: stefank, ayang

Author: jdksjolen

src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -194,7 +194,7 @@ GCAdaptivePolicyCounters::GCAdaptivePolicyCounters(const char* name,
 }
 
 void GCAdaptivePolicyCounters::update_counters_from_policy() {
-  if (UsePerfData && (size_policy() != NULL)) {
+  if (UsePerfData && (size_policy() != nullptr)) {
     update_avg_minor_pause_counter();
     update_avg_minor_interval_counter();
 #ifdef NOT_PRODUCT

src/hotspot/share/gc/parallel/mutableNUMASpace.cpp

@@ -168,7 +168,7 @@ size_t MutableNUMASpace::free_in_words() const {
 
 
 size_t MutableNUMASpace::tlab_capacity(Thread *thr) const {
-  guarantee(thr != NULL, "No thread");
+  guarantee(thr != nullptr, "No thread");
   int lgrp_id = thr->lgrp_id();
   if (lgrp_id == -1) {
     // This case can occur after the topology of the system has
@@ -193,7 +193,7 @@ size_t MutableNUMASpace::tlab_capacity(Thread *thr) const {
 
 size_t MutableNUMASpace::tlab_used(Thread *thr) const {
   // Please see the comments for tlab_capacity().
-  guarantee(thr != NULL, "No thread");
+  guarantee(thr != nullptr, "No thread");
   int lgrp_id = thr->lgrp_id();
   if (lgrp_id == -1) {
     if (lgrp_spaces()->length() > 0) {
@@ -213,7 +213,7 @@ size_t MutableNUMASpace::tlab_used(Thread *thr) const {
 
 size_t MutableNUMASpace::unsafe_max_tlab_alloc(Thread *thr) const {
   // Please see the comments for tlab_capacity().
-  guarantee(thr != NULL, "No thread");
+  guarantee(thr != nullptr, "No thread");
   int lgrp_id = thr->lgrp_id();
   if (lgrp_id == -1) {
     if (lgrp_spaces()->length() > 0) {
@@ -587,8 +587,8 @@ void MutableNUMASpace::initialize(MemRegion mr,
   if (!old_region.equals(region())) {
     new_region = MemRegion(rounded_bottom, rounded_end);
     MemRegion intersection = new_region.intersection(old_region);
-    if (intersection.start() == NULL ||
-        intersection.end() == NULL   ||
+    if (intersection.start() == nullptr ||
+        intersection.end() == nullptr   ||
         prev_page_size > page_size()) { // If the page size got smaller we have to change
                                         // the page size preference for the whole space.
       intersection = MemRegion(new_region.start(), new_region.start());
@@ -663,7 +663,7 @@ void MutableNUMASpace::initialize(MemRegion mr,
 
     MemRegion intersection = old_region.intersection(new_region);
 
-    if (intersection.start() == NULL || intersection.end() == NULL) {
+    if (intersection.start() == nullptr || intersection.end() == nullptr) {
       intersection = MemRegion(new_region.start(), new_region.start());
     }
 
@@ -783,19 +783,19 @@ HeapWord* MutableNUMASpace::cas_allocate(size_t size) {
   LGRPSpace *ls = lgrp_spaces()->at(i);
   MutableSpace *s = ls->space();
   HeapWord *p = s->cas_allocate(size);
-  if (p != NULL) {
+  if (p != nullptr) {
     size_t remainder = pointer_delta(s->end(), p + size);
     if (remainder < CollectedHeap::min_fill_size() && remainder > 0) {
       if (s->cas_deallocate(p, size)) {
         // We were the last to allocate and created a fragment less than
         // a minimal object.
-        p = NULL;
+        p = nullptr;
       } else {
         guarantee(false, "Deallocation should always succeed");
       }
     }
   }
-  if (p != NULL) {
+  if (p != nullptr) {
     HeapWord* cur_top, *cur_chunk_top = p + size;
     while ((cur_top = top()) < cur_chunk_top) { // Keep _top updated.
       if (Atomic::cmpxchg(top_addr(), cur_top, cur_chunk_top) == cur_top) {
@@ -805,12 +805,12 @@ HeapWord* MutableNUMASpace::cas_allocate(size_t size) {
   }
 
   // Make the page allocation happen here if there is no static binding.
-  if (p != NULL && !os::numa_has_static_binding() ) {
+  if (p != nullptr && !os::numa_has_static_binding() ) {
     for (HeapWord *i = p; i < p + size; i += os::vm_page_size() >> LogHeapWordSize) {
       *(int*)i = 0;
     }
   }
-  if (p == NULL) {
+  if (p == nullptr) {
     ls->set_allocation_failed();
   }
   return p;
@@ -911,7 +911,7 @@ void MutableNUMASpace::LGRPSpace::scan_pages(size_t page_size, size_t page_count
   char *s = scan_start;
   while (s < scan_end) {
     char *e = os::scan_pages(s, (char*)scan_end, &page_expected, &page_found);
-    if (e == NULL) {
+    if (e == nullptr) {
       break;
     }
     if (e != scan_end) {

src/hotspot/share/gc/parallel/mutableNUMASpace.hpp

@@ -88,7 +88,7 @@ class MutableNUMASpace : public MutableSpace {
     char* last_page_scanned()            { return _last_page_scanned; }
     void set_last_page_scanned(char* p)  { _last_page_scanned = p;    }
    public:
-    LGRPSpace(int l, size_t alignment) : _lgrp_id(l), _allocation_failed(false), _last_page_scanned(NULL) {
+    LGRPSpace(int l, size_t alignment) : _lgrp_id(l), _allocation_failed(false), _last_page_scanned(nullptr) {
       _space = new MutableSpace(alignment);
       _alloc_rate = new AdaptiveWeightedAverage(NUMAChunkResizeWeight);
     }
@@ -198,7 +198,7 @@ class MutableNUMASpace : public MutableSpace {
                           bool clear_space,
                           bool mangle_space,
                           bool setup_pages = SetupPages,
-                          WorkerThreads* pretouch_workers = NULL);
+                          WorkerThreads* pretouch_workers = nullptr);
   // Update space layout if necessary. Do all adaptive resizing job.
   virtual void update();
   // Update allocation rate averages.
@@ -223,7 +223,7 @@ class MutableNUMASpace : public MutableSpace {
   virtual size_t tlab_used(Thread* thr) const;
   virtual size_t unsafe_max_tlab_alloc(Thread* thr) const;
 
-  // Allocation (return NULL if full)
+  // Allocation (return null if full)
   virtual HeapWord* cas_allocate(size_t word_size);
 
   // Debugging

src/hotspot/share/gc/parallel/mutableSpace.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -36,12 +36,12 @@
 #include "utilities/macros.hpp"
 
 MutableSpace::MutableSpace(size_t alignment) :
-  _mangler(NULL),
+  _mangler(nullptr),
   _last_setup_region(),
   _alignment(alignment),
-  _bottom(NULL),
-  _top(NULL),
-  _end(NULL)
+  _bottom(nullptr),
+  _top(nullptr),
+  _end(nullptr)
 {
   assert(MutableSpace::alignment() % os::vm_page_size() == 0,
          "Space should be aligned");
@@ -203,7 +203,7 @@ HeapWord* MutableSpace::cas_allocate(size_t size) {
              "checking alignment");
       return obj;
     } else {
-      return NULL;
+      return nullptr;
     }
   } while (true);
 }
@@ -256,7 +256,7 @@ void MutableSpace::print_on(outputStream* st) const {
 void MutableSpace::verify() {
   HeapWord* p = bottom();
   HeapWord* t = top();
-  HeapWord* prev_p = NULL;
+  HeapWord* prev_p = nullptr;
   while (p < t) {
     oopDesc::verify(cast_to_oop(p));
     prev_p = p;

src/hotspot/share/gc/parallel/mutableSpace.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -101,7 +101,7 @@ class MutableSpace: public CHeapObj<mtGC> {
                           bool clear_space,
                           bool mangle_space,
                           bool setup_pages = SetupPages,
-                          WorkerThreads* pretouch_workers = NULL);
+                          WorkerThreads* pretouch_workers = nullptr);
 
   virtual void clear(bool mangle_space);
   virtual void update() { }
@@ -137,7 +137,7 @@ class MutableSpace: public CHeapObj<mtGC> {
   virtual size_t tlab_used(Thread* thr) const             { return used_in_bytes();                }
   virtual size_t unsafe_max_tlab_alloc(Thread* thr) const { return free_in_bytes();                }
 
-  // Allocation (return NULL if full)
+  // Allocation (return null if full)
   virtual HeapWord* cas_allocate(size_t word_size);
   // Optional deallocation. Used in NUMA-allocator.
   bool cas_deallocate(HeapWord *obj, size_t size);

src/hotspot/share/gc/parallel/parMarkBitMap.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -57,7 +57,7 @@ ParMarkBitMap::initialize(MemRegion covered_region)
   MemTracker::record_virtual_memory_type((address)rs.base(), mtGC);
 
   _virtual_space = new PSVirtualSpace(rs, page_sz);
-  if (_virtual_space != NULL && _virtual_space->expand_by(_reserved_byte_size)) {
+  if (_virtual_space != nullptr && _virtual_space->expand_by(_reserved_byte_size)) {
     _region_start = covered_region.start();
     _region_size = covered_region.word_size();
     BitMap::bm_word_t* map = (BitMap::bm_word_t*)_virtual_space->reserved_low_addr();
@@ -68,9 +68,9 @@ ParMarkBitMap::initialize(MemRegion covered_region)
 
   _region_start = 0;
   _region_size = 0;
-  if (_virtual_space != NULL) {
+  if (_virtual_space != nullptr) {
     delete _virtual_space;
-    _virtual_space = NULL;
+    _virtual_space = nullptr;
     // Release memory reserved in the space.
     rs.release();
   }

src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -31,7 +31,7 @@
 #include "utilities/bitMap.inline.hpp"
 
 inline ParMarkBitMap::ParMarkBitMap():
-  _region_start(NULL), _region_size(0), _beg_bits(), _end_bits(), _virtual_space(NULL), _reserved_byte_size(0)
+  _region_start(nullptr), _region_size(0), _beg_bits(), _end_bits(), _virtual_space(nullptr), _reserved_byte_size(0)
 { }
 
 inline void ParMarkBitMap::clear_range(idx_t beg, idx_t end) {