Atomically free romToRam hash table and mutex

Signed-off-by: Theresa Mammarella <[email protected]>
eclipse-openj9 · Sep 19, 2024 · 8936149 · 8936149
1 parent 5d69d48
commit 8936149
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/runtime/shared_common/shrinit.cpp b/runtime/shared_common/shrinit.cpp
@@ -4303,6 +4303,14 @@ j9shr_shutdown(J9JavaVM *vm)
 		if (config->jclCacheMutex) {
 			omrthread_monitor_destroy(config->jclCacheMutex);
 		}
+
+		if (compareAndSwapUDATA((uintptr_t *)&config->romToRamHashTable, (uintptr_t)romToRamHashTable, (uintptr_t)NULL)) {
+			config->romToRamHashTableMutex = NULL;
+			omrthread_rwmutex_enter_write(romToRamHashTableMutex);
+			hashTableFree(romToRamHashTable);
+			omrthread_rwmutex_exit_write(romToRamHashTableMutex);
+			omrthread_rwmutex_destroy(romToRamHashTableMutex);
+		}
 		j9mem_free_memory(config->sharedAPIObject);
 		j9mem_free_memory(config);
 
@@ -4329,16 +4337,6 @@ j9shr_shutdown(J9JavaVM *vm)
 		if (utfHashTable) {
 			hashTableFree(utfHashTable);
 		}
-		if (NULL != romToRamHashTable) {
-			omrthread_rwmutex_enter_write(romToRamHashTableMutex);
-			config->romToRamHashTable = NULL;
-			config->romToRamHashTableMutex = NULL;
-			if (romToRamHashTable) {
-				hashTableFree(romToRamHashTable);
-			}
-			omrthread_rwmutex_exit_write(romToRamHashTableMutex);
-			omrthread_rwmutex_destroy(romToRamHashTableMutex);
-		}
 
 		/* Kill the string farm */