Merge pull request #1131 from Unity-Technologies/unity-master-fix-win-socket-race-condition

Windows support to abort blocking system calls. (mono#12654)

Author: UnityAlex

mono/metadata/w32file-win32.c

@@ -92,49 +92,46 @@ cancel_w32_io (HANDLE file_handle)
 gboolean
 mono_w32file_read (gpointer handle, gpointer buffer, guint32 numbytes, guint32 *bytesread)
 {
-	gboolean res = FALSE;
+
 	gboolean interrupted;
+	guint32 last_error;
+	gboolean res;
+
+	MonoThreadInfo *info = mono_thread_info_current ();
+
+	mono_win32_enter_blocking_io_call (info, (HANDLE)handle);
+	MONO_ENTER_GC_SAFE;
+	res = ReadFile ((HANDLE)handle, buffer, numbytes, (PDWORD)bytesread, NULL);
+	/* need to save and restore since clients expect error code set for
+	 * failed IO calls and mono_thread_info_uninstall_interrupt overwrites value */
+	last_error = mono_w32error_get_last ();
+
+	MONO_EXIT_GC_SAFE;
+	mono_win32_leave_blocking_io_call (info, (HANDLE)handle);
+	mono_w32error_set_last (last_error);
 
-	mono_thread_info_install_interrupt (cancel_w32_io, handle, &interrupted);
-	if (!interrupted)
-	{
-		guint32 last_error;
-		MONO_ENTER_GC_SAFE;
-		res = ReadFile (handle, buffer, numbytes, bytesread, NULL);
-		MONO_PROFILER_RAISE (fileio, (1, *bytesread));
-		MONO_EXIT_GC_SAFE;
-
-		/* need to save and restore since clients expect error code set for
-		 * failed IO calls and mono_thread_info_uninstall_interrupt overwrites value */
-		last_error = mono_w32error_get_last ();
-		mono_thread_info_uninstall_interrupt (&interrupted);
-		mono_w32error_set_last (last_error);
-	}
 
 	return res;
 }
 
 gboolean
 mono_w32file_write (gpointer handle, gconstpointer buffer, guint32 numbytes, guint32 *byteswritten)
 {
-	gboolean res = FALSE;
 	gboolean interrupted;
+	guint32 last_error;
+	gboolean res;
+	
+	MonoThreadInfo *info = mono_thread_info_current ();
 
-	mono_thread_info_install_interrupt (cancel_w32_io, handle, &interrupted);
-	if (!interrupted)
-	{
-		guint32 last_error;
-		MONO_ENTER_GC_SAFE;
-		res = WriteFile (handle, buffer, numbytes, byteswritten, NULL);
-		MONO_PROFILER_RAISE (fileio, (0, *byteswritten));
-		MONO_EXIT_GC_SAFE;
-
-		/* need to save and restore since clients expect error code set for
-		* failed IO calls and mono_thread_info_uninstall_interrupt overwrites value */
-		last_error = mono_w32error_get_last ();
-		mono_thread_info_uninstall_interrupt (&interrupted);
-		mono_w32error_set_last (last_error);
-	}
+	mono_win32_enter_blocking_io_call (info, (HANDLE)handle);
+	MONO_ENTER_GC_SAFE;
+	res = WriteFile ((HANDLE)handle, buffer, numbytes, (PDWORD)byteswritten, NULL);
+	/* need to save and restore since clients expect error code set for
+	* failed IO calls and mono_thread_info_uninstall_interrupt overwrites value */
+	last_error = mono_w32error_get_last ();
+	MONO_EXIT_GC_SAFE;
+	mono_win32_leave_blocking_io_call (info, (HANDLE)handle);
+	mono_w32error_set_last (last_error);
 
 	return res;
 }