Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Only use FEATURE_PERFTRACING and FEATURE_EVENT_TRACE features when tu… #17232

Merged
merged 1 commit into from
Mar 26, 2018

Conversation

llamadonica
Copy link

@brianrob @adamsitnik

Allows FEATURE_EVENT_TRACE, FEATURE_PERFTRACING to be turned off.

Fixes #17199.

@dnfclas
Copy link

dnfclas commented Mar 26, 2018

CLA assistant check
All CLA requirements met.

Copy link
Member

@brianrob brianrob left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@@ -611,7 +611,7 @@ namespace ETW
#else // FEATURE_EVENT_TRACE
public:
static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL) {};
static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL, SIZE_T pCode = 0, ReJITID rejitID = 0) {};
static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL, SIZE_T pCode = 0, ReJITID rejitID = 0, BOOL bProfilerRejectedPrecompiledCode = FALSE, BOOL bReadyToRunRejectedPrecompiledCode = FALSE) {};
Copy link
Member

Choose a reason for hiding this comment

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

@brianrob I don't understand this change. Why do we need to change the signature of MethodJitted?

Copy link
Member

Choose a reason for hiding this comment

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

This is unrelated to the FEATURE_PERFTRACING. It is related to #15801 which changed the signature of MethodJitted when FEATURE_EVENT_TRACE is defined, but not when it's not.

Copy link
Member

Choose a reason for hiding this comment

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

@brianrob thanks!

@brianrob
Copy link
Member

@llamadonica, thanks for contributing this. Can you please sign the CLA and then we can merge this when the CI completes.

@brianrob brianrob merged commit 3c3596e into dotnet:master Mar 26, 2018
@llamadonica llamadonica deleted the issue-17199-disable-perftracing branch March 26, 2018 22:32
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants