diff options
| author | Scott Mosier <smosier@microsoft.com> | 2015-11-05 01:51:04 +0300 |
|---|---|---|
| committer | Scott Mosier <smosier@microsoft.com> | 2015-11-20 03:06:03 +0300 |
| commit | c03d823a11f54e734e340813e6cd1e543ca448ef (patch) | |
| tree | 9253c3230e07568377a5744ffd8c0932774a3989 /src/Native/Runtime/Profiling.cpp | |
| parent | 896131b2af7bc8f3f01e56e391e9c186726f5c6f (diff) | |
Changes required to integrate code back into ProjectN tree
Diffstat (limited to 'src/Native/Runtime/Profiling.cpp')
| -rw-r--r-- | src/Native/Runtime/Profiling.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/Native/Runtime/Profiling.cpp b/src/Native/Runtime/Profiling.cpp index cd0e0c294..11ff90ce4 100644 --- a/src/Native/Runtime/Profiling.cpp +++ b/src/Native/Runtime/Profiling.cpp @@ -2,15 +2,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -#include "rhcommon.h" -#ifdef DACCESS_COMPILE -#include "gcrhenv.h" -#endif // DACCESS_COMPILE - -#ifndef DACCESS_COMPILE +#include "common.h" #include "CommonTypes.h" -#include "daccess.h" #include "CommonMacros.h" +#include "daccess.h" #include "PalRedhawkCommon.h" #include "PalRedhawk.h" #include "assert.h" @@ -23,12 +18,6 @@ #include "RuntimeInstance.h" #include "gcrhinterface.h" #include "module.h" -#else -#include "rhbinder.h" -#include "runtimeinstance.h" -#include "gcrhinterface.h" -#include "module.h" -#endif // Macro nonsense to get around limitations of the C++ preprocessor. #define MAKE_WIDE_STRING(_str) L ## _str @@ -53,7 +42,9 @@ UInt32 __stdcall ProfileThread(void *pv) void RuntimeInstance::InitProfiling(ModuleHeader *pModuleHeader) { -#ifndef APP_LOCAL_RUNTIME //need to sort out how to get this thread started, where to log, etc., without violating the WACK +#ifdef APP_LOCAL_RUNTIME //need to sort out how to get this thread started, where to log, etc., without violating the WACK + UNREFERENCED_PARAMETER(pModuleHeader); +#else if (!m_fProfileThreadCreated && pModuleHeader->GetProfilingEntries() != NULL) { // this module has profile data, and we don't have a profile-writing thread yet |