Merge pull request microsoft#123 from microsoft/dev/jander/d2m

Author: jander-msft

CHANGELOG.md

@@ -7,6 +7,10 @@ Please format the changes as follows:
 + BugFixes:
 + Updates:
 
+# 1.0.27
++ New:
+  + Added support for ICorProfilerInfo10
+
 # 1.0.26
 Same functionality as 1.0.25.
 

build/Version.props

@@ -12,7 +12,7 @@
     -->
     <SemanticVersionMajor>1</SemanticVersionMajor>
     <SemanticVersionMinor>0</SemanticVersionMinor>
-    <SemanticVersionPatch>26</SemanticVersionPatch>
+    <SemanticVersionPatch>27</SemanticVersionPatch>
 
     <FileVersionMajor>15</FileVersionMajor>
     <FileVersionMinor>1</FileVersionMinor>
@@ -38,7 +38,7 @@
       Update for every public release.
       Format is YYYY-MM-DD
     -->
-    <SemanticVersionDate>2019-08-01</SemanticVersionDate>
+    <SemanticVersionDate>2019-08-07</SemanticVersionDate>
 
     <!--
       Build version is used to distinguish internally built NuGet packages.

inc/clr/prof/corprof.h

@@ -0,0 +1 @@
+Source: https://github.com/dotnet/coreclr/blob/v3.0.0-preview8.19379.2/src/pal/prebuilt/inc/corprof.h

inc/clr/prof/corprof.txt

@@ -84,6 +84,7 @@ macro (build_init build_language build_type)
     # that part.
     include_directories(${REPOSITORY_ROOT}/bin/${CMAKE_BUILD_TYPE}/x64)
 
+    include_directories(${REPOSITORY_ROOT}/inc/clr/prof) # Must be ahead of Core CLR PAL
     include_directories(${REPOSITORY_ROOT}/src/unix/inc)
     include_directories(${REPOSITORY_ROOT}/src/unix/inc/atl)
     include_directories(${REPOSITORY_ROOT}/src/unix/inc/empty)

src/CMakeLists.txt

@@ -8,7 +8,7 @@
     <title>Microsoft Instrumentation Engine Headers</title>
     <authors>$authors$</authors>
     <owners>$authors$</owners>
-    <projectUrl>https://dotnet.microsoft.com</projectUrl>
+    <projectUrl>https://github.com/Microsoft/CLRInstrumentationEngine</projectUrl>
     <license type="file">$licenseFile$</license>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

src/InstrumentationEngine.NuGet.Headers/InstrumentationEngine.Headers.nuspec

@@ -8,7 +8,7 @@
     <title>Microsoft Instrumentation Engine</title>
     <authors>$authors$</authors>
     <owners>$authors$</owners>
-    <projectUrl>https://dotnet.microsoft.com</projectUrl>
+    <projectUrl>https://github.com/Microsoft/CLRInstrumentationEngine</projectUrl>
     <license type="file">$licenseFile$</license>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

src/InstrumentationEngine.NuGet/InstrumentationEngine.nuspec

@@ -67,6 +67,12 @@ MicrosoftInstrumentationEngine::CCorProfilerInfoWrapper::CCorProfilerInfoWrapper
     {
         return;
     }
+
+    hr = m_pRealCorProfilerInfo->QueryInterface(__uuidof(ICorProfilerInfo10), (LPVOID*)&m_pRealCorProfilerInfo10);
+    if (FAILED(hr))
+    {
+        return;
+    }
 }
 
 HRESULT MicrosoftInstrumentationEngine::CCorProfilerInfoWrapper::QueryInterface(
@@ -138,6 +144,12 @@ HRESULT MicrosoftInstrumentationEngine::CCorProfilerInfoWrapper::QueryInterface(
         *ppvObject = (ICorProfilerInfo9*)this;
         return S_OK;
     }
+    else if (riid == __uuidof(ICorProfilerInfo10) && m_pRealCorProfilerInfo10 != NULL)
+    {
+        AddRef();
+        *ppvObject = (ICorProfilerInfo10*)this;
+        return S_OK;
+    }
     return E_NOINTERFACE;
 }
 
@@ -1106,4 +1118,51 @@ HRESULT MicrosoftInstrumentationEngine::CCorProfilerInfoWrapper::GetCodeInfo4(
 {
     IfNullRet(m_pRealCorProfilerInfo9);
     return m_pRealCorProfilerInfo9->GetCodeInfo4(pNativeCodeStartAddress, cCodeInfos, pcCodeInfos, codeInfos);
+}
+
+// ICorProfilerInfo10
+HRESULT MicrosoftInstrumentationEngine::CCorProfilerInfoWrapper::EnumerateObjectReferences(
+    _In_ ObjectID objectId,
+    _In_ ObjectReferenceCallback callback,
+    _In_ void *clientData)
+{
+    IfNullRet(m_pRealCorProfilerInfo10);
+    return m_pRealCorProfilerInfo10->EnumerateObjectReferences(objectId, callback, clientData);
+}
+
+HRESULT MicrosoftInstrumentationEngine::CCorProfilerInfoWrapper::IsFrozenObject(
+    _In_ ObjectID objectId,
+    _Out_ BOOL *pbFrozen)
+{
+    IfNullRet(m_pRealCorProfilerInfo10);
+    return m_pRealCorProfilerInfo10->IsFrozenObject(objectId, pbFrozen);
+}
+
+HRESULT MicrosoftInstrumentationEngine::CCorProfilerInfoWrapper::GetLOHObjectSizeThreshold(
+    _Out_ DWORD *pThreshold)
+{
+    IfNullRet(m_pRealCorProfilerInfo10);
+    return m_pRealCorProfilerInfo10->GetLOHObjectSizeThreshold(pThreshold);
+}
+
+HRESULT MicrosoftInstrumentationEngine::CCorProfilerInfoWrapper::RequestReJITWithInliners(
+    _In_ DWORD dwRejitFlags,
+    _In_ ULONG cFunctions,
+    _In_reads_(cFunctions) ModuleID moduleIds[],
+    _In_reads_(cFunctions) mdMethodDef methodIds[])
+{
+    IfNullRet(m_pRealCorProfilerInfo10);
+    return m_pRealCorProfilerInfo10->RequestReJITWithInliners(dwRejitFlags, cFunctions, moduleIds, methodIds);
+}
+
+HRESULT MicrosoftInstrumentationEngine::CCorProfilerInfoWrapper::SuspendRuntime(void)
+{
+    IfNullRet(m_pRealCorProfilerInfo10);
+    return m_pRealCorProfilerInfo10->SuspendRuntime();
+}
+
+HRESULT MicrosoftInstrumentationEngine::CCorProfilerInfoWrapper::ResumeRuntime(void)
+{
+    IfNullRet(m_pRealCorProfilerInfo10);
+    return m_pRealCorProfilerInfo10->ResumeRuntime();
 }

src/InstrumentationEngine/CorProfilerInfoWrapper.cpp

@@ -12,7 +12,7 @@ namespace MicrosoftInstrumentationEngine
     class CProfilerManager;
 
     class CCorProfilerInfoWrapper :
-        public ICorProfilerInfo9
+        public ICorProfilerInfo10
     {
     private:
         LONG m_refcount;
@@ -26,6 +26,7 @@ namespace MicrosoftInstrumentationEngine
         CComPtr<ICorProfilerInfo7> m_pRealCorProfilerInfo7;
         CComPtr<ICorProfilerInfo8> m_pRealCorProfilerInfo8;
         CComPtr<ICorProfilerInfo9> m_pRealCorProfilerInfo9;
+        CComPtr<ICorProfilerInfo10> m_pRealCorProfilerInfo10;
 
         // Non-addref'd Back pointer the profiler manager.
         CProfilerManager* m_pProfilerManager;
@@ -613,5 +614,29 @@ namespace MicrosoftInstrumentationEngine
             _In_ ULONG32 cCodeInfos,
             _Out_ ULONG32 *pcCodeInfos,
             _Out_writes_(cCodeInfos) COR_PRF_CODE_INFO codeInfos[]);
+
+    // ICorProfilerInfo10
+    public:
+        STDMETHOD(EnumerateObjectReferences)(
+            _In_ ObjectID objectId,
+            _In_ ObjectReferenceCallback callback,
+            _In_ void *clientData);
+
+        STDMETHOD(IsFrozenObject)(
+            _In_ ObjectID objectId,
+            _Out_ BOOL *pbFrozen);
+
+        STDMETHOD(GetLOHObjectSizeThreshold)(
+            _Out_ DWORD *pThreshold);
+
+        STDMETHOD(RequestReJITWithInliners)(
+            _In_ DWORD dwRejitFlags,
+            _In_ ULONG cFunctions,
+            _In_reads_(cFunctions) ModuleID moduleIds[],
+            _In_reads_(cFunctions) mdMethodDef methodIds[]);
+
+        STDMETHOD(SuspendRuntime)(void);
+
+        STDMETHOD(ResumeRuntime)(void);
     };
 }