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

Fix typo in profiler method #60999

Merged
merged 2 commits into from
Nov 2, 2021
Merged

Fix typo in profiler method #60999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96306f2
Fix typo in method
davmason Oct 29, 2021
f74c02f
Fix typo in tests too
davmason Nov 2, 2021
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
2 changes: 1 addition & 1 deletion src/coreclr/inc/corprof.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2602,7 +2602,7 @@ interface ICorProfilerCallback10 : ICorProfilerCallback9
]
interface ICorProfilerCallback11 : ICorProfilerCallback10
{
HRESULT LoadAsNotficationOnly(BOOL *pbNotificationOnly);
HRESULT LoadAsNotificationOnly(BOOL *pbNotificationOnly);
}

/*
Expand Down
10 changes: 5 additions & 5 deletions src/coreclr/pal/prebuilt/inc/corprof.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ enum __MIDL___MIDL_itf_corprof_0000_0000_0006
COR_PRF_HIGH_REQUIRE_PROFILE_IMAGE = 0,
COR_PRF_HIGH_MONITOR_LARGEOBJECT_ALLOCATED = 0x40,
COR_PRF_HIGH_MONITOR_EVENT_PIPE = 0x80,
COR_PRF_HIGH_MONITOR_PINNEDOBJECT_ALLOCATED = 0x100,
COR_PRF_HIGH_MONITOR_PINNEDOBJECT_ALLOCATED = 0x100,
COR_PRF_HIGH_ALLOWABLE_AFTER_ATTACH = ( ( ( ( ( COR_PRF_HIGH_IN_MEMORY_SYMBOLS_UPDATED | COR_PRF_HIGH_MONITOR_DYNAMIC_FUNCTION_UNLOADS ) | COR_PRF_HIGH_BASIC_GC ) | COR_PRF_HIGH_MONITOR_GC_MOVED_OBJECTS ) | COR_PRF_HIGH_MONITOR_LARGEOBJECT_ALLOCATED ) | COR_PRF_HIGH_MONITOR_EVENT_PIPE ) ,
COR_PRF_HIGH_ALLOWABLE_NOTIFICATION_PROFILER = ( ( ( ( ( ( COR_PRF_HIGH_IN_MEMORY_SYMBOLS_UPDATED | COR_PRF_HIGH_MONITOR_DYNAMIC_FUNCTION_UNLOADS ) | COR_PRF_HIGH_DISABLE_TIERED_COMPILATION ) | COR_PRF_HIGH_BASIC_GC ) | COR_PRF_HIGH_MONITOR_GC_MOVED_OBJECTS ) | COR_PRF_HIGH_MONITOR_LARGEOBJECT_ALLOCATED ) | COR_PRF_HIGH_MONITOR_EVENT_PIPE ) ,
COR_PRF_HIGH_MONITOR_IMMUTABLE = COR_PRF_HIGH_DISABLE_TIERED_COMPILATION
Expand Down Expand Up @@ -8374,7 +8374,7 @@ EXTERN_C const IID IID_ICorProfilerCallback11;
ICorProfilerCallback11 : public ICorProfilerCallback10
{
public:
virtual HRESULT STDMETHODCALLTYPE LoadAsNotficationOnly(
virtual HRESULT STDMETHODCALLTYPE LoadAsNotificationOnly(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The breaking change might be worth a heads up on the profiler announcement issue, but I agree it seems unlikely to affect many people and easy to resolve

BOOL *pbNotificationOnly) = 0;

};
Expand Down Expand Up @@ -8844,7 +8844,7 @@ EXTERN_C const IID IID_ICorProfilerCallback11;
ICorProfilerCallback11 * This,
/* [in] */ EVENTPIPE_PROVIDER provider);

HRESULT ( STDMETHODCALLTYPE *LoadAsNotficationOnly )(
HRESULT ( STDMETHODCALLTYPE *LoadAsNotificationOnly )(
ICorProfilerCallback11 * This,
BOOL *pbNotificationOnly);

Expand Down Expand Up @@ -9163,8 +9163,8 @@ EXTERN_C const IID IID_ICorProfilerCallback11;
( (This)->lpVtbl -> EventPipeProviderCreated(This,provider) )


#define ICorProfilerCallback11_LoadAsNotficationOnly(This,pbNotificationOnly) \
( (This)->lpVtbl -> LoadAsNotficationOnly(This,pbNotificationOnly) )
#define ICorProfilerCallback11_LoadAsNotificationOnly(This,pbNotificationOnly) \
( (This)->lpVtbl -> LoadAsNotificationOnly(This,pbNotificationOnly) )

#endif /* COBJMACROS */

Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/vm/eetoprofinterfaceimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6055,7 +6055,7 @@ HRESULT EEToProfInterfaceImpl::EventPipeProviderCreated(EventPipeProvider *provi
#endif // FEATURE_PERFTRACING
}

HRESULT EEToProfInterfaceImpl::LoadAsNotficationOnly(BOOL *pbNotificationOnly)
HRESULT EEToProfInterfaceImpl::LoadAsNotificationOnly(BOOL *pbNotificationOnly)
{
CONTRACTL
{
Expand All @@ -6071,15 +6071,15 @@ HRESULT EEToProfInterfaceImpl::LoadAsNotficationOnly(BOOL *pbNotificationOnly)

LOG((LF_CORPROF,
LL_INFO1000,
"**PROF: LoadAsNotficationOnly.\n"));
"**PROF: LoadAsNotificationOnly.\n"));

if (m_pCallback11 == NULL)
{
*pbNotificationOnly = FALSE;
return S_OK;
}

return m_pCallback11->LoadAsNotficationOnly(pbNotificationOnly);
return m_pCallback11->LoadAsNotificationOnly(pbNotificationOnly);
}

