Register Class into Table (eclipse-openj9#19) (eclipse-openj9#23)

* Register Class into Table (eclipse-openj9#23) - register performed in createramclass - added register functions into internalfuncs - changed naming scheme Signed-off-by: akshayben <[email protected]>
tajila · Jun 28, 2019 · 4b8af86 · 4b8af86
1 parent 00ff7ee
commit 4b8af86
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 13 deletions.
diff --git a/runtime/oti/j9nonbuilder.h b/runtime/oti/j9nonbuilder.h
@@ -4784,6 +4784,12 @@ typedef struct J9InternalVMFunctions {
 	void ( *setNestmatesError)(struct J9VMThread *vmThread, struct J9Class *nestMember, struct J9Class *nestHost, IDATA errorCode);
 #endif /* J9VM_OPT_VALHALLA_NESTMATES */
 	BOOLEAN ( *areValueTypesEnabled)(struct J9JavaVM *vm);
+	void ( *registerClassLoader)(struct J9JavaVM* javaVM, struct J9ClassLoader* classLoader);
+	void ( *registerClass)(struct J9JavaVM* javaVM, struct J9Class* clazz);
+	void ( *registerCPEntry)(struct J9JavaVM* javaVM, struct J9ClassPathEntry* cpEntry);
+	void ( *deregisterClassLoader)(struct J9JavaVM* javaVM, struct J9ClassLoader* classLoader);
+	void ( *deregisterClass)(struct J9JavaVM* javaVM, struct J9Class* clazz);
+	void ( *deregisterCPEntry)(struct J9JavaVM* javaVM, struct J9ClassPathEntry* cpEntry);
 } J9InternalVMFunctions;
 
 /* Jazz 99339: define a new structure to replace JavaVM so as to pass J9NativeLibrary to JVMTIEnv  */

diff --git a/runtime/oti/jvmimage.h b/runtime/oti/jvmimage.h
@@ -48,7 +48,7 @@ typedef struct JVMImageHeader {
 	UDATA imageSize; /* image size in bytes */
 	uintptr_t imageAddress;
 	J9WSRP classLoaderTable;
-	J9WSRP classSegmentTable;
+	J9WSRP classTable;
 	J9WSRP classPathEntryTable;
 } JVMImageHeader;
 

diff --git a/runtime/oti/jvmimage_api.h b/runtime/oti/jvmimage_api.h
@@ -69,12 +69,12 @@ UDATA initializeJVMImage(J9JavaVM *javaVM);
 void registerClassLoader(J9JavaVM *javaVM, J9ClassLoader *classLoader);
 
 /*
-* Registers class segment in table
+* Registers class in table
 *
 * @param javaVM[in] the java vm
 * @param clazz[in] J9Class to register
 */
-void registerClassSegment(J9JavaVM *javaVM, J9Class *clazz);
+void registerClass(J9JavaVM *javaVM, J9Class *clazz);
 
 /*
 * Registers class path entry in table
@@ -93,12 +93,12 @@ void registerCPEntry(J9JavaVM *javaVM, J9ClassPathEntry *cpEntry);
 void deregisterClassLoader(J9JavaVM *javaVM, J9ClassLoader *classLoader);
 
 /*
-* Deregisters class segment from table
+* Deregisters class from table
 *
 * @param javaVM[in] the java vm
 * @param clazz[in] J9Class to register
 */
-void deregisterClassSegment(J9JavaVM *javaVM, J9Class *clazz);
+void deregisterClass(J9JavaVM *javaVM, J9Class *clazz);
 
 /*
 * Deregisters class path entry from table

diff --git a/runtime/vm/JVMImage.cpp b/runtime/vm/JVMImage.cpp
@@ -103,7 +103,7 @@ JVMImage::setupColdRun(void)
 	}
 
 	if ((NULL == allocateTable(getClassLoaderTable(), INITIAL_CLASSLOADER_TABLE_SIZE))
-		|| (NULL == allocateTable(getClassSegmentTable(), INITIAL_CLASS_TABLE_SIZE))
+		|| (NULL == allocateTable(getClassTable(), INITIAL_CLASS_TABLE_SIZE))
 		|| (NULL == allocateTable(getClassPathEntryTable(), INITIAL_CLASSPATH_TABLE_SIZE))) {
 		return IMAGE_ERROR;
 	}
@@ -151,11 +151,11 @@ bool
 JVMImage::allocateImageTableHeaders(void)
 {
 	WSRP_SET(_jvmImageHeader->classLoaderTable, subAllocateMemory(sizeof(ImageTableHeader)));
-	WSRP_SET(_jvmImageHeader->classSegmentTable, subAllocateMemory(sizeof(ImageTableHeader)));
+	WSRP_SET(_jvmImageHeader->classTable, subAllocateMemory(sizeof(ImageTableHeader)));
 	WSRP_SET(_jvmImageHeader->classPathEntryTable, subAllocateMemory(sizeof(ImageTableHeader)));
 
 	if ((0 == _jvmImageHeader->classLoaderTable)
-		|| (0 == _jvmImageHeader->classSegmentTable)
+		|| (0 == _jvmImageHeader->classTable)
 		|| (0 == _jvmImageHeader->classPathEntryTable)
 	) {
 		return false;
@@ -432,13 +432,13 @@ registerClassLoader(J9JavaVM *javaVM, J9ClassLoader *classLoader)
 }
 
 extern "C" void
-registerClassSegment(J9JavaVM *javaVM, J9Class *clazz)
+registerClass(J9JavaVM *javaVM, J9Class *clazz)
 {
 	IMAGE_ACCESS_FROM_JAVAVM(javaVM);
 
 	Assert_VM_notNull(jvmImage);
 
-	jvmImage->registerEntryInTable(jvmImage->getClassSegmentTable(), (UDATA)clazz);
+	jvmImage->registerEntryInTable(jvmImage->getClassTable(), (UDATA)clazz);
 }
 
 extern "C" void
@@ -462,13 +462,13 @@ deregisterClassLoader(J9JavaVM *javaVM, J9ClassLoader *classLoader)
 }
 
 extern "C" void
-deregisterClassSegment(J9JavaVM *javaVM, J9Class *clazz)
+deregisterClass(J9JavaVM *javaVM, J9Class *clazz)
 {
 	IMAGE_ACCESS_FROM_JAVAVM(javaVM);
 
 	Assert_VM_notNull(jvmImage);
 
-	jvmImage->deregisterEntryInTable(jvmImage->getClassSegmentTable(), (UDATA)clazz);
+	jvmImage->deregisterEntryInTable(jvmImage->getClassTable(), (UDATA)clazz);
 }
 
 extern "C" void

diff --git a/runtime/vm/JVMImage.hpp b/runtime/vm/JVMImage.hpp
@@ -92,7 +92,7 @@ class JVMImage
 	void destroyMonitor(void);
 
 	ImageTableHeader* getClassLoaderTable(void) { return WSRP_GET(_jvmImageHeader->classLoaderTable, ImageTableHeader*); }
-	ImageTableHeader* getClassSegmentTable(void) { return WSRP_GET(_jvmImageHeader->classSegmentTable, ImageTableHeader*); }
+	ImageTableHeader* getClassTable(void) { return WSRP_GET(_jvmImageHeader->classTable, ImageTableHeader*); }
 	ImageTableHeader* getClassPathEntryTable(void) { return WSRP_GET(_jvmImageHeader->classPathEntryTable, ImageTableHeader*); }
 };
 

diff --git a/runtime/vm/createramclass.cpp b/runtime/vm/createramclass.cpp
@@ -2930,6 +2930,7 @@ internalCreateRAMClassFromROMClass(J9VMThread *vmThread, J9ClassLoader *classLoa
 	J9FlattenedClassCache *flattenedClassCache = (J9FlattenedClassCache *) flattenedClassCacheBuffer;
 	PORT_ACCESS_FROM_VMC(vmThread);
 #endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
+	J9InternalVMFunctions const * const vmFuncs = javaVM->internalVMFunctions;
 
 	/* if this is an anon class classLoader should be anonClassLoader */
 	if (J9_ARE_ALL_BITS_SET(options, J9_FINDCLASS_FLAG_ANON)) {
@@ -3127,6 +3128,9 @@ internalCreateRAMClassFromROMClass(J9VMThread *vmThread, J9ClassLoader *classLoa
 #endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
 
 		result->classFlags = classFlags;
+		if (IS_COLD_RUN(javaVM)) {
+			vmFuncs->registerClass(javaVM, result);
+		}
 	}
 
 	return result;

diff --git a/runtime/vm/intfunc.c b/runtime/vm/intfunc.c
@@ -373,4 +373,10 @@ J9InternalVMFunctions J9InternalFunctions = {
 	setNestmatesError,
 #endif
 	areValueTypesEnabled,
+	registerClassLoader,
+	registerClass,
+	registerCPEntry,
+	deregisterClassLoader,
+	deregisterClass,
+	deregisterCPEntry,
 };