Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Mason <davmason@microsoft.com>2021-06-15 21:54:02 +0300
committerGitHub <noreply@github.com>2021-06-15 21:54:02 +0300
commitab71c1f4031d449ed3d60ccaaecb629bb73b648a (patch)
tree891426baadbc67a3718edc12632887ef5cc83d00 /src/coreclr/dlls
parent63c8ab2e7acedca0547bc9d59ba8b7d34faf3ddb (diff)
Add the concept of "notification profilers" to the runtime (#53122)
Diffstat (limited to 'src/coreclr/dlls')
-rw-r--r--src/coreclr/dlls/mscorrc/mscorrc.rc3
-rw-r--r--src/coreclr/dlls/mscorrc/resource.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/coreclr/dlls/mscorrc/mscorrc.rc b/src/coreclr/dlls/mscorrc/mscorrc.rc
index 20390aec94e..0b4247c17e6 100644
--- a/src/coreclr/dlls/mscorrc/mscorrc.rc
+++ b/src/coreclr/dlls/mscorrc/mscorrc.rc
@@ -745,7 +745,10 @@ BEGIN
IDS_PROF_V2PROFILER_DISABLED "Loading profiler failed. The profiler that was configured to load was designed for an older version of the CLR. You can use the COMPlus_ProfAPI_ProfilerCompatibilitySetting environment variable to allow older profilers to be loaded by the current version of the CLR. Please consult the documentation for information on how to use this environment variable, and the risks associated with it. Profiler CLSID: '%s'."
IDS_PROF_V2PROFILER_ENABLED "A profiler designed for an older version of the CLR was loaded because of the environment variable setting below. Older profilers will continue to work in many cases, but if you encounter problems, please consider upgrading the profiler or changing the setting of the environment variable. Please consult the documentation for information on how to use this environment variable, and the risks associated with it. Environment variable setting: %s=%s. Profiler CLSID: '%s'."
IDS_PROF_PROFILER_DISABLED "Profilers will not be loaded by the current version of the CLR because of the environment variable setting below. Please consult the documentation for information on how to use this environment variable, and the risks associated with it. Environment variable setting: %s=%s. Profiler CLSID: '%s'."
+ IDS_E_PROF_NOTIFICATION_DISABLED "Profiler was prevented from loading notification profiler due to app settings."
+ IDS_E_PROF_NOTIFICATION_LIMIT_EXCEEDED "Notification profiler was prevented from loading because the limit of notification profilers was reached."
IDS_E_PROF_TIMEOUT_WAITING_FOR_CONCURRENT_GC "Profiler timed out on waiting for concurrent GC to finish after '%d' milliseconds. Please configure your profiler to increase its attaching time out value or consult the documentation for the COMPlus_ProfAPI_AttachProfilerMinTimeoutInMs environment variable and try again. Profiler CLSID: '%s'."
+ IDS_PROF_ALREADY_LOADED "A request was made to load a profiler when a profiler was already loaded."
END
diff --git a/src/coreclr/dlls/mscorrc/resource.h b/src/coreclr/dlls/mscorrc/resource.h
index b26dc856742..8038665a0b8 100644
--- a/src/coreclr/dlls/mscorrc/resource.h
+++ b/src/coreclr/dlls/mscorrc/resource.h
@@ -549,6 +549,9 @@
#define IDS_PROF_SUPPLEMENTARY_INFO 0x2506
#define IDS_PROF_LOAD_COMPLETE 0x2507
#define IDS_E_PROF_BAD_PATH 0x2508
+#define IDS_E_PROF_NOTIFICATION_DISABLED 0x2509
+#define IDS_PROF_ALREADY_LOADED 0x250A
+#define IDS_E_PROF_NOTIFICATION_LIMIT_EXCEEDED 0x250B
#define IDS_E_PROF_NOT_ATTACHABLE 0x250E
#define IDS_E_PROF_UNHANDLED_EXCEPTION_ON_LOAD 0x250F
#define IDS_PROF_ATTACH_REQUEST_RECEIVED 0x2512