Debug

Signed-off-by: lhu <linhu@ca.ibm.com>

Author: LinHu2016

runtime/gc_base/IndexableObjectAllocationModel.cpp

@@ -389,6 +389,11 @@ MM_IndexableObjectAllocationModel::getSparseAddressAndDecommitLeaves(MM_Environm
 
 		byteAmount = _dataSize;
 		void *virtualLargeObjectHeapAddress = extensions->largeObjectVirtualMemory->allocateSparseFreeEntryAndMapToHeapObject(spine, byteAmount);
+
+		PORT_ACCESS_FROM_ENVIRONMENT(env);
+		j9tty_printf(PORTLIB, "allocateSparseFreeEntryAndMapToHeapObject spine=%p, byteAmount=%zu\n", spine, byteAmount);
+
+
 		if (NULL != virtualLargeObjectHeapAddress) {
 			indexableObjectModel->setDataAddrForContiguous((J9IndexableObject *)spine, virtualLargeObjectHeapAddress);
 		} else {

runtime/gc_vlhgc/CopyForwardScheme.cpp

@@ -4172,6 +4172,10 @@ class MM_CopyForwardSchemeRootClearer : public MM_RootScanner
 				env->_copyForwardStats._offHeapRegionsCleared += 1;
 				void *dataAddr = _extensions->indexableObjectModel.getDataAddrForContiguous((J9IndexableObject *)objectPtr);
 				_extensions->largeObjectVirtualMemory->freeSparseRegionAndUnmapFromHeapObject(_env, dataAddr, objectPtr, _extensions->indexableObjectModel.getDataSizeInBytes((J9IndexableObject *)objectPtr));
+
+				PORT_ACCESS_FROM_ENVIRONMENT(env);
+				j9tty_printf(PORTLIB, "doObjectInVirtualLargeObjectHeap-copyf freeSparseRegionAndUnmapFromHeapObject objectPtr=%p, byteAmount=%zu\n", objectPtr, _extensions->indexableObjectModel.getDataSizeInBytes((J9IndexableObject *)objectPtr));
+
 			} else {
 				void *dataAddr = _extensions->indexableObjectModel.getDataAddrForContiguous((J9IndexableObject *)fwdOjectPtr);
 				if (NULL != dataAddr) {
@@ -4184,6 +4188,10 @@ class MM_CopyForwardSchemeRootClearer : public MM_RootScanner
 							_extensions->indexableObjectModel.getDataSizeInBytes((J9IndexableObject *)fwdOjectPtr),
 							fwdOjectPtr
 					);
+
+					PORT_ACCESS_FROM_ENVIRONMENT(env);
+					j9tty_printf(PORTLIB, "doObjectInVirtualLargeObjectHeap-copyf updateSparseDataEntryAfterObjectHasMoved objectPtr=%p, fwdOjectPtr=%p, byteAmount=%zu\n", objectPtr, fwdOjectPtr, _extensions->indexableObjectModel.getDataSizeInBytes((J9IndexableObject *)fwdOjectPtr));
+
 				}
 			}
 		}

runtime/gc_vlhgc/GlobalMarkingScheme.cpp

@@ -1420,6 +1420,10 @@ class MM_GlobalMarkingSchemeRootClearer : public MM_RootScanner
 			void *dataAddr = _extensions->indexableObjectModel.getDataAddrForContiguous((J9IndexableObject *)objectPtr);
 			if (NULL != dataAddr) {
 				_extensions->largeObjectVirtualMemory->freeSparseRegionAndUnmapFromHeapObject(_env, dataAddr, objectPtr, _extensions->indexableObjectModel.getDataSizeInBytes((J9IndexableObject *)objectPtr));
+
+				PORT_ACCESS_FROM_ENVIRONMENT(env);
+				j9tty_printf(PORTLIB, "doObjectInVirtualLargeObjectHeap-global freeSparseRegionAndUnmapFromHeapObject objectPtr=%p, byteAmount=%zu\n", objectPtr, _extensions->indexableObjectModel.getDataSizeInBytes((J9IndexableObject *)objectPtr));
+
 			}
 		}
 	}

runtime/gc_vlhgc/ParallelSweepSchemeVLHGC.cpp

@@ -1029,10 +1029,20 @@ MM_ParallelSweepSchemeVLHGC::recycleFreeRegions(MM_EnvironmentVLHGC *env)
 			sparseDataEntry = (MM_SparseDataTableEntry *)hashTableNextDo(&walkState);
 		}
 
-		while ((arrayletLeafCount > 0) && (NULL != (region = regionIterator.nextRegion()))) {
-			if (region->isArrayletLeaf()) {
+		while (NULL != (region = regionIterator.nextRegion())) {
+			if (region->isArrayletLeaf() && (arrayletLeafCount > 0)) {
 				region->getSubSpace()->recycleRegion(env, region);
 				arrayletLeafCount -= 1;
+			} else if (!region->_sweepData._alreadySwept && region->hasValidMarkMap()) {
+				MM_MemoryPool *regionPool = region->getMemoryPool();
+				Assert_MM_true(NULL != regionPool);
+				/* recycle if empty */
+				if (region->getSize() == regionPool->getActualFreeMemorySize()) {
+					Assert_MM_true(NULL == region->_allocateData.getSpine());
+					Assert_MM_true(NULL == region->_allocateData.getNextArrayletLeafRegion());
+					region->getSubSpace()->recycleRegion(env, region);
+				}
+
 			}
 		}
 		Assert_MM_true(0 == arrayletLeafCount);

runtime/gc_vlhgc/WriteOnceCompactor.cpp

@@ -1613,7 +1613,7 @@ MM_WriteOnceCompactor::flushRememberedSetIntoCardTable(MM_EnvironmentVLHGC *env)
 void
 MM_WriteOnceCompactor::tagArrayletLeafRegionsForFixup(MM_EnvironmentVLHGC *env)
 {
-	if (!_extensions->isVirtualLargeObjectHeapEnabled) {
+//	if (!_extensions->isVirtualLargeObjectHeapEnabled) {
 		GC_HeapRegionIteratorVLHGC regionIterator(_regionManager);
 		MM_HeapRegionDescriptorVLHGC *region = NULL;
 		while (NULL != (region = regionIterator.nextRegion())) {
@@ -1651,7 +1651,7 @@ MM_WriteOnceCompactor::tagArrayletLeafRegionsForFixup(MM_EnvironmentVLHGC *env)
 				}
 			}
 		}
-	}
+//	}
 }
 
 class MM_WriteOnceCompactFixupRoots : public MM_RootScanner {
@@ -1731,6 +1731,10 @@ class MM_WriteOnceCompactFixupRoots : public MM_RootScanner {
 				 * failure (reason why this GC cycle is happening).
 				 */
 				_extensions->largeObjectVirtualMemory->updateSparseDataEntryAfterObjectHasMoved(dataAddr, objectPtr, _extensions->indexableObjectModel.getDataSizeInBytes((J9IndexableObject *)fwdOjectPtr), fwdOjectPtr);
+
+				PORT_ACCESS_FROM_ENVIRONMENT(env);
+				j9tty_printf(PORTLIB, "doObjectInVirtualLargeObjectHeap-Compactor updateSparseDataEntryAfterObjectHasMoved objectPtr=%p, fwdOjectPtr=%p, byteAmount=%zu\n", objectPtr, fwdOjectPtr, _extensions->indexableObjectModel.getDataSizeInBytes((J9IndexableObject *)fwdOjectPtr));
+
 			}
 		}
 	}