Clean up CopyForwardScheme class #21072
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use consistent data types and code formatting Signed-off-by: lhu <[email protected]>
|
@amicic @dmitripivkine please review the changes, Thanks |
keithc-ca
requested changes
Feb 5, 2025
| { | ||
| return ((_heapBase <= (U_8 *)objectPtr) && (_heapTop > (U_8 *)objectPtr)); | ||
| return ((_heapBase <= (uint8_t *)objectPtr) && (_heapTop > (uint8_t *)objectPtr)); |
There was a problem hiding this comment.
The outermost parentheses are specifically unwanted; the OMR coding standard says
Do not enclose the return value in parentheses.
| @@ -705,14 +705,14 @@ MM_CopyForwardScheme::reinitCache(MM_EnvironmentVLHGC *env, MM_CopyScanCacheVLHG | |||
|
|
|||
| MM_HeapRegionDescriptorVLHGC * region = (MM_HeapRegionDescriptorVLHGC *)_regionManager->tableDescriptorForAddress(cache->cacheBase); | |||
| Trc_MM_CopyForwardScheme_reinitCache(env->getLanguageVMThread(), _regionManager->mapDescriptorToRegionTableIndex(region), cache, | |||
| region->getAllocationAgeSizeProduct() / (1024 * 1024) / (1024 * 1024), (double)((UDATA)cache->cacheAlloc - (UDATA)region->getLowAddress()) / (1024 * 1024)); | |||
| region->getAllocationAgeSizeProduct() / (1024 * 1024) / (1024 * 1024), (double)((uintptr_t)cache->cacheAlloc - (uintptr_t)region->getLowAddress()) / (1024 * 1024)); | |||
There was a problem hiding this comment.
Does this really want to work with TB (dividing by 1MB twice)?
| @@ -1284,7 +1284,7 @@ MM_CopyForwardScheme::copyAndForward(MM_EnvironmentVLHGC *env, MM_AllocationCont | |||
| /* Object has been copied - update the forwarding information and return */ | |||
| *objectPtrIndirect = objectPtr; | |||
| } else { | |||
| Assert_GC_true_with_message(env, (UDATA)0x99669966 == _extensions->objectModel.getPreservedClass(&forwardHeader)->eyecatcher, "Invalid class in objectPtr=%p\n", originalObjectPtr); | |||
| Assert_GC_true_with_message(env, (uintptr_t)0x9966uintptr_t== _extensions->objectModel.getPreservedClass(&forwardHeader)->eyecatcher, "Invalid class in objectPtr=%p\n", originalObjectPtr); | |||
There was a problem hiding this comment.
I don't expect this will compile. I don't think the second uintptr_t was intended here.
| UDATA *leafPtr = (UDATA *)J9GC_J9OBJECT_CLAZZ(objectPtr, env)->instanceLeafDescription; | ||
| UDATA leafBits; | ||
| uintptr_t *leafPtr = (uintptr_t *)J9GC_J9OBJECT_CLAZZ(objectPtr, env)->instanceLeafDescription; | ||
| UDATuintptr_tfBits; |
| @@ -2799,7 +2799,7 @@ MM_CopyForwardScheme::getNextWorkUnit(MM_EnvironmentVLHGC *env, UDATA preferredN | |||
| while (!isAnyScanWorkAvailable(env) && (doneIndex == _doneIndex)) { | |||
| #if defined(J9MODRON_TGC_PARALLEL_STATISTICS) | |||
| PORT_ACCESS_FROM_ENVIRONMENT(env); | |||
| U_64 waitEndTime, waitStartTime; | |||
| uint8_t waitEndTime, waitStartTime; | |||
There was a problem hiding this comment.
I think you meant uint64_t, and each local should be declared (and initialized separately).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use consistent data types and code formatting