Skip to content
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

Jump to bottom

Fix profiler multiple test #98685

Merged
merged 1 commit into from
Feb 21, 2024
Merged

Fix profiler multiple test #98685

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions src/tests/profiler/native/multiple/multiple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ HRESULT MultiplyLoaded::InitializeCommon(IUnknown* pICorProfilerInfoUnk)
Profiler::Initialize(pICorProfilerInfoUnk);

HRESULT hr = S_OK;
printf("Setting exception mask\n");
if (FAILED(hr = pCorProfilerInfo->SetEventMask2(COR_PRF_MONITOR_EXCEPTIONS, 0)))
{
_failures++;
Expand All @@ -37,11 +36,13 @@ HRESULT MultiplyLoaded::InitializeCommon(IUnknown* pICorProfilerInfoUnk)

HRESULT MultiplyLoaded::Initialize(IUnknown* pICorProfilerInfoUnk)
{
printf("MultiplyLoaded::Initialize\n");
return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT MultiplyLoaded::InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData)
{
printf("MultiplyLoaded::InitializeForAttach\n");
return InitializeCommon(pICorProfilerInfoUnk);
}

Expand All @@ -56,8 +57,8 @@ HRESULT MultiplyLoaded::ProfilerDetachSucceeded()
++_detachCount;

printf("ProfilerDetachSucceeded _detachCount=%d\n", _detachCount.load());
if (_detachCount == (MAX_PROFILERS - 1)
&& _exceptionThrownSeenCount >= (MAX_PROFILERS - 1)
if (_detachCount == MAX_PROFILERS
&& _exceptionThrownSeenCount >= MAX_PROFILERS
&& _failures == 0)
{
printf("PROFILER TEST PASSES\n");
Expand All @@ -69,9 +70,7 @@ HRESULT MultiplyLoaded::ProfilerDetachSucceeded()

HRESULT MultiplyLoaded::ExceptionThrown(ObjectID thrownObjectId)
{
int seen = _exceptionThrownSeenCount++;

printf("MultiplyLoaded::ExceptionThrown, number seen = %d\n", seen);
printf("MultiplyLoaded::ExceptionThrown, number seen = %d\n", ++_exceptionThrownSeenCount);

thread detachThread([&]()
{
Expand Down