Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename J9VMGCRememberedSet to MM_GCRememberedSet #4505

Merged
merged 1 commit into from Jan 30, 2019
Merged

Rename J9VMGCRememberedSet to MM_GCRememberedSet #4505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions runtime/compiler/env/VMJ9.cpp
View file
Open in desktop
Expand Up @@ -1687,7 +1687,7 @@ TR_J9VMBase::getFragmentParentOffset()
{

#if defined(J9VM_GC_REALTIME)
return offsetof(J9VMGCRememberedSetFragment, fragmentParent);
return offsetof(MM_GCRememberedSetFragment, fragmentParent);
#endif
return 0;
}
Expand All @@ -1696,7 +1696,7 @@ UDATA
TR_J9VMBase::getRememberedSetGlobalFragmentOffset()
{
#if defined(J9VM_GC_REALTIME)
return offsetof(J9VMGCRememberedSet, globalFragmentIndex);
return offsetof(MM_GCRememberedSet, globalFragmentIndex);
#endif
return 0;
}
Expand All @@ -1705,7 +1705,7 @@ UDATA
TR_J9VMBase::getLocalFragmentOffset()
{
#if defined(J9VM_GC_REALTIME)
return offsetof(J9VMGCRememberedSetFragment, localFragmentIndex);
return offsetof(MM_GCRememberedSetFragment, localFragmentIndex);
#endif
return 0;
}
Expand Down
10 changes: 5 additions & 5 deletions runtime/gc_include/ObjectAccessBarrierAPI.hpp
View file
Open in desktop
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 1991, 2018 IBM Corp. and others
* Copyright (c) 1991, 2019 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -2683,8 +2683,8 @@ class MM_ObjectAccessBarrierAPI
internalPreStoreObjectSATB(J9VMThread *vmThread, j9object_t object, fj9object_t *destAddress, j9object_t value)
{
#if defined(J9VM_GC_REALTIME)
J9VMGCRememberedSetFragment *fragment = &vmThread->sATBBarrierRememberedSetFragment;
J9VMGCRememberedSet *parent = fragment->fragmentParent;
MM_GCRememberedSetFragment *fragment = &vmThread->sATBBarrierRememberedSetFragment;
MM_GCRememberedSet *parent = fragment->fragmentParent;
/* Check if the barrier is enabled. No work if barrier is not enabled */
if (0 != parent->globalFragmentIndex) {
/* if the double barrier is enabled call OOL */
Expand Down Expand Up @@ -2714,8 +2714,8 @@ class MM_ObjectAccessBarrierAPI
internalStaticPreStoreObjectSATB(J9VMThread *vmThread, j9object_t object, j9object_t *destAddress, j9object_t value)
{
#if defined(J9VM_GC_REALTIME)
J9VMGCRememberedSetFragment *fragment = &vmThread->sATBBarrierRememberedSetFragment;
J9VMGCRememberedSet *parent = fragment->fragmentParent;
MM_GCRememberedSetFragment *fragment = &vmThread->sATBBarrierRememberedSetFragment;
MM_GCRememberedSet *parent = fragment->fragmentParent;
/* Check if the barrier is enabled. No work if barrier is not enabled */
if (0 != parent->globalFragmentIndex) {
/* if the double barrier is enabled call OOL */
Expand Down
12 changes: 2 additions & 10 deletions runtime/oti/j9nonbuilder.h
View file
Open in desktop
Expand Up @@ -2723,14 +2723,6 @@ typedef struct J9VMGCSegregatedAllocationCacheEntry {

#endif /* J9VM_GC_REALTIME */

#if defined(J9VM_GC_STACCATO)

typedef MM_GCRememberedSet J9VMGCRememberedSet;

typedef MM_GCRememberedSetFragment J9VMGCRememberedSetFragment;

#endif /* J9VM_GC_STACCATO */

#if defined(J9VM_GC_THREAD_LOCAL_HEAP)

typedef struct J9GCVMInfo {
Expand Down Expand Up @@ -4826,8 +4818,8 @@ typedef struct J9VMThread {
struct J9StackWalkState* stackWalkState;
struct J9VMEntryLocalStorage* entryLocalStorage;
UDATA gpProtected;
J9VMGCSublistFragment gcRememberedSet;
J9VMGCRememberedSetFragment sATBBarrierRememberedSetFragment;
struct J9VMGCSublistFragment gcRememberedSet;
struct MM_GCRememberedSetFragment sATBBarrierRememberedSetFragment;
void* gcTaskListPtr;
UDATA* dropBP;
UDATA dropFlags;
Expand Down