X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini-windows.c;h=efb4739cde2c95866f9dcb34a2643fcf933a76d3;hb=118a5c70ed6deb963573f8f69e4c910efe952c87;hp=728583f3bf1b6c504ffbf9b82614cad8dce5d701;hpb=fee5ece80556eb45d16da5f6c0fde991e5af1d40;p=mono.git

diff --git a/mono/mini/mini-windows.c b/mono/mini/mini-windows.c
index 728583f3bf1..efb4739cde2 100644
--- a/mono/mini/mini-windows.c
+++ b/mono/mini/mini-windows.c
@@ -1,5 +1,6 @@
-/*
- * mini-posix.c: POSIX signal handling support for Mono.
+/**
+ * \file
+ * POSIX signal handling support for Mono.
  *
  * Authors:
  *   Mono Team (mono-list@lists.ximian.com)
@@ -26,8 +27,6 @@
 #include <mono/metadata/threads.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/debug-helpers.h>
-#include <mono/io-layer/io-layer.h>
-#include "mono/metadata/profiler.h"
 #include <mono/metadata/profiler-private.h>
 #include <mono/metadata/mono-config.h>
 #include <mono/metadata/environment.h>
@@ -255,7 +254,7 @@ mono_runtime_cleanup_handlers (void)
 gboolean
 MONO_SIG_HANDLER_SIGNATURE (mono_chain_signal)
 {
-	MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+	MonoJitTlsData *jit_tls = mono_tls_get_jit_tls ();
 	jit_tls->mono_win_chained_exception_needs_run = TRUE;
 	return TRUE;
 }
@@ -271,11 +270,15 @@ thread_timer_expired (HANDLE thread)
 
 	context.ContextFlags = CONTEXT_CONTROL;
 	if (GetThreadContext (thread, &context)) {
+		guchar *ip;
+
 #ifdef _WIN64
-		mono_profiler_stat_hit ((guchar *) context.Rip, &context);
+		ip = (guchar *) context.Rip;
 #else
-		mono_profiler_stat_hit ((guchar *) context.Eip, &context);
+		ip = (guchar *) context.Eip;
 #endif
+
+		MONO_PROFILER_RAISE (sample_hit, (ip, &context));
 	}
 }