projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure exception out argument is initialized to NULL. (#5424)
[mono.git]
/
mono
/
mini
/
mini-windows.c
diff --git
a/mono/mini/mini-windows.c
b/mono/mini/mini-windows.c
index 2d3c64f22e62ba0014bf63ff7dcb4f40619c4f84..efb4739cde2c95866f9dcb34a2643fcf933a76d3 100644
(file)
--- a/
mono/mini/mini-windows.c
+++ b/
mono/mini/mini-windows.c
@@
-27,7
+27,6
@@
#include <mono/metadata/threads.h>
#include <mono/metadata/appdomain.h>
#include <mono/metadata/debug-helpers.h>
#include <mono/metadata/threads.h>
#include <mono/metadata/appdomain.h>
#include <mono/metadata/debug-helpers.h>
-#include "mono/metadata/profiler.h"
#include <mono/metadata/profiler-private.h>
#include <mono/metadata/mono-config.h>
#include <mono/metadata/environment.h>
#include <mono/metadata/profiler-private.h>
#include <mono/metadata/mono-config.h>
#include <mono/metadata/environment.h>
@@
-271,11
+270,15
@@
thread_timer_expired (HANDLE thread)
context.ContextFlags = CONTEXT_CONTROL;
if (GetThreadContext (thread, &context)) {
context.ContextFlags = CONTEXT_CONTROL;
if (GetThreadContext (thread, &context)) {
+ guchar *ip;
+
#ifdef _WIN64
#ifdef _WIN64
-
mono_profiler_stat_hit ((guchar *) context.Rip, &context)
;
+
ip = (guchar *) context.Rip
;
#else
#else
-
mono_profiler_stat_hit ((guchar *) context.Eip, &context)
;
+
ip = (guchar *) context.Eip
;
#endif
#endif
+
+ MONO_PROFILER_RAISE (sample_hit, (ip, &context));
}
}
}
}