#endif // PROFILING_SUPPORTED
2 changes: 1 addition & 1 deletion src/coreclr/vm/eetoprofinterfaceimpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ class EEToProfInterfaceImpl

HRESULT EventPipeProviderCreated(EventPipeProvider *provider);

HRESULT LoadAsNotficationOnly(BOOL *pbNotificationOnly);
HRESULT LoadAsNotificationOnly(BOOL *pbNotificationOnly);

ProfToEEInterfaceImpl *GetProfToEE()
{
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/profilinghelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ HRESULT ProfilingAPIUtility::LoadProfiler(
// Check if this profiler is notification only and load as appropriate
BOOL notificationOnly = FALSE;
{
HRESULT callHr = profilerInfo.pProfInterface->LoadAsNotficationOnly(&notificationOnly);
HRESULT callHr = profilerInfo.pProfInterface->LoadAsNotificationOnly(&notificationOnly);
if (FAILED(callHr))
{
notificationOnly = FALSE;
Expand Down
2 changes: 1 addition & 1 deletion src/tests/profiler/native/multiple/multiple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ HRESULT MultiplyLoaded::InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void
return InitializeCommon(pICorProfilerInfoUnk);
}

HRESULT MultiplyLoaded::LoadAsNotficationOnly(BOOL *pbNotificationOnly)
HRESULT MultiplyLoaded::LoadAsNotificationOnly(BOOL *pbNotificationOnly)
{
*pbNotificationOnly = TRUE;
return S_OK;
Expand Down
2 changes: 1 addition & 1 deletion src/tests/profiler/native/multiple/multiple.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class MultiplyLoaded : public Profiler
virtual HRESULT STDMETHODCALLTYPE Initialize(IUnknown* pICorProfilerInfoUnk);
virtual HRESULT STDMETHODCALLTYPE InitializeForAttach(IUnknown* pICorProfilerInfoUnk, void* pvClientData, UINT cbClientData);
virtual HRESULT STDMETHODCALLTYPE Shutdown();
virtual HRESULT STDMETHODCALLTYPE LoadAsNotficationOnly(BOOL *pbNotificationOnly);
virtual HRESULT STDMETHODCALLTYPE LoadAsNotificationOnly(BOOL *pbNotificationOnly);

virtual HRESULT STDMETHODCALLTYPE ProfilerDetachSucceeded();
virtual HRESULT STDMETHODCALLTYPE ExceptionThrown(ObjectID thrownObjectId);
Expand Down
2 changes: 1 addition & 1 deletion src/tests/profiler/native/profiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ HRESULT STDMETHODCALLTYPE Profiler::EventPipeProviderCreated(EVENTPIPE_PROVIDER
return S_OK;
}

HRESULT STDMETHODCALLTYPE Profiler::LoadAsNotficationOnly(BOOL *pbNotificationOnly)
HRESULT STDMETHODCALLTYPE Profiler::LoadAsNotificationOnly(BOOL *pbNotificationOnly)
{
*pbNotificationOnly = FALSE;
return S_OK;
Expand Down
2 changes: 1 addition & 1 deletion src/tests/profiler/native/profiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ class Profiler : public ICorProfilerCallback11
ULONG numStackFrames,
UINT_PTR stackFrames[]) override;
HRESULT STDMETHODCALLTYPE EventPipeProviderCreated(EVENTPIPE_PROVIDER provider) override;
HRESULT STDMETHODCALLTYPE LoadAsNotficationOnly(BOOL *pbNotificationOnly) override;
HRESULT STDMETHODCALLTYPE LoadAsNotificationOnly(BOOL *pbNotificationOnly) override;

HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) override;
ULONG STDMETHODCALLTYPE AddRef(void) override;
Expand Down