diff options
| -rw-r--r-- | clr.coreclr.props | 1 | ||||
| -rw-r--r-- | clr.defines.targets | 2 | ||||
| -rw-r--r-- | clr.desktop.props | 1 | ||||
| -rw-r--r-- | src/mscorlib/model.xml | 11 | ||||
| -rw-r--r-- | src/mscorlib/src/System/AppDomain.cs | 106 |
5 files changed, 0 insertions, 121 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index 8862ed0763..ed5dd1a2ec 100644 --- a/clr.coreclr.props +++ b/clr.coreclr.props @@ -5,7 +5,6 @@ <DebuggingSupportedBuild>true</DebuggingSupportedBuild> <EnCSupported Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</EnCSupported> <EnableDownlevelForNls Condition="'$(CrossTargetArchitecture)' != ''">true</EnableDownlevelForNls> - <FeatureAppdomainResourceMonitoring>true</FeatureAppdomainResourceMonitoring> <FeatureArrayStubAsIL Condition="('$(TargetArch)' == 'arm') or ('$(TargetArch)' == 'amd64') or ('$(TargetArch)' == 'arm64')">true</FeatureArrayStubAsIL> <FeatureStubsAsIL Condition="'$(TargetArch)' == 'arm64'">true</FeatureStubsAsIL> <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport> diff --git a/clr.defines.targets b/clr.defines.targets index 7a6ff9f249..74b815f8db 100644 --- a/clr.defines.targets +++ b/clr.defines.targets @@ -4,7 +4,6 @@ <CDefines Condition="'$(DebuggingSupported)' == 'true'">$(CDefines);DEBUGGING_SUPPORTED</CDefines> <CDefines Condition="'$(EnCSupported)' == 'true'">$(CDefines);EnC_SUPPORTED</CDefines> <CDefines Condition="'$(EnableDownlevelForNls)' == 'true'">$(CDefines);ENABLE_DOWNLEVEL_FOR_NLS</CDefines> - <CDefines Condition="'$(FeatureAppdomainResourceMonitoring)' == 'true'">$(CDefines);FEATURE_APPDOMAIN_RESOURCE_MONITORING</CDefines> <CDefines Condition="'$(FeatureAppdomainmanagerInitoptions)' == 'true'">$(CDefines);FEATURE_APPDOMAINMANAGER_INITOPTIONS</CDefines> <CDefines Condition="'$(FeatureAppX)' == 'true'">$(CDefines);FEATURE_APPX</CDefines> <CDefines Condition="'$(FeatureAppXBinder)' == 'true'">$(CDefines);FEATURE_APPX_BINDER</CDefines> @@ -111,7 +110,6 @@ <DefineConstants Condition="'$(BuildTypeRet)' == 'true'">$(DefineConstants);BUILDTYPE_RET</DefineConstants> <DefineConstants Condition="'$(FeatureAppdomainmanagerInitoptions)' == 'true'">$(DefineConstants);FEATURE_APPDOMAINMANAGER_INITOPTIONS</DefineConstants> - <DefineConstants Condition="'$(FeatureAppdomainResourceMonitoring)' == 'true'">$(DefineConstants);FEATURE_APPDOMAIN_RESOURCE_MONITORING</DefineConstants> <DefineConstants Condition="'$(FeatureAppX)' == 'true'">$(DefineConstants);FEATURE_APPX</DefineConstants> <DefineConstants Condition="'$(FeatureAppXBinder)' == 'true'">$(DefineConstants);FEATURE_APPX_BINDER</DefineConstants> <DefineConstants Condition="'$(FeatureAptca)' == 'true'">$(DefineConstants);FEATURE_APTCA</DefineConstants> diff --git a/clr.desktop.props b/clr.desktop.props index de3f0634a6..d3768a8a64 100644 --- a/clr.desktop.props +++ b/clr.desktop.props @@ -4,7 +4,6 @@ <DebuggingSupportedBuild>true</DebuggingSupportedBuild> <EnCSupported Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</EnCSupported> <EnableDownlevelForNls>true</EnableDownlevelForNls> - <FeatureAppdomainResourceMonitoring>true</FeatureAppdomainResourceMonitoring> <FeatureAppdomainmanagerInitoptions>true</FeatureAppdomainmanagerInitoptions> <FeatureAppX>true</FeatureAppX> <FeatureAppXBinder>true</FeatureAppXBinder> diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml index c68b4114a2..a1673c37b3 100644 --- a/src/mscorlib/model.xml +++ b/src/mscorlib/model.xml @@ -87,17 +87,6 @@ </Type> <Type Status="ImplRoot" Name="System.AppDomain"> <Member Status="ImplRoot" Name="get_CurrentDomain" /> - <Member Status="ImplRoot" Name="get_MonitoringIsEnabled" /> - <Member Status="ImplRoot" Name="set_MonitoringIsEnabled(System.Boolean)" /> - <Member Status="ImplRoot" Name="get_MonitoringTotalProcessorTime" /> - <Member Status="ImplRoot" Name="get_MonitoringTotalAllocatedMemorySize" /> - <Member Status="ImplRoot" Name="get_MonitoringSurvivedMemorySize" /> - <Member Status="ImplRoot" Name="get_MonitoringSurvivedProcessMemorySize" /> - <Member Status="ImplRoot" MemberType="Property" Name="MonitoringIsEnabled" /> - <Member Status="ImplRoot" MemberType="Property" Name="MonitoringTotalProcessorTime" /> - <Member Status="ImplRoot" MemberType="Property" Name="MonitoringTotalAllocatedMemorySize" /> - <Member Status="ImplRoot" MemberType="Property" Name="MonitoringSurvivedMemorySize" /> - <Member Status="ImplRoot" MemberType="Property" Name="MonitoringSurvivedProcessMemorySize" /> <Member Status="ImplRoot" MemberType="Property" Name="IsFullyTrusted" /> <Member Status="ImplRoot" Name="GetData(System.String)" /> <Member Status="ImplRoot" Name="ToString" /> diff --git a/src/mscorlib/src/System/AppDomain.cs b/src/mscorlib/src/System/AppDomain.cs index 8d1e3cb5a9..84104563c5 100644 --- a/src/mscorlib/src/System/AppDomain.cs +++ b/src/mscorlib/src/System/AppDomain.cs @@ -1561,112 +1561,6 @@ namespace System [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] internal extern Int32 GetId(); -#if FEATURE_APPDOMAIN_RESOURCE_MONITORING - [MethodImplAttribute(MethodImplOptions.InternalCall)] - private static extern void nEnableMonitoring(); - - [MethodImplAttribute(MethodImplOptions.InternalCall)] - private static extern bool nMonitoringIsEnabled(); - - // return -1 if ARM is not supported. - [MethodImplAttribute(MethodImplOptions.InternalCall)] - private extern Int64 nGetTotalProcessorTime(); - - // return -1 if ARM is not supported. - [MethodImplAttribute(MethodImplOptions.InternalCall)] - private extern Int64 nGetTotalAllocatedMemorySize(); - - // return -1 if ARM is not supported. - [MethodImplAttribute(MethodImplOptions.InternalCall)] - private extern Int64 nGetLastSurvivedMemorySize(); - - // return -1 if ARM is not supported. - [MethodImplAttribute(MethodImplOptions.InternalCall)] - private static extern Int64 nGetLastSurvivedProcessMemorySize(); - - public static bool MonitoringIsEnabled - { - get { - return nMonitoringIsEnabled(); - } - - set { - if (value == false) - { - throw new ArgumentException(Environment.GetResourceString("Arg_MustBeTrue")); - } - else - { - nEnableMonitoring(); - } - } - } - - // Gets the total processor time for this AppDomain. - // Throws NotSupportedException if ARM is not enabled. - public TimeSpan MonitoringTotalProcessorTime - { - get { - Int64 i64ProcessorTime = nGetTotalProcessorTime(); - if (i64ProcessorTime == -1) - { - throw new InvalidOperationException(Environment.GetResourceString("InvalidOperation_WithoutARM")); - } - return new TimeSpan(i64ProcessorTime); - } - } - - // Gets the number of bytes allocated in this AppDomain since - // the AppDomain was created. - // Throws NotSupportedException if ARM is not enabled. - public Int64 MonitoringTotalAllocatedMemorySize - { - get { - Int64 i64AllocatedMemory = nGetTotalAllocatedMemorySize(); - if (i64AllocatedMemory == -1) - { - throw new InvalidOperationException(Environment.GetResourceString("InvalidOperation_WithoutARM")); - } - return i64AllocatedMemory; - } - } - - // Gets the number of bytes survived after the last collection - // that are known to be held by this AppDomain. After a full - // collection this number is accurate and complete. After an - // ephemeral collection this number is potentially incomplete. - // Throws NotSupportedException if ARM is not enabled. - public Int64 MonitoringSurvivedMemorySize - { - get { - Int64 i64LastSurvivedMemory = nGetLastSurvivedMemorySize(); - if (i64LastSurvivedMemory == -1) - { - throw new InvalidOperationException(Environment.GetResourceString("InvalidOperation_WithoutARM")); - } - return i64LastSurvivedMemory; - } - } - - // Gets the total bytes survived from the last collection. After - // a full collection this number represents the number of the bytes - // being held live in managed heaps. (This number should be close - // to the number obtained from GC.GetTotalMemory for a full collection.) - // After an ephemeral collection this number represents the number - // of bytes being held live in ephemeral generations. - // Throws NotSupportedException if ARM is not enabled. - public static Int64 MonitoringSurvivedProcessMemorySize - { - get { - Int64 i64LastSurvivedProcessMemory = nGetLastSurvivedProcessMemorySize(); - if (i64LastSurvivedProcessMemory == -1) - { - throw new InvalidOperationException(Environment.GetResourceString("InvalidOperation_WithoutARM")); - } - return i64LastSurvivedProcessMemory; - } - } -#endif } /// <summary> |