summaryrefslogtreecommitdiff
path: root/src/vm/profilinghelper.cpp
diff options
context:
space:
mode:
authorAustin Wise <AustinWise@gmail.com>2018-10-08 20:46:27 -0700
committerJan Kotas <jkotas@microsoft.com>2018-10-08 20:46:27 -0700
commit3f40e5280e376a01cc06f921b01f68319aa10ecc (patch)
tree15a5fdf225304ebc087c88048ecf4b69e2323e75 /src/vm/profilinghelper.cpp
parent913428d5915a9729c9405f57a75e7f912f9d29a5 (diff)
downloadcoreclr-3f40e5280e376a01cc06f921b01f68319aa10ecc.tar.gz
coreclr-3f40e5280e376a01cc06f921b01f68319aa10ecc.tar.bz2
coreclr-3f40e5280e376a01cc06f921b01f68319aa10ecc.zip
Remove mentions of Rotor from codebase (#20298)
* Moving parsing from TypeNameParser ctor to a separate method. It seems a bit odd to have the constructor parsing and then use a dummy method (MakeRotorHappy) to make it look more normal. * Remove CorMarkThreadInThreadPool. It is neither referenced nor exported. * Remove reference to rotor from securitywrapper.h * Remove reference to rotor from Strike/vm.cpp. This file is only built for Windows. * Remove reference to rotor from debugreturn.h This is the only file the defines these macros, so there is no need to undef them first. * Remove unused code refering to rotor from PAL. * Remove references to Rotor from PAL. * Remove references to deleted tests from DisabledTests.txt I can't find any evidence that this file is actually used. * Remove unneeded casts. * Remove dead and misleading code from profilinghelper.cpp. FEATURE_PROFAPI_EVENT_LOGGING is always defined when PROFILING_SUPPORTED is defined. And the entire contents of profilinghelper.cpp is surrounded with "ifdef PROFILING_SUPPORTED". So all sections in "ifndef FEATURE_PROFAPI_EVENT_LOGGING" are dead. Furthermore, in coreclr this does not use the eventlog, so the macro name is misleading. * Remove dead code in excep.cpp. This entire function is surrounded with "ifndef FEATURE_PAL". * Remove refererences to rotor from safemath.h This does not appear to cause any compile problems, so nobody was using safemath.h without _ASSERTE defined. Also S_SIZE_T_WP64BUG is not used anywhere. * Remove dead code from palclr.h. I don't know why these check to see if the macro is undefined immediately after defining them. Also the comment appears to reference some unions that are no longer in this file. * Expose ISymUnmanagedWriter2 from SymWriter as required by COM. The comment talks about the C# compiler using this, however I cannot see a way for the C# compiler to get an instance of this. It is only used internally by AssemblyBuilder and not exposed otherwise. * Restore check for _ASSERTE in safemath.h. On Windows sometimes that this file is included without _ASSERTE being defined. As the existing comment suggests, it appears that SOS explicitly does not want _ASSERTE to do anything.
Diffstat (limited to 'src/vm/profilinghelper.cpp')
-rw-r--r--src/vm/profilinghelper.cpp23
1 files changed, 1 insertions, 22 deletions
diff --git a/src/vm/profilinghelper.cpp b/src/vm/profilinghelper.cpp
index a7c64e77ba..8452eb8d65 100644
--- a/src/vm/profilinghelper.cpp
+++ b/src/vm/profilinghelper.cpp
@@ -365,20 +365,6 @@ void ProfilingAPIUtility::LogProfEventVA(
}
CONTRACTL_END;
-#ifndef FEATURE_PROFAPI_EVENT_LOGGING
-
-
- // Rotor messages go to message boxes
-
- EEMessageBoxCatastrophic(
- iStringResourceID, // Text message to display
- IDS_EE_PROFILING_FAILURE, // Titlebar of message box
- insertionArgs); // Insertion strings for text message
-
-#else // FEATURE_PROFAPI_EVENT_LOGGING
-
- // Non-rotor messages go to the event log
-
StackSString messageFromResource;
StackSString messageToLog;
@@ -395,10 +381,8 @@ void ProfilingAPIUtility::LogProfEventVA(
AppendSupplementaryInformation(iStringResourceID, &messageToLog);
- // CoreCLR on Windows ouputs debug strings for diagnostic messages.
+ // Ouput debug strings for diagnostic messages.
WszOutputDebugString(messageToLog);
-
-#endif // FEATURE_PROFAPI_EVENT_LOGGING
}
// See code:ProfilingAPIUtility.LogProfEventVA for description of arguments.
@@ -440,10 +424,6 @@ void ProfilingAPIUtility::LogProfInfo(int iStringResourceID, ...)
}
CONTRACTL_END;
-// Rotor uses message boxes instead of event log, and it would be disruptive to
-// pop a messagebox in the user's face every time an app runs with a profiler
-// configured to load. So only log this only when we don't do a pop-up.
-#ifdef FEATURE_PROFAPI_EVENT_LOGGING
va_list insertionArgs;
va_start(insertionArgs, iStringResourceID);
LogProfEventVA(
@@ -451,7 +431,6 @@ void ProfilingAPIUtility::LogProfInfo(int iStringResourceID, ...)
EVENTLOG_INFORMATION_TYPE,
insertionArgs);
va_end(insertionArgs);
-#endif //FEATURE_PROFAPI_EVENT_LOGGING
}
#ifdef PROF_TEST_ONLY_FORCE_ELT