summaryrefslogtreecommitdiff
path: root/src/gc/env
diff options
context:
space:
mode:
authorDavid Wrighton <davidwr@microsoft.com>2019-05-15 18:28:42 -0700
committerGitHub <noreply@github.com>2019-05-15 18:28:42 -0700
commitbdb995987178231ba541f22143cb3cab56309daa (patch)
tree655d0d0bfaee70a56c5a2b33e52fc27965314049 /src/gc/env
parentc2533b6c3f715b6964de5ffe0b2a2feaac42b079 (diff)
downloadcoreclr-bdb995987178231ba541f22143cb3cab56309daa.tar.gz
coreclr-bdb995987178231ba541f22143cb3cab56309daa.tar.bz2
coreclr-bdb995987178231ba541f22143cb3cab56309daa.zip
Remove concept of AppDomains from the GC (#24536)
* Remove concept of AppDomains from the GC - Leave constructs allowing for multiple handle tables, as scenarios for that have been proposed - Remove FEATURE_APPDOMAIN_RESOURCE_MONITORING
Diffstat (limited to 'src/gc/env')
-rw-r--r--src/gc/env/etmdummy.h4
-rw-r--r--src/gc/env/gcenv.base.h18
-rw-r--r--src/gc/env/gcenv.ee.h6
3 files changed, 2 insertions, 26 deletions
diff --git a/src/gc/env/etmdummy.h b/src/gc/env/etmdummy.h
index 2b47a46e4e..f2c76d4b8d 100644
--- a/src/gc/env/etmdummy.h
+++ b/src/gc/env/etmdummy.h
@@ -47,7 +47,7 @@
#define FireEtwGCMarkHandles(HeapNum, ClrInstanceID) 0
#define FireEtwGCMarkOlderGenerationRoots(HeapNum, ClrInstanceID) 0
#define FireEtwFinalizeObject(TypeID, ObjectID, ClrInstanceID) 0
-#define FireEtwSetGCHandle(HandleID, ObjectID, Kind, Generation, AppDomainID, ClrInstanceID) 0
+#define FireEtwSetGCHandle(HandleID, ObjectID, Kind, Generation, ClrInstanceID) 0
#define FireEtwDestroyGCHandle(HandleID, ClrInstanceID) 0
#define FireEtwGCSampledObjectAllocationLow(Address, TypeID, ObjectCountForTypeSample, TotalSizeForTypeSample, ClrInstanceID) 0
#define FireEtwPinObjectAtGCTime(HandleID, ObjectID, ObjectSize, TypeName, ClrInstanceID) 0
@@ -376,7 +376,7 @@
#define FireEtwFailFast(FailFastUserMessage, FailedEIP, OSExitCode, ClrExitCode, ClrInstanceID) 0
#define FireEtwPrvFinalizeObject(TypeID, ObjectID, ClrInstanceID, TypeName) 0
#define FireEtwCCWRefCountChange(HandleID, ObjectID, COMInterfacePointer, NewRefCount, AppDomainID, ClassName, NameSpace, Operation, ClrInstanceID) 0
-#define FireEtwPrvSetGCHandle(HandleID, ObjectID, Kind, Generation, AppDomainID, ClrInstanceID) 0
+#define FireEtwPrvSetGCHandle(HandleID, ObjectID, Kind, Generation, ClrInstanceID) 0
#define FireEtwPrvDestroyGCHandle(HandleID, ClrInstanceID) 0
#define FireEtwFusionMessageEvent(ClrInstanceID, Prepend, Message) 0
#define FireEtwFusionErrorCodeEvent(ClrInstanceID, Category, ErrorCode) 0
diff --git a/src/gc/env/gcenv.base.h b/src/gc/env/gcenv.base.h
index 614b84ab23..46ad366e62 100644
--- a/src/gc/env/gcenv.base.h
+++ b/src/gc/env/gcenv.base.h
@@ -538,22 +538,4 @@ inline bool FitsInU1(uint64_t val)
return val == (uint64_t)(uint8_t)val;
}
-// -----------------------------------------------------------------------------------------------------------
-//
-// AppDomain emulation. The we don't have these in Redhawk so instead we emulate the bare minimum of the API
-// touched by the GC/HandleTable and pretend we have precisely one (default) appdomain.
-//
-
-#define RH_DEFAULT_DOMAIN_ID 1
-
-struct ADIndex
-{
- DWORD m_dwIndex;
-
- ADIndex () : m_dwIndex(RH_DEFAULT_DOMAIN_ID) {}
- explicit ADIndex (DWORD id) : m_dwIndex(id) {}
- BOOL operator==(const ADIndex& ad) const { return m_dwIndex == ad.m_dwIndex; }
- BOOL operator!=(const ADIndex& ad) const { return m_dwIndex != ad.m_dwIndex; }
-};
-
#endif // __GCENV_BASE_INCLUDED__
diff --git a/src/gc/env/gcenv.ee.h b/src/gc/env/gcenv.ee.h
index b9918ec5b7..819f64882a 100644
--- a/src/gc/env/gcenv.ee.h
+++ b/src/gc/env/gcenv.ee.h
@@ -71,7 +71,6 @@ public:
static void EnableFinalization(bool foundFinalizers);
static void HandleFatalError(unsigned int exitCode);
- static bool ShouldFinalizeObjectForUnload(void* pDomain, Object* obj);
static bool EagerFinalized(Object* obj);
static MethodTable* GetFreeObjectMethodTable();
static bool GetBooleanConfigValue(const char* key, bool* value);
@@ -85,12 +84,7 @@ public:
static void WalkAsyncPinned(Object* object, void* context, void(*callback)(Object*, Object*, void*));
static IGCToCLREventSink* EventSink();
- static uint32_t GetDefaultDomainIndex();
- static void *GetAppDomainAtIndex(uint32_t appDomainIndex);
- static bool AppDomainCanAccessHandleTable(uint32_t appDomainID);
- static uint32_t GetIndexOfAppDomainBeingUnloaded();
static uint32_t GetTotalNumSizedRefHandles();
- static bool AppDomainIsRudeUnload(void *appDomain);
static bool AnalyzeSurvivorsRequested(int condemnedGeneration);
static void AnalyzeSurvivorsFinished(int condemnedGeneration);