Remove J9SHR_CACHELET_SUPPORT and J9SHR_CACHELETS_SAVE_READWRITE_AREA macro

This patch removes J9SHR_CACHELET_SUPPORT and J9SHR_CACHELETS_SAVE_READWRITE_AREA macro along with related code

Fixes #6652

Signed-off-by: Alexey Anufriev <contact@alexey-anufriev.com>

Author: alexey-anufriev

runtime/ddr/ddrcppsupportstructs.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2010, 2017 IBM Corp. and others
+# Copyright (c) 2010, 2020 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
@@ -66,13 +66,11 @@ CompositeCache.hpp,\
 CompositeCacheImpl.hpp,\
 hookhelpers.hpp,\
 Manager.hpp,\
-ManagerHintTable.hpp,\
 Managers.hpp,\
 OSCache.hpp,\
 OSCacheFile.hpp,\
 OSCachemmap.hpp,\
 OSCachesysv.hpp,\
-OSCachevmem.hpp,\
 ROMClassManager.hpp,\
 ROMClassManagerImpl.hpp,\
 ROMClassResourceManager.hpp,\

runtime/oti/shcflags.h

@@ -78,7 +78,7 @@
 #define J9SHR_RUNTIMEFLAG_ENABLE_NONFATAL  0x2000
 #define J9SHR_RUNTIMEFLAG_DO_DESTROY_CONFIG  0x4000
 #define J9SHR_RUNTIMEFLAG_BLOCK_SPACE_FULL  0x8000
-#define J9SHR_RUNTIMEFLAG_ENABLE_NESTED  0x10000
+// Available  0x10000
 #define J9SHR_RUNTIMEFLAG_ENABLE_AOT  0x20000
 #define J9SHR_RUNTIMEFLAG_ENABLE_PERSISTENT_CACHE  0x40000
 #define J9SHR_RUNTIMEFLAG_ENABLE_GROUP_ACCESS  0x80000

runtime/shared_common/ByteDataManagerImpl.cpp

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2019 IBM Corp. and others
+ * Copyright (c) 2001, 2020 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
@@ -489,63 +489,3 @@ SH_ByteDataManagerImpl::getUnindexedDataBytes()
 {
 	return _unindexedBytes;
 }
-
-
-#if defined(J9SHR_CACHELET_SUPPORT)
-
-/**
- * Walk the managed items hashtable in this cachelet. Allocate and populate an array
- * of hints, one for each hash entry.
- *
- * @param[in] self a data type manager
- * @param[in] vmthread the current VMThread
- * @param[out] hints a CacheletHints structure. This function fills in its
- * contents.
- *
- * @retval 0 success
- * @retval -1 failure
- */
-IDATA
-SH_ByteDataManagerImpl::createHintsForCachelet(J9VMThread* vmthread, SH_CompositeCache* cachelet, CacheletHints* hints)
-{
-	Trc_SHR_Assert_True(hints != NULL);
-
-	/* hints->dataType should have been set by the caller */
-	Trc_SHR_Assert_True(hints->dataType == _dataTypesRepresented[0]);
-	
-	return hllCollectHashes(vmthread, cachelet, hints);
-}
-
-/**
- * add a (_hashValue, cachelet) entry to the hash table
- * only called with hints of the right data type 
- *
- * each hint is a UDATA-length hash of a string
- */
-IDATA
-SH_ByteDataManagerImpl::primeHashtables(J9VMThread* vmthread, SH_CompositeCache* cachelet, U_8* hintsData, UDATA dataLength)
-{
-	UDATA* hashSlot = (UDATA*)hintsData;
-	UDATA hintCount = 0;
-
-	if ((dataLength == 0) || (hintsData == NULL)) {
-		return 0;
-	}
-
-	hintCount = dataLength / sizeof(UDATA);
-	while (hintCount-- > 0) {
-		Trc_SHR_BDMI_primeHashtables_addingHint(vmthread, cachelet, *hashSlot);
-		if (!_hints.addHint(vmthread, *hashSlot, cachelet)) {
-			/* If we failed to finish priming the hints, just give up.
-			 * Stuff should still work, just suboptimally.
-			 */
-			Trc_SHR_BDMI_primeHashtables_failedToPrimeHint(vmthread, this, cachelet, *hashSlot);
-			break;
-		}
-		++hashSlot;
-	}
-	
-	return 0;
-}
-
-#endif /* J9SHR_CACHELET_SUPPORT */

runtime/shared_common/ByteDataManagerImpl.hpp

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2017 IBM Corp. and others
+ * Copyright (c) 2001, 2020 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
@@ -94,12 +94,6 @@ class SH_ByteDataManagerImpl : public SH_ByteDataManager
 		BdLinkedListImpl* newBLL = (BdLinkedListImpl*)memForConstructor;
 		return (HashLinkedListImpl*) new(newBLL) BdLinkedListImpl();
 	}
-	
-#if defined(J9SHR_CACHELET_SUPPORT)
-	virtual bool canCreateHints() { return true; }
-	virtual IDATA createHintsForCachelet(J9VMThread* vmthread, SH_CompositeCache* cachelet, CacheletHints* hints);
-	virtual IDATA primeHashtables(J9VMThread* vmthread, SH_CompositeCache* cachelet, U_8* hintsData, UDATA datalength);
-#endif
 
 private:
 	J9Pool* _linkedListImplPool;

runtime/shared_common/CMakeLists.txt

@@ -34,13 +34,11 @@ j9vm_add_library(j9shrcommon STATIC
 	CompositeCache.cpp
 	hookhelpers.cpp
 	Manager.cpp
-	ManagerHintTable.cpp
 	Managers.cpp
 	OSCache.cpp
 	OSCacheFile.cpp
 	OSCachemmap.cpp
 	OSCachesysv.cpp
-	OSCachevmem.cpp
 	ROMClassManagerImpl.cpp
 	ROMClassResourceManager.cpp
 	SCImplementedAPI.cpp