Emit ICorProfiler ModuleLoadFinished for dynamic modules#77068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davmason merged 3 commits into from
Oct 17, 2022
Merged

Emit ICorProfiler ModuleLoadFinished for dynamic modules #77068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1b4e45
Fix 76016
davmason Oct 14, 2022
76b4c9e
fix test
davmason Oct 14, 2022
a3bccff
Update moduleload.h
davmason Oct 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/coreclr/vm/domainassembly.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -810,6 +810,14 @@ void DomainAssembly::DeliverSyncEvents()

GetModule()->NotifyEtwLoadFinished(S_OK);

#ifdef PROFILING_SUPPORTED
if (!IsProfilerNotified())
{
SetProfilerNotified();
GetModule()->NotifyProfilerLoadFinished(S_OK);
}
#endif

#ifdef DEBUGGING_SUPPORTED
GCX_COOP();
if (!IsDebuggerNotified())
Expand Down
1 change: 1 addition & 0 deletions src/tests/profiler/native/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ set(SOURCES
handlesprofiler/handlesprofiler.cpp
inlining/inlining.cpp
metadatagetdispenser/metadatagetdispenser.cpp
moduleload/moduleload.cpp
multiple/multiple.cpp
nullprofiler/nullprofiler.cpp
rejitprofiler/rejitprofiler.cpp
Expand Down
5 changes: 5 additions & 0 deletions src/tests/profiler/native/classfactory.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
#include "transitions/transitions.h"
#include "multiple/multiple.h"
#include "inlining/inlining.h"
#include "moduleload/moduleload.h"

ClassFactory::ClassFactory(REFCLSID clsid) : refCount(0), clsid(clsid)
{
Expand DownExpand Up@@ -124,6 +125,10 @@ HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown *pUnkOuter, REFI
{
profiler = new HandlesProfiler();
}
else if (clsid == ModuleLoad::GetClsid())
{
profiler = new ModuleLoad();
}
else
{
printf("No profiler found in ClassFactory::CreateInstance. Did you add your profiler to the list?\n");
Expand Down
95 changes: 95 additions & 0 deletions src/tests/profiler/native/moduleload/moduleload.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#include "moduleload.h"

GUID ModuleLoad::GetClsid()
{
// {1774B2E5-028B-4FA8-9DE5-26218CBCBBAC }
GUID clsid = {0x1774b2e5, 0x028b, 0x4fa8, {0x9d, 0xe5, 0x26, 0x21, 0x8c, 0xbc, 0xbb, 0xac}};
return clsid;
}

HRESULT ModuleLoad::InitializeCommon(IUnknown* pICorProfilerInfoUnk)
{
Profiler::Initialize(pICorProfilerInfoUnk);

HRESULT hr = S_OK;
printf("Setting exception mask\n");
if (FAILED(hr = pCorProfilerInfo->SetEventMask2(COR_PRF_MONITOR_MODULE_LOADS | COR_PRF_MONITOR_ASSEMBLY_LOADS, 0)))
{
_failures++;
printf("FAIL: ICorProfilerInfo::SetEventMask2() failed hr=0x%x", hr);
return hr;
}

return S_OK;
}

HRESULT ModuleLoad::Initialize(IUnknown* pICorProfilerInfoUnk)
{
return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData)
{
return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::LoadAsNotificationOnly(BOOL *pbNotificationOnly)
{
*pbNotificationOnly = TRUE;
return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadStarted(AssemblyID assemblyId)
{
_assemblyLoadStartedCount++;
return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus)
{
_assemblyLoadFinishedCount++;
return S_OK;
}

HRESULT ModuleLoad::ModuleLoadStarted(ModuleID moduleId)
{
_moduleLoadStartedCount++;
return S_OK;
}

HRESULT ModuleLoad::ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus)
{
_moduleLoadFinishedCount++;
return S_OK;
}


HRESULT ModuleLoad::Shutdown()
{
Profiler::Shutdown();

if(_failures == 0
&& (_moduleLoadStartedCount != 0)
&& (_assemblyLoadStartedCount != 0)
&& (_moduleLoadStartedCount == _moduleLoadFinishedCount)
&& (_assemblyLoadStartedCount == _assemblyLoadFinishedCount))
{
printf("PROFILER TEST PASSES\n");
}
else
{
printf("PROFILER TEST FAILED, failures=%d moduleLoadStarted=%d moduleLoadFinished=%d assemblyLoadStarted=%d assemblyLoadFinished=%d\n",
_failures.load(),
_moduleLoadStartedCount.load(),
_moduleLoadFinishedCount.load(),
_assemblyLoadStartedCount.load(),
_assemblyLoadFinishedCount.load());
}

fflush(stdout);

return S_OK;
}
42 changes: 42 additions & 0 deletions src/tests/profiler/native/moduleload/moduleload.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#pragma once

#include "../profiler.h"

class ModuleLoad : public Profiler
{
public:

ModuleLoad() :
Profiler(),
_assemblyLoadStartedCount(0),
_assemblyLoadFinishedCount(0),
_moduleLoadStartedCount(0),
_moduleLoadFinishedCount(0),
_failures(0)
{

}

static GUID GetClsid();
virtual HRESULT STDMETHODCALLTYPE Initialize(IUnknown* pICorProfilerInfoUnk);
virtual HRESULT STDMETHODCALLTYPE InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData);
virtual HRESULT STDMETHODCALLTYPE Shutdown();
virtual HRESULT STDMETHODCALLTYPE LoadAsNotificationOnly(BOOL *pbNotificationOnly);

virtual HRESULT STDMETHODCALLTYPE AssemblyLoadStarted(AssemblyID assemblyId);
virtual HRESULT STDMETHODCALLTYPE AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus);
virtual HRESULT STDMETHODCALLTYPE ModuleLoadStarted(ModuleID moduleId);
virtual HRESULT STDMETHODCALLTYPE ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus);

private:
std::atomic<int> _assemblyLoadStartedCount;
std::atomic<int> _assemblyLoadFinishedCount;
std::atomic<int> _moduleLoadStartedCount;
std::atomic<int> _moduleLoadFinishedCount;
std::atomic<int> _failures;

HRESULT InitializeCommon(IUnknown* pCorProfilerInfoUnk);
};
46 changes: 46 additions & 0 deletions src/tests/profiler/unittest/moduleload.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;
using System.Reflection;
using System.Reflection.Emit;

namespace Profiler.Tests
{
class ModuleLoadTest
{
private static readonly Guid ModuleLoadGuid = new Guid("1774B2E5-028B-4FA8-9DE5-26218CBCBBAC");

public static int RunTest(string[] args)
{
var type = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName("TestAssembly"), AssemblyBuilderAccess.Run)
.DefineDynamicModule("TestModule")
.DefineType("TestClass", TypeAttributes.Public)
.CreateType();

var obj = Activator.CreateInstance(type);
if (obj == null)
{
throw new NullReferenceException();
}

return 100;
}

public static int Main(string[] args)
{
if (args.Length > 0 && args[0].Equals("RunTest", StringComparison.OrdinalIgnoreCase))
{
return RunTest(args);
}

return ProfilerTestRunner.Run(profileePath: System.Reflection.Assembly.GetExecutingAssembly().Location,
testName: "UnitTestModuleLoad",
profilerClsid: ModuleLoadGuid);
}
}
}
20 changes: 20 additions & 0 deletions src/tests/profiler/unittest/moduleload.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
<OutputType>exe</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- This test provides no interesting scenarios for GCStress -->
<GCStressIncompatible>true</GCStressIncompatible>
<!-- The test launches a secondary process and process launch creates
an infinite event loop in the SocketAsyncEngine on Linux. Since
runincontext loads even framework assemblies into the unloadable
context, locals in this loop prevent unloading -->
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="../common/profiler_common.csproj" />
<CMakeProjectReference Include="$(MSBuildThisFileDirectory)/../native/CMakeLists.txt" />
</ItemGroup>
</Project>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Emit ICorProfiler ModuleLoadFinished for dynamic modules#77068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

davmason
merged 3 commits into

from

Oct 17, 2022
 Merged


Emit ICorProfiler ModuleLoadFinished for dynamic modules
#77068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f1b4e45

Fix 76016


davmason Oct 14, 2022
76b4c9e

fix test


davmason Oct 14, 2022
a3bccff

Update moduleload.h


davmason Oct 15, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
src/coreclr/vm/domainassembly.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -810,6 +810,14 @@ void DomainAssembly::DeliverSyncEvents()

 GetModule()->NotifyEtwLoadFinished(S_OK);

#ifdef PROFILING_SUPPORTED
 if (!IsProfilerNotified())
 {
 SetProfilerNotified();
 GetModule()->NotifyProfilerLoadFinished(S_OK);
 }
#endif

#ifdef DEBUGGING_SUPPORTED
 GCX_COOP();
 if (!IsDebuggerNotified())
Expand Down

1 change: 1 addition & 0 deletions
src/tests/profiler/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ set(SOURCES
 handlesprofiler/handlesprofiler.cpp
 inlining/inlining.cpp
 metadatagetdispenser/metadatagetdispenser.cpp
 moduleload/moduleload.cpp
 multiple/multiple.cpp
 nullprofiler/nullprofiler.cpp
 rejitprofiler/rejitprofiler.cpp
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/profiler/native/classfactory.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
#include "transitions/transitions.h"
#include "multiple/multiple.h"
#include "inlining/inlining.h"
#include "moduleload/moduleload.h"

ClassFactory::ClassFactory(REFCLSID clsid) : refCount(0), clsid(clsid)
{
Expand DownExpand Up@@ -124,6 +125,10 @@ HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown *pUnkOuter, REFI
 {
 profiler = new HandlesProfiler();
 }
 else if (clsid == ModuleLoad::GetClsid())
 {
 profiler = new ModuleLoad();
 }
 else
 {
 printf("No profiler found in ClassFactory::CreateInstance. Did you add your profiler to the list?\n");
Expand Down

95 changes: 95 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#include "moduleload.h"

GUID ModuleLoad::GetClsid()
{
 // {1774B2E5-028B-4FA8-9DE5-26218CBCBBAC }
 GUID clsid = {0x1774b2e5, 0x028b, 0x4fa8, {0x9d, 0xe5, 0x26, 0x21, 0x8c, 0xbc, 0xbb, 0xac}};
 return clsid;
}

HRESULT ModuleLoad::InitializeCommon(IUnknown* pICorProfilerInfoUnk)
{
 Profiler::Initialize(pICorProfilerInfoUnk);

 HRESULT hr = S_OK;
 printf("Setting exception mask\n");
 if (FAILED(hr = pCorProfilerInfo->SetEventMask2(COR_PRF_MONITOR_MODULE_LOADS | COR_PRF_MONITOR_ASSEMBLY_LOADS, 0)))
 {
 _failures++;
 printf("FAIL: ICorProfilerInfo::SetEventMask2() failed hr=0x%x", hr);
 return hr;
 }

 return S_OK;
}

HRESULT ModuleLoad::Initialize(IUnknown* pICorProfilerInfoUnk)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::LoadAsNotificationOnly(BOOL *pbNotificationOnly)
{
 *pbNotificationOnly = TRUE;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadStarted(AssemblyID assemblyId)
{
 _assemblyLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus)
{
 _assemblyLoadFinishedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadStarted(ModuleID moduleId)
{
 _moduleLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus)
{
 _moduleLoadFinishedCount++;
 return S_OK;
}


HRESULT ModuleLoad::Shutdown()
{
 Profiler::Shutdown();

 if(_failures == 0 
 && (_moduleLoadStartedCount != 0)
 && (_assemblyLoadStartedCount != 0)
 && (_moduleLoadStartedCount == _moduleLoadFinishedCount)
 && (_assemblyLoadStartedCount == _assemblyLoadFinishedCount))
 {
 printf("PROFILER TEST PASSES\n");
 }
 else
 {
 printf("PROFILER TEST FAILED, failures=%d moduleLoadStarted=%d moduleLoadFinished=%d assemblyLoadStarted=%d assemblyLoadFinished=%d\n",
 _failures.load(),
 _moduleLoadStartedCount.load(),
 _moduleLoadFinishedCount.load(),
 _assemblyLoadStartedCount.load(),
 _assemblyLoadFinishedCount.load());
 }

 fflush(stdout);

 return S_OK;
}

42 changes: 42 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#pragma once

#include "../profiler.h"

class ModuleLoad : public Profiler
{
public:

 ModuleLoad() : 
 Profiler(),
 _assemblyLoadStartedCount(0),
 _assemblyLoadFinishedCount(0),
 _moduleLoadStartedCount(0),
 _moduleLoadFinishedCount(0),
 _failures(0)
 {

 }

 static GUID GetClsid();
 virtual HRESULT STDMETHODCALLTYPE Initialize(IUnknown* pICorProfilerInfoUnk);
 virtual HRESULT STDMETHODCALLTYPE InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData);
 virtual HRESULT STDMETHODCALLTYPE Shutdown();
 virtual HRESULT STDMETHODCALLTYPE LoadAsNotificationOnly(BOOL *pbNotificationOnly);

 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadStarted(AssemblyID assemblyId);
 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadStarted(ModuleID moduleId);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus);

private:
 std::atomic<int> _assemblyLoadStartedCount;
 std::atomic<int> _assemblyLoadFinishedCount;
 std::atomic<int> _moduleLoadStartedCount;
 std::atomic<int> _moduleLoadFinishedCount;
 std::atomic<int> _failures;

 HRESULT InitializeCommon(IUnknown* pCorProfilerInfoUnk);
};

46 changes: 46 additions & 0 deletions
src/tests/profiler/unittest/moduleload.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;
using System.Reflection;
using System.Reflection.Emit;

namespace Profiler.Tests
{
 class ModuleLoadTest
 {
 private static readonly Guid ModuleLoadGuid = new Guid("1774B2E5-028B-4FA8-9DE5-26218CBCBBAC");

 public static int RunTest(string[] args)
 {
 var type = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName("TestAssembly"), AssemblyBuilderAccess.Run)
 .DefineDynamicModule("TestModule")
 .DefineType("TestClass", TypeAttributes.Public)
 .CreateType();

 var obj = Activator.CreateInstance(type);
 if (obj == null)
 {
 throw new NullReferenceException();
 }

 return 100;
 }

 public static int Main(string[] args)
 {
 if (args.Length > 0 && args[0].Equals("RunTest", StringComparison.OrdinalIgnoreCase))
 {
 return RunTest(args);
 }

 return ProfilerTestRunner.Run(profileePath: System.Reflection.Assembly.GetExecutingAssembly().Location,
 testName: "UnitTestModuleLoad",
 profilerClsid: ModuleLoadGuid);
 }
 }
}

20 changes: 20 additions & 0 deletions
src/tests/profiler/unittest/moduleload.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <!-- This test provides no interesting scenarios for GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>
 <!-- The test launches a secondary process and process launch creates
 an infinite event loop in the SocketAsyncEngine on Linux. Since
 runincontext loads even framework assemblies into the unloadable
 context, locals in this loop prevent unloading -->
 <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <ProjectReference Include="../common/profiler_common.csproj" />
 <CMakeProjectReference Include="$(MSBuildThisFileDirectory)/../native/CMakeLists.txt" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Emit ICorProfiler ModuleLoadFinished for dynamic modules#77068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

davmason
merged 3 commits into

from

Oct 17, 2022
 Merged


Emit ICorProfiler ModuleLoadFinished for dynamic modules
#77068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f1b4e45

Fix 76016


davmason Oct 14, 2022
76b4c9e

fix test


davmason Oct 14, 2022
a3bccff

Update moduleload.h


davmason Oct 15, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
src/coreclr/vm/domainassembly.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -810,6 +810,14 @@ void DomainAssembly::DeliverSyncEvents()

 GetModule()->NotifyEtwLoadFinished(S_OK);

#ifdef PROFILING_SUPPORTED
 if (!IsProfilerNotified())
 {
 SetProfilerNotified();
 GetModule()->NotifyProfilerLoadFinished(S_OK);
 }
#endif

#ifdef DEBUGGING_SUPPORTED
 GCX_COOP();
 if (!IsDebuggerNotified())
Expand Down

1 change: 1 addition & 0 deletions
src/tests/profiler/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ set(SOURCES
 handlesprofiler/handlesprofiler.cpp
 inlining/inlining.cpp
 metadatagetdispenser/metadatagetdispenser.cpp
 moduleload/moduleload.cpp
 multiple/multiple.cpp
 nullprofiler/nullprofiler.cpp
 rejitprofiler/rejitprofiler.cpp
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/profiler/native/classfactory.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
#include "transitions/transitions.h"
#include "multiple/multiple.h"
#include "inlining/inlining.h"
#include "moduleload/moduleload.h"

ClassFactory::ClassFactory(REFCLSID clsid) : refCount(0), clsid(clsid)
{
Expand DownExpand Up@@ -124,6 +125,10 @@ HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown *pUnkOuter, REFI
 {
 profiler = new HandlesProfiler();
 }
 else if (clsid == ModuleLoad::GetClsid())
 {
 profiler = new ModuleLoad();
 }
 else
 {
 printf("No profiler found in ClassFactory::CreateInstance. Did you add your profiler to the list?\n");
Expand Down

95 changes: 95 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#include "moduleload.h"

GUID ModuleLoad::GetClsid()
{
 // {1774B2E5-028B-4FA8-9DE5-26218CBCBBAC }
 GUID clsid = {0x1774b2e5, 0x028b, 0x4fa8, {0x9d, 0xe5, 0x26, 0x21, 0x8c, 0xbc, 0xbb, 0xac}};
 return clsid;
}

HRESULT ModuleLoad::InitializeCommon(IUnknown* pICorProfilerInfoUnk)
{
 Profiler::Initialize(pICorProfilerInfoUnk);

 HRESULT hr = S_OK;
 printf("Setting exception mask\n");
 if (FAILED(hr = pCorProfilerInfo->SetEventMask2(COR_PRF_MONITOR_MODULE_LOADS | COR_PRF_MONITOR_ASSEMBLY_LOADS, 0)))
 {
 _failures++;
 printf("FAIL: ICorProfilerInfo::SetEventMask2() failed hr=0x%x", hr);
 return hr;
 }

 return S_OK;
}

HRESULT ModuleLoad::Initialize(IUnknown* pICorProfilerInfoUnk)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::LoadAsNotificationOnly(BOOL *pbNotificationOnly)
{
 *pbNotificationOnly = TRUE;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadStarted(AssemblyID assemblyId)
{
 _assemblyLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus)
{
 _assemblyLoadFinishedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadStarted(ModuleID moduleId)
{
 _moduleLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus)
{
 _moduleLoadFinishedCount++;
 return S_OK;
}


HRESULT ModuleLoad::Shutdown()
{
 Profiler::Shutdown();

 if(_failures == 0 
 && (_moduleLoadStartedCount != 0)
 && (_assemblyLoadStartedCount != 0)
 && (_moduleLoadStartedCount == _moduleLoadFinishedCount)
 && (_assemblyLoadStartedCount == _assemblyLoadFinishedCount))
 {
 printf("PROFILER TEST PASSES\n");
 }
 else
 {
 printf("PROFILER TEST FAILED, failures=%d moduleLoadStarted=%d moduleLoadFinished=%d assemblyLoadStarted=%d assemblyLoadFinished=%d\n",
 _failures.load(),
 _moduleLoadStartedCount.load(),
 _moduleLoadFinishedCount.load(),
 _assemblyLoadStartedCount.load(),
 _assemblyLoadFinishedCount.load());
 }

 fflush(stdout);

 return S_OK;
}

42 changes: 42 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#pragma once

#include "../profiler.h"

class ModuleLoad : public Profiler
{
public:

 ModuleLoad() : 
 Profiler(),
 _assemblyLoadStartedCount(0),
 _assemblyLoadFinishedCount(0),
 _moduleLoadStartedCount(0),
 _moduleLoadFinishedCount(0),
 _failures(0)
 {

 }

 static GUID GetClsid();
 virtual HRESULT STDMETHODCALLTYPE Initialize(IUnknown* pICorProfilerInfoUnk);
 virtual HRESULT STDMETHODCALLTYPE InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData);
 virtual HRESULT STDMETHODCALLTYPE Shutdown();
 virtual HRESULT STDMETHODCALLTYPE LoadAsNotificationOnly(BOOL *pbNotificationOnly);

 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadStarted(AssemblyID assemblyId);
 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadStarted(ModuleID moduleId);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus);

private:
 std::atomic<int> _assemblyLoadStartedCount;
 std::atomic<int> _assemblyLoadFinishedCount;
 std::atomic<int> _moduleLoadStartedCount;
 std::atomic<int> _moduleLoadFinishedCount;
 std::atomic<int> _failures;

 HRESULT InitializeCommon(IUnknown* pCorProfilerInfoUnk);
};

46 changes: 46 additions & 0 deletions
src/tests/profiler/unittest/moduleload.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;
using System.Reflection;
using System.Reflection.Emit;

namespace Profiler.Tests
{
 class ModuleLoadTest
 {
 private static readonly Guid ModuleLoadGuid = new Guid("1774B2E5-028B-4FA8-9DE5-26218CBCBBAC");

 public static int RunTest(string[] args)
 {
 var type = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName("TestAssembly"), AssemblyBuilderAccess.Run)
 .DefineDynamicModule("TestModule")
 .DefineType("TestClass", TypeAttributes.Public)
 .CreateType();

 var obj = Activator.CreateInstance(type);
 if (obj == null)
 {
 throw new NullReferenceException();
 }

 return 100;
 }

 public static int Main(string[] args)
 {
 if (args.Length > 0 && args[0].Equals("RunTest", StringComparison.OrdinalIgnoreCase))
 {
 return RunTest(args);
 }

 return ProfilerTestRunner.Run(profileePath: System.Reflection.Assembly.GetExecutingAssembly().Location,
 testName: "UnitTestModuleLoad",
 profilerClsid: ModuleLoadGuid);
 }
 }
}

20 changes: 20 additions & 0 deletions
src/tests/profiler/unittest/moduleload.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <!-- This test provides no interesting scenarios for GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>
 <!-- The test launches a secondary process and process launch creates
 an infinite event loop in the SocketAsyncEngine on Linux. Since
 runincontext loads even framework assemblies into the unloadable
 context, locals in this loop prevent unloading -->
 <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <ProjectReference Include="../common/profiler_common.csproj" />
 <CMakeProjectReference Include="$(MSBuildThisFileDirectory)/../native/CMakeLists.txt" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Emit ICorProfiler ModuleLoadFinished for dynamic modules#77068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

davmason
merged 3 commits into

from

Oct 17, 2022
 Merged


Emit ICorProfiler ModuleLoadFinished for dynamic modules
#77068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f1b4e45

Fix 76016


davmason Oct 14, 2022
76b4c9e

fix test


davmason Oct 14, 2022
a3bccff

Update moduleload.h


davmason Oct 15, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
src/coreclr/vm/domainassembly.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -810,6 +810,14 @@ void DomainAssembly::DeliverSyncEvents()

 GetModule()->NotifyEtwLoadFinished(S_OK);

#ifdef PROFILING_SUPPORTED
 if (!IsProfilerNotified())
 {
 SetProfilerNotified();
 GetModule()->NotifyProfilerLoadFinished(S_OK);
 }
#endif

#ifdef DEBUGGING_SUPPORTED
 GCX_COOP();
 if (!IsDebuggerNotified())
Expand Down

1 change: 1 addition & 0 deletions
src/tests/profiler/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ set(SOURCES
 handlesprofiler/handlesprofiler.cpp
 inlining/inlining.cpp
 metadatagetdispenser/metadatagetdispenser.cpp
 moduleload/moduleload.cpp
 multiple/multiple.cpp
 nullprofiler/nullprofiler.cpp
 rejitprofiler/rejitprofiler.cpp
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/profiler/native/classfactory.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
#include "transitions/transitions.h"
#include "multiple/multiple.h"
#include "inlining/inlining.h"
#include "moduleload/moduleload.h"

ClassFactory::ClassFactory(REFCLSID clsid) : refCount(0), clsid(clsid)
{
Expand DownExpand Up@@ -124,6 +125,10 @@ HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown *pUnkOuter, REFI
 {
 profiler = new HandlesProfiler();
 }
 else if (clsid == ModuleLoad::GetClsid())
 {
 profiler = new ModuleLoad();
 }
 else
 {
 printf("No profiler found in ClassFactory::CreateInstance. Did you add your profiler to the list?\n");
Expand Down

95 changes: 95 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#include "moduleload.h"

GUID ModuleLoad::GetClsid()
{
 // {1774B2E5-028B-4FA8-9DE5-26218CBCBBAC }
 GUID clsid = {0x1774b2e5, 0x028b, 0x4fa8, {0x9d, 0xe5, 0x26, 0x21, 0x8c, 0xbc, 0xbb, 0xac}};
 return clsid;
}

HRESULT ModuleLoad::InitializeCommon(IUnknown* pICorProfilerInfoUnk)
{
 Profiler::Initialize(pICorProfilerInfoUnk);

 HRESULT hr = S_OK;
 printf("Setting exception mask\n");
 if (FAILED(hr = pCorProfilerInfo->SetEventMask2(COR_PRF_MONITOR_MODULE_LOADS | COR_PRF_MONITOR_ASSEMBLY_LOADS, 0)))
 {
 _failures++;
 printf("FAIL: ICorProfilerInfo::SetEventMask2() failed hr=0x%x", hr);
 return hr;
 }

 return S_OK;
}

HRESULT ModuleLoad::Initialize(IUnknown* pICorProfilerInfoUnk)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::LoadAsNotificationOnly(BOOL *pbNotificationOnly)
{
 *pbNotificationOnly = TRUE;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadStarted(AssemblyID assemblyId)
{
 _assemblyLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus)
{
 _assemblyLoadFinishedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadStarted(ModuleID moduleId)
{
 _moduleLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus)
{
 _moduleLoadFinishedCount++;
 return S_OK;
}


HRESULT ModuleLoad::Shutdown()
{
 Profiler::Shutdown();

 if(_failures == 0 
 && (_moduleLoadStartedCount != 0)
 && (_assemblyLoadStartedCount != 0)
 && (_moduleLoadStartedCount == _moduleLoadFinishedCount)
 && (_assemblyLoadStartedCount == _assemblyLoadFinishedCount))
 {
 printf("PROFILER TEST PASSES\n");
 }
 else
 {
 printf("PROFILER TEST FAILED, failures=%d moduleLoadStarted=%d moduleLoadFinished=%d assemblyLoadStarted=%d assemblyLoadFinished=%d\n",
 _failures.load(),
 _moduleLoadStartedCount.load(),
 _moduleLoadFinishedCount.load(),
 _assemblyLoadStartedCount.load(),
 _assemblyLoadFinishedCount.load());
 }

 fflush(stdout);

 return S_OK;
}

42 changes: 42 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#pragma once

#include "../profiler.h"

class ModuleLoad : public Profiler
{
public:

 ModuleLoad() : 
 Profiler(),
 _assemblyLoadStartedCount(0),
 _assemblyLoadFinishedCount(0),
 _moduleLoadStartedCount(0),
 _moduleLoadFinishedCount(0),
 _failures(0)
 {

 }

 static GUID GetClsid();
 virtual HRESULT STDMETHODCALLTYPE Initialize(IUnknown* pICorProfilerInfoUnk);
 virtual HRESULT STDMETHODCALLTYPE InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData);
 virtual HRESULT STDMETHODCALLTYPE Shutdown();
 virtual HRESULT STDMETHODCALLTYPE LoadAsNotificationOnly(BOOL *pbNotificationOnly);

 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadStarted(AssemblyID assemblyId);
 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadStarted(ModuleID moduleId);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus);

private:
 std::atomic<int> _assemblyLoadStartedCount;
 std::atomic<int> _assemblyLoadFinishedCount;
 std::atomic<int> _moduleLoadStartedCount;
 std::atomic<int> _moduleLoadFinishedCount;
 std::atomic<int> _failures;

 HRESULT InitializeCommon(IUnknown* pCorProfilerInfoUnk);
};

46 changes: 46 additions & 0 deletions
src/tests/profiler/unittest/moduleload.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;
using System.Reflection;
using System.Reflection.Emit;

namespace Profiler.Tests
{
 class ModuleLoadTest
 {
 private static readonly Guid ModuleLoadGuid = new Guid("1774B2E5-028B-4FA8-9DE5-26218CBCBBAC");

 public static int RunTest(string[] args)
 {
 var type = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName("TestAssembly"), AssemblyBuilderAccess.Run)
 .DefineDynamicModule("TestModule")
 .DefineType("TestClass", TypeAttributes.Public)
 .CreateType();

 var obj = Activator.CreateInstance(type);
 if (obj == null)
 {
 throw new NullReferenceException();
 }

 return 100;
 }

 public static int Main(string[] args)
 {
 if (args.Length > 0 && args[0].Equals("RunTest", StringComparison.OrdinalIgnoreCase))
 {
 return RunTest(args);
 }

 return ProfilerTestRunner.Run(profileePath: System.Reflection.Assembly.GetExecutingAssembly().Location,
 testName: "UnitTestModuleLoad",
 profilerClsid: ModuleLoadGuid);
 }
 }
}

20 changes: 20 additions & 0 deletions
src/tests/profiler/unittest/moduleload.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <!-- This test provides no interesting scenarios for GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>
 <!-- The test launches a secondary process and process launch creates
 an infinite event loop in the SocketAsyncEngine on Linux. Since
 runincontext loads even framework assemblies into the unloadable
 context, locals in this loop prevent unloading -->
 <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <ProjectReference Include="../common/profiler_common.csproj" />
 <CMakeProjectReference Include="$(MSBuildThisFileDirectory)/../native/CMakeLists.txt" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Emit ICorProfiler ModuleLoadFinished for dynamic modules#77068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

davmason
merged 3 commits into

from

Oct 17, 2022
 Merged


Emit ICorProfiler ModuleLoadFinished for dynamic modules
#77068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f1b4e45

Fix 76016


davmason Oct 14, 2022
76b4c9e

fix test


davmason Oct 14, 2022
a3bccff

Update moduleload.h


davmason Oct 15, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
src/coreclr/vm/domainassembly.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -810,6 +810,14 @@ void DomainAssembly::DeliverSyncEvents()

 GetModule()->NotifyEtwLoadFinished(S_OK);

#ifdef PROFILING_SUPPORTED
 if (!IsProfilerNotified())
 {
 SetProfilerNotified();
 GetModule()->NotifyProfilerLoadFinished(S_OK);
 }
#endif

#ifdef DEBUGGING_SUPPORTED
 GCX_COOP();
 if (!IsDebuggerNotified())
Expand Down

1 change: 1 addition & 0 deletions
src/tests/profiler/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ set(SOURCES
 handlesprofiler/handlesprofiler.cpp
 inlining/inlining.cpp
 metadatagetdispenser/metadatagetdispenser.cpp
 moduleload/moduleload.cpp
 multiple/multiple.cpp
 nullprofiler/nullprofiler.cpp
 rejitprofiler/rejitprofiler.cpp
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/profiler/native/classfactory.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
#include "transitions/transitions.h"
#include "multiple/multiple.h"
#include "inlining/inlining.h"
#include "moduleload/moduleload.h"

ClassFactory::ClassFactory(REFCLSID clsid) : refCount(0), clsid(clsid)
{
Expand DownExpand Up@@ -124,6 +125,10 @@ HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown *pUnkOuter, REFI
 {
 profiler = new HandlesProfiler();
 }
 else if (clsid == ModuleLoad::GetClsid())
 {
 profiler = new ModuleLoad();
 }
 else
 {
 printf("No profiler found in ClassFactory::CreateInstance. Did you add your profiler to the list?\n");
Expand Down

95 changes: 95 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#include "moduleload.h"

GUID ModuleLoad::GetClsid()
{
 // {1774B2E5-028B-4FA8-9DE5-26218CBCBBAC }
 GUID clsid = {0x1774b2e5, 0x028b, 0x4fa8, {0x9d, 0xe5, 0x26, 0x21, 0x8c, 0xbc, 0xbb, 0xac}};
 return clsid;
}

HRESULT ModuleLoad::InitializeCommon(IUnknown* pICorProfilerInfoUnk)
{
 Profiler::Initialize(pICorProfilerInfoUnk);

 HRESULT hr = S_OK;
 printf("Setting exception mask\n");
 if (FAILED(hr = pCorProfilerInfo->SetEventMask2(COR_PRF_MONITOR_MODULE_LOADS | COR_PRF_MONITOR_ASSEMBLY_LOADS, 0)))
 {
 _failures++;
 printf("FAIL: ICorProfilerInfo::SetEventMask2() failed hr=0x%x", hr);
 return hr;
 }

 return S_OK;
}

HRESULT ModuleLoad::Initialize(IUnknown* pICorProfilerInfoUnk)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::LoadAsNotificationOnly(BOOL *pbNotificationOnly)
{
 *pbNotificationOnly = TRUE;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadStarted(AssemblyID assemblyId)
{
 _assemblyLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus)
{
 _assemblyLoadFinishedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadStarted(ModuleID moduleId)
{
 _moduleLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus)
{
 _moduleLoadFinishedCount++;
 return S_OK;
}


HRESULT ModuleLoad::Shutdown()
{
 Profiler::Shutdown();

 if(_failures == 0 
 && (_moduleLoadStartedCount != 0)
 && (_assemblyLoadStartedCount != 0)
 && (_moduleLoadStartedCount == _moduleLoadFinishedCount)
 && (_assemblyLoadStartedCount == _assemblyLoadFinishedCount))
 {
 printf("PROFILER TEST PASSES\n");
 }
 else
 {
 printf("PROFILER TEST FAILED, failures=%d moduleLoadStarted=%d moduleLoadFinished=%d assemblyLoadStarted=%d assemblyLoadFinished=%d\n",
 _failures.load(),
 _moduleLoadStartedCount.load(),
 _moduleLoadFinishedCount.load(),
 _assemblyLoadStartedCount.load(),
 _assemblyLoadFinishedCount.load());
 }

 fflush(stdout);

 return S_OK;
}

42 changes: 42 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#pragma once

#include "../profiler.h"

class ModuleLoad : public Profiler
{
public:

 ModuleLoad() : 
 Profiler(),
 _assemblyLoadStartedCount(0),
 _assemblyLoadFinishedCount(0),
 _moduleLoadStartedCount(0),
 _moduleLoadFinishedCount(0),
 _failures(0)
 {

 }

 static GUID GetClsid();
 virtual HRESULT STDMETHODCALLTYPE Initialize(IUnknown* pICorProfilerInfoUnk);
 virtual HRESULT STDMETHODCALLTYPE InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData);
 virtual HRESULT STDMETHODCALLTYPE Shutdown();
 virtual HRESULT STDMETHODCALLTYPE LoadAsNotificationOnly(BOOL *pbNotificationOnly);

 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadStarted(AssemblyID assemblyId);
 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadStarted(ModuleID moduleId);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus);

private:
 std::atomic<int> _assemblyLoadStartedCount;
 std::atomic<int> _assemblyLoadFinishedCount;
 std::atomic<int> _moduleLoadStartedCount;
 std::atomic<int> _moduleLoadFinishedCount;
 std::atomic<int> _failures;

 HRESULT InitializeCommon(IUnknown* pCorProfilerInfoUnk);
};

46 changes: 46 additions & 0 deletions
src/tests/profiler/unittest/moduleload.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;
using System.Reflection;
using System.Reflection.Emit;

namespace Profiler.Tests
{
 class ModuleLoadTest
 {
 private static readonly Guid ModuleLoadGuid = new Guid("1774B2E5-028B-4FA8-9DE5-26218CBCBBAC");

 public static int RunTest(string[] args)
 {
 var type = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName("TestAssembly"), AssemblyBuilderAccess.Run)
 .DefineDynamicModule("TestModule")
 .DefineType("TestClass", TypeAttributes.Public)
 .CreateType();

 var obj = Activator.CreateInstance(type);
 if (obj == null)
 {
 throw new NullReferenceException();
 }

 return 100;
 }

 public static int Main(string[] args)
 {
 if (args.Length > 0 && args[0].Equals("RunTest", StringComparison.OrdinalIgnoreCase))
 {
 return RunTest(args);
 }

 return ProfilerTestRunner.Run(profileePath: System.Reflection.Assembly.GetExecutingAssembly().Location,
 testName: "UnitTestModuleLoad",
 profilerClsid: ModuleLoadGuid);
 }
 }
}

20 changes: 20 additions & 0 deletions
src/tests/profiler/unittest/moduleload.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <!-- This test provides no interesting scenarios for GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>
 <!-- The test launches a secondary process and process launch creates
 an infinite event loop in the SocketAsyncEngine on Linux. Since
 runincontext loads even framework assemblies into the unloadable
 context, locals in this loop prevent unloading -->
 <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <ProjectReference Include="../common/profiler_common.csproj" />
 <CMakeProjectReference Include="$(MSBuildThisFileDirectory)/../native/CMakeLists.txt" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Emit ICorProfiler ModuleLoadFinished for dynamic modules#77068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

davmason
merged 3 commits into

from

Oct 17, 2022
 Merged


Emit ICorProfiler ModuleLoadFinished for dynamic modules
#77068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f1b4e45

Fix 76016


davmason Oct 14, 2022
76b4c9e

fix test


davmason Oct 14, 2022
a3bccff

Update moduleload.h


davmason Oct 15, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
src/coreclr/vm/domainassembly.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -810,6 +810,14 @@ void DomainAssembly::DeliverSyncEvents()

 GetModule()->NotifyEtwLoadFinished(S_OK);

#ifdef PROFILING_SUPPORTED
 if (!IsProfilerNotified())
 {
 SetProfilerNotified();
 GetModule()->NotifyProfilerLoadFinished(S_OK);
 }
#endif

#ifdef DEBUGGING_SUPPORTED
 GCX_COOP();
 if (!IsDebuggerNotified())
Expand Down

1 change: 1 addition & 0 deletions
src/tests/profiler/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ set(SOURCES
 handlesprofiler/handlesprofiler.cpp
 inlining/inlining.cpp
 metadatagetdispenser/metadatagetdispenser.cpp
 moduleload/moduleload.cpp
 multiple/multiple.cpp
 nullprofiler/nullprofiler.cpp
 rejitprofiler/rejitprofiler.cpp
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/profiler/native/classfactory.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
#include "transitions/transitions.h"
#include "multiple/multiple.h"
#include "inlining/inlining.h"
#include "moduleload/moduleload.h"

ClassFactory::ClassFactory(REFCLSID clsid) : refCount(0), clsid(clsid)
{
Expand DownExpand Up@@ -124,6 +125,10 @@ HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown *pUnkOuter, REFI
 {
 profiler = new HandlesProfiler();
 }
 else if (clsid == ModuleLoad::GetClsid())
 {
 profiler = new ModuleLoad();
 }
 else
 {
 printf("No profiler found in ClassFactory::CreateInstance. Did you add your profiler to the list?\n");
Expand Down

95 changes: 95 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#include "moduleload.h"

GUID ModuleLoad::GetClsid()
{
 // {1774B2E5-028B-4FA8-9DE5-26218CBCBBAC }
 GUID clsid = {0x1774b2e5, 0x028b, 0x4fa8, {0x9d, 0xe5, 0x26, 0x21, 0x8c, 0xbc, 0xbb, 0xac}};
 return clsid;
}

HRESULT ModuleLoad::InitializeCommon(IUnknown* pICorProfilerInfoUnk)
{
 Profiler::Initialize(pICorProfilerInfoUnk);

 HRESULT hr = S_OK;
 printf("Setting exception mask\n");
 if (FAILED(hr = pCorProfilerInfo->SetEventMask2(COR_PRF_MONITOR_MODULE_LOADS | COR_PRF_MONITOR_ASSEMBLY_LOADS, 0)))
 {
 _failures++;
 printf("FAIL: ICorProfilerInfo::SetEventMask2() failed hr=0x%x", hr);
 return hr;
 }

 return S_OK;
}

HRESULT ModuleLoad::Initialize(IUnknown* pICorProfilerInfoUnk)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::LoadAsNotificationOnly(BOOL *pbNotificationOnly)
{
 *pbNotificationOnly = TRUE;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadStarted(AssemblyID assemblyId)
{
 _assemblyLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus)
{
 _assemblyLoadFinishedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadStarted(ModuleID moduleId)
{
 _moduleLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus)
{
 _moduleLoadFinishedCount++;
 return S_OK;
}


HRESULT ModuleLoad::Shutdown()
{
 Profiler::Shutdown();

 if(_failures == 0 
 && (_moduleLoadStartedCount != 0)
 && (_assemblyLoadStartedCount != 0)
 && (_moduleLoadStartedCount == _moduleLoadFinishedCount)
 && (_assemblyLoadStartedCount == _assemblyLoadFinishedCount))
 {
 printf("PROFILER TEST PASSES\n");
 }
 else
 {
 printf("PROFILER TEST FAILED, failures=%d moduleLoadStarted=%d moduleLoadFinished=%d assemblyLoadStarted=%d assemblyLoadFinished=%d\n",
 _failures.load(),
 _moduleLoadStartedCount.load(),
 _moduleLoadFinishedCount.load(),
 _assemblyLoadStartedCount.load(),
 _assemblyLoadFinishedCount.load());
 }

 fflush(stdout);

 return S_OK;
}

42 changes: 42 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#pragma once

#include "../profiler.h"

class ModuleLoad : public Profiler
{
public:

 ModuleLoad() : 
 Profiler(),
 _assemblyLoadStartedCount(0),
 _assemblyLoadFinishedCount(0),
 _moduleLoadStartedCount(0),
 _moduleLoadFinishedCount(0),
 _failures(0)
 {

 }

 static GUID GetClsid();
 virtual HRESULT STDMETHODCALLTYPE Initialize(IUnknown* pICorProfilerInfoUnk);
 virtual HRESULT STDMETHODCALLTYPE InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData);
 virtual HRESULT STDMETHODCALLTYPE Shutdown();
 virtual HRESULT STDMETHODCALLTYPE LoadAsNotificationOnly(BOOL *pbNotificationOnly);

 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadStarted(AssemblyID assemblyId);
 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadStarted(ModuleID moduleId);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus);

private:
 std::atomic<int> _assemblyLoadStartedCount;
 std::atomic<int> _assemblyLoadFinishedCount;
 std::atomic<int> _moduleLoadStartedCount;
 std::atomic<int> _moduleLoadFinishedCount;
 std::atomic<int> _failures;

 HRESULT InitializeCommon(IUnknown* pCorProfilerInfoUnk);
};

46 changes: 46 additions & 0 deletions
src/tests/profiler/unittest/moduleload.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;
using System.Reflection;
using System.Reflection.Emit;

namespace Profiler.Tests
{
 class ModuleLoadTest
 {
 private static readonly Guid ModuleLoadGuid = new Guid("1774B2E5-028B-4FA8-9DE5-26218CBCBBAC");

 public static int RunTest(string[] args)
 {
 var type = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName("TestAssembly"), AssemblyBuilderAccess.Run)
 .DefineDynamicModule("TestModule")
 .DefineType("TestClass", TypeAttributes.Public)
 .CreateType();

 var obj = Activator.CreateInstance(type);
 if (obj == null)
 {
 throw new NullReferenceException();
 }

 return 100;
 }

 public static int Main(string[] args)
 {
 if (args.Length > 0 && args[0].Equals("RunTest", StringComparison.OrdinalIgnoreCase))
 {
 return RunTest(args);
 }

 return ProfilerTestRunner.Run(profileePath: System.Reflection.Assembly.GetExecutingAssembly().Location,
 testName: "UnitTestModuleLoad",
 profilerClsid: ModuleLoadGuid);
 }
 }
}

20 changes: 20 additions & 0 deletions
src/tests/profiler/unittest/moduleload.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <!-- This test provides no interesting scenarios for GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>
 <!-- The test launches a secondary process and process launch creates
 an infinite event loop in the SocketAsyncEngine on Linux. Since
 runincontext loads even framework assemblies into the unloadable
 context, locals in this loop prevent unloading -->
 <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <ProjectReference Include="../common/profiler_common.csproj" />
 <CMakeProjectReference Include="$(MSBuildThisFileDirectory)/../native/CMakeLists.txt" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Emit ICorProfiler ModuleLoadFinished for dynamic modules#77068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

davmason
merged 3 commits into

from

Oct 17, 2022
 Merged


Emit ICorProfiler ModuleLoadFinished for dynamic modules
#77068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f1b4e45

Fix 76016


davmason Oct 14, 2022
76b4c9e

fix test


davmason Oct 14, 2022
a3bccff

Update moduleload.h


davmason Oct 15, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
src/coreclr/vm/domainassembly.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -810,6 +810,14 @@ void DomainAssembly::DeliverSyncEvents()

 GetModule()->NotifyEtwLoadFinished(S_OK);

#ifdef PROFILING_SUPPORTED
 if (!IsProfilerNotified())
 {
 SetProfilerNotified();
 GetModule()->NotifyProfilerLoadFinished(S_OK);
 }
#endif

#ifdef DEBUGGING_SUPPORTED
 GCX_COOP();
 if (!IsDebuggerNotified())
Expand Down

1 change: 1 addition & 0 deletions
src/tests/profiler/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ set(SOURCES
 handlesprofiler/handlesprofiler.cpp
 inlining/inlining.cpp
 metadatagetdispenser/metadatagetdispenser.cpp
 moduleload/moduleload.cpp
 multiple/multiple.cpp
 nullprofiler/nullprofiler.cpp
 rejitprofiler/rejitprofiler.cpp
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/profiler/native/classfactory.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
#include "transitions/transitions.h"
#include "multiple/multiple.h"
#include "inlining/inlining.h"
#include "moduleload/moduleload.h"

ClassFactory::ClassFactory(REFCLSID clsid) : refCount(0), clsid(clsid)
{
Expand DownExpand Up@@ -124,6 +125,10 @@ HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown *pUnkOuter, REFI
 {
 profiler = new HandlesProfiler();
 }
 else if (clsid == ModuleLoad::GetClsid())
 {
 profiler = new ModuleLoad();
 }
 else
 {
 printf("No profiler found in ClassFactory::CreateInstance. Did you add your profiler to the list?\n");
Expand Down

95 changes: 95 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#include "moduleload.h"

GUID ModuleLoad::GetClsid()
{
 // {1774B2E5-028B-4FA8-9DE5-26218CBCBBAC }
 GUID clsid = {0x1774b2e5, 0x028b, 0x4fa8, {0x9d, 0xe5, 0x26, 0x21, 0x8c, 0xbc, 0xbb, 0xac}};
 return clsid;
}

HRESULT ModuleLoad::InitializeCommon(IUnknown* pICorProfilerInfoUnk)
{
 Profiler::Initialize(pICorProfilerInfoUnk);

 HRESULT hr = S_OK;
 printf("Setting exception mask\n");
 if (FAILED(hr = pCorProfilerInfo->SetEventMask2(COR_PRF_MONITOR_MODULE_LOADS | COR_PRF_MONITOR_ASSEMBLY_LOADS, 0)))
 {
 _failures++;
 printf("FAIL: ICorProfilerInfo::SetEventMask2() failed hr=0x%x", hr);
 return hr;
 }

 return S_OK;
}

HRESULT ModuleLoad::Initialize(IUnknown* pICorProfilerInfoUnk)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::LoadAsNotificationOnly(BOOL *pbNotificationOnly)
{
 *pbNotificationOnly = TRUE;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadStarted(AssemblyID assemblyId)
{
 _assemblyLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus)
{
 _assemblyLoadFinishedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadStarted(ModuleID moduleId)
{
 _moduleLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus)
{
 _moduleLoadFinishedCount++;
 return S_OK;
}


HRESULT ModuleLoad::Shutdown()
{
 Profiler::Shutdown();

 if(_failures == 0 
 && (_moduleLoadStartedCount != 0)
 && (_assemblyLoadStartedCount != 0)
 && (_moduleLoadStartedCount == _moduleLoadFinishedCount)
 && (_assemblyLoadStartedCount == _assemblyLoadFinishedCount))
 {
 printf("PROFILER TEST PASSES\n");
 }
 else
 {
 printf("PROFILER TEST FAILED, failures=%d moduleLoadStarted=%d moduleLoadFinished=%d assemblyLoadStarted=%d assemblyLoadFinished=%d\n",
 _failures.load(),
 _moduleLoadStartedCount.load(),
 _moduleLoadFinishedCount.load(),
 _assemblyLoadStartedCount.load(),
 _assemblyLoadFinishedCount.load());
 }

 fflush(stdout);

 return S_OK;
}

42 changes: 42 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#pragma once

#include "../profiler.h"

class ModuleLoad : public Profiler
{
public:

 ModuleLoad() : 
 Profiler(),
 _assemblyLoadStartedCount(0),
 _assemblyLoadFinishedCount(0),
 _moduleLoadStartedCount(0),
 _moduleLoadFinishedCount(0),
 _failures(0)
 {

 }

 static GUID GetClsid();
 virtual HRESULT STDMETHODCALLTYPE Initialize(IUnknown* pICorProfilerInfoUnk);
 virtual HRESULT STDMETHODCALLTYPE InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData);
 virtual HRESULT STDMETHODCALLTYPE Shutdown();
 virtual HRESULT STDMETHODCALLTYPE LoadAsNotificationOnly(BOOL *pbNotificationOnly);

 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadStarted(AssemblyID assemblyId);
 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadStarted(ModuleID moduleId);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus);

private:
 std::atomic<int> _assemblyLoadStartedCount;
 std::atomic<int> _assemblyLoadFinishedCount;
 std::atomic<int> _moduleLoadStartedCount;
 std::atomic<int> _moduleLoadFinishedCount;
 std::atomic<int> _failures;

 HRESULT InitializeCommon(IUnknown* pCorProfilerInfoUnk);
};

46 changes: 46 additions & 0 deletions
src/tests/profiler/unittest/moduleload.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;
using System.Reflection;
using System.Reflection.Emit;

namespace Profiler.Tests
{
 class ModuleLoadTest
 {
 private static readonly Guid ModuleLoadGuid = new Guid("1774B2E5-028B-4FA8-9DE5-26218CBCBBAC");

 public static int RunTest(string[] args)
 {
 var type = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName("TestAssembly"), AssemblyBuilderAccess.Run)
 .DefineDynamicModule("TestModule")
 .DefineType("TestClass", TypeAttributes.Public)
 .CreateType();

 var obj = Activator.CreateInstance(type);
 if (obj == null)
 {
 throw new NullReferenceException();
 }

 return 100;
 }

 public static int Main(string[] args)
 {
 if (args.Length > 0 && args[0].Equals("RunTest", StringComparison.OrdinalIgnoreCase))
 {
 return RunTest(args);
 }

 return ProfilerTestRunner.Run(profileePath: System.Reflection.Assembly.GetExecutingAssembly().Location,
 testName: "UnitTestModuleLoad",
 profilerClsid: ModuleLoadGuid);
 }
 }
}

20 changes: 20 additions & 0 deletions
src/tests/profiler/unittest/moduleload.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <!-- This test provides no interesting scenarios for GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>
 <!-- The test launches a secondary process and process launch creates
 an infinite event loop in the SocketAsyncEngine on Linux. Since
 runincontext loads even framework assemblies into the unloadable
 context, locals in this loop prevent unloading -->
 <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <ProjectReference Include="../common/profiler_common.csproj" />
 <CMakeProjectReference Include="$(MSBuildThisFileDirectory)/../native/CMakeLists.txt" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Emit ICorProfiler ModuleLoadFinished for dynamic modules#77068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

davmason
merged 3 commits into

from

Oct 17, 2022
 Merged


Emit ICorProfiler ModuleLoadFinished for dynamic modules
#77068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f1b4e45

Fix 76016


davmason Oct 14, 2022
76b4c9e

fix test


davmason Oct 14, 2022
a3bccff

Update moduleload.h


davmason Oct 15, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
src/coreclr/vm/domainassembly.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -810,6 +810,14 @@ void DomainAssembly::DeliverSyncEvents()

 GetModule()->NotifyEtwLoadFinished(S_OK);

#ifdef PROFILING_SUPPORTED
 if (!IsProfilerNotified())
 {
 SetProfilerNotified();
 GetModule()->NotifyProfilerLoadFinished(S_OK);
 }
#endif

#ifdef DEBUGGING_SUPPORTED
 GCX_COOP();
 if (!IsDebuggerNotified())
Expand Down

1 change: 1 addition & 0 deletions
src/tests/profiler/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ set(SOURCES
 handlesprofiler/handlesprofiler.cpp
 inlining/inlining.cpp
 metadatagetdispenser/metadatagetdispenser.cpp
 moduleload/moduleload.cpp
 multiple/multiple.cpp
 nullprofiler/nullprofiler.cpp
 rejitprofiler/rejitprofiler.cpp
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/profiler/native/classfactory.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
#include "transitions/transitions.h"
#include "multiple/multiple.h"
#include "inlining/inlining.h"
#include "moduleload/moduleload.h"

ClassFactory::ClassFactory(REFCLSID clsid) : refCount(0), clsid(clsid)
{
Expand DownExpand Up@@ -124,6 +125,10 @@ HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown *pUnkOuter, REFI
 {
 profiler = new HandlesProfiler();
 }
 else if (clsid == ModuleLoad::GetClsid())
 {
 profiler = new ModuleLoad();
 }
 else
 {
 printf("No profiler found in ClassFactory::CreateInstance. Did you add your profiler to the list?\n");
Expand Down

95 changes: 95 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#include "moduleload.h"

GUID ModuleLoad::GetClsid()
{
 // {1774B2E5-028B-4FA8-9DE5-26218CBCBBAC }
 GUID clsid = {0x1774b2e5, 0x028b, 0x4fa8, {0x9d, 0xe5, 0x26, 0x21, 0x8c, 0xbc, 0xbb, 0xac}};
 return clsid;
}

HRESULT ModuleLoad::InitializeCommon(IUnknown* pICorProfilerInfoUnk)
{
 Profiler::Initialize(pICorProfilerInfoUnk);

 HRESULT hr = S_OK;
 printf("Setting exception mask\n");
 if (FAILED(hr = pCorProfilerInfo->SetEventMask2(COR_PRF_MONITOR_MODULE_LOADS | COR_PRF_MONITOR_ASSEMBLY_LOADS, 0)))
 {
 _failures++;
 printf("FAIL: ICorProfilerInfo::SetEventMask2() failed hr=0x%x", hr);
 return hr;
 }

 return S_OK;
}

HRESULT ModuleLoad::Initialize(IUnknown* pICorProfilerInfoUnk)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData)
{
 return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT ModuleLoad::LoadAsNotificationOnly(BOOL *pbNotificationOnly)
{
 *pbNotificationOnly = TRUE;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadStarted(AssemblyID assemblyId)
{
 _assemblyLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus)
{
 _assemblyLoadFinishedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadStarted(ModuleID moduleId)
{
 _moduleLoadStartedCount++;
 return S_OK;
}

HRESULT ModuleLoad::ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus)
{
 _moduleLoadFinishedCount++;
 return S_OK;
}


HRESULT ModuleLoad::Shutdown()
{
 Profiler::Shutdown();

 if(_failures == 0 
 && (_moduleLoadStartedCount != 0)
 && (_assemblyLoadStartedCount != 0)
 && (_moduleLoadStartedCount == _moduleLoadFinishedCount)
 && (_assemblyLoadStartedCount == _assemblyLoadFinishedCount))
 {
 printf("PROFILER TEST PASSES\n");
 }
 else
 {
 printf("PROFILER TEST FAILED, failures=%d moduleLoadStarted=%d moduleLoadFinished=%d assemblyLoadStarted=%d assemblyLoadFinished=%d\n",
 _failures.load(),
 _moduleLoadStartedCount.load(),
 _moduleLoadFinishedCount.load(),
 _assemblyLoadStartedCount.load(),
 _assemblyLoadFinishedCount.load());
 }

 fflush(stdout);

 return S_OK;
}

42 changes: 42 additions & 0 deletions
src/tests/profiler/native/moduleload/moduleload.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#pragma once

#include "../profiler.h"

class ModuleLoad : public Profiler
{
public:

 ModuleLoad() : 
 Profiler(),
 _assemblyLoadStartedCount(0),
 _assemblyLoadFinishedCount(0),
 _moduleLoadStartedCount(0),
 _moduleLoadFinishedCount(0),
 _failures(0)
 {

 }

 static GUID GetClsid();
 virtual HRESULT STDMETHODCALLTYPE Initialize(IUnknown* pICorProfilerInfoUnk);
 virtual HRESULT STDMETHODCALLTYPE InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData);
 virtual HRESULT STDMETHODCALLTYPE Shutdown();
 virtual HRESULT STDMETHODCALLTYPE LoadAsNotificationOnly(BOOL *pbNotificationOnly);

 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadStarted(AssemblyID assemblyId);
 virtual HRESULT STDMETHODCALLTYPE AssemblyLoadFinished(AssemblyID assemblyId, HRESULT hrStatus);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadStarted(ModuleID moduleId);
 virtual HRESULT STDMETHODCALLTYPE ModuleLoadFinished(ModuleID moduleId, HRESULT hrStatus);

private:
 std::atomic<int> _assemblyLoadStartedCount;
 std::atomic<int> _assemblyLoadFinishedCount;
 std::atomic<int> _moduleLoadStartedCount;
 std::atomic<int> _moduleLoadFinishedCount;
 std::atomic<int> _failures;

 HRESULT InitializeCommon(IUnknown* pCorProfilerInfoUnk);
};

46 changes: 46 additions & 0 deletions
src/tests/profiler/unittest/moduleload.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;
using System.Reflection;
using System.Reflection.Emit;

namespace Profiler.Tests
{
 class ModuleLoadTest
 {
 private static readonly Guid ModuleLoadGuid = new Guid("1774B2E5-028B-4FA8-9DE5-26218CBCBBAC");

 public static int RunTest(string[] args)
 {
 var type = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName("TestAssembly"), AssemblyBuilderAccess.Run)
 .DefineDynamicModule("TestModule")
 .DefineType("TestClass", TypeAttributes.Public)
 .CreateType();

 var obj = Activator.CreateInstance(type);
 if (obj == null)
 {
 throw new NullReferenceException();
 }

 return 100;
 }

 public static int Main(string[] args)
 {
 if (args.Length > 0 && args[0].Equals("RunTest", StringComparison.OrdinalIgnoreCase))
 {
 return RunTest(args);
 }

 return ProfilerTestRunner.Run(profileePath: System.Reflection.Assembly.GetExecutingAssembly().Location,
 testName: "UnitTestModuleLoad",
 profilerClsid: ModuleLoadGuid);
 }
 }
}

20 changes: 20 additions & 0 deletions
src/tests/profiler/unittest/moduleload.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <!-- This test provides no interesting scenarios for GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>
 <!-- The test launches a secondary process and process launch creates
 an infinite event loop in the SocketAsyncEngine on Linux. Since
 runincontext loads even framework assemblies into the unloadable
 context, locals in this loop prevent unloading -->
 <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <ProjectReference Include="../common/profiler_common.csproj" />
 <CMakeProjectReference Include="$(MSBuildThisFileDirectory)/../native/CMakeLists.txt" />
 </ItemGroup>
</Project>