From: Ludovic Henry <ludovic@xamarin.com>
Date: Fri, 15 Jul 2016 01:55:42 +0000 (+0200)
Subject: [io-layer] Remove unused _WAPI_THREAD_CURRENT
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=44e8f372860bf81de78d56293320937a660a56b1;p=mono.git

[io-layer] Remove unused _WAPI_THREAD_CURRENT
---

diff --git a/mono/io-layer/thread-private.h b/mono/io-layer/thread-private.h
index c5bb6cf3dfb..e9ff31e9aed 100644
--- a/mono/io-layer/thread-private.h
+++ b/mono/io-layer/thread-private.h
@@ -16,9 +16,6 @@
 
 #include "wapi-private.h"
 
-/* There doesn't seem to be a defined symbol for this */
-#define _WAPI_THREAD_CURRENT (gpointer)0xFFFFFFFE
-
 void
 _wapi_thread_init (void);
 
diff --git a/mono/io-layer/wait.c b/mono/io-layer/wait.c
index 7674aef01ef..9d9f34abc8c 100644
--- a/mono/io-layer/wait.c
+++ b/mono/io-layer/wait.c
@@ -69,15 +69,8 @@ guint32 WaitForSingleObjectEx(gpointer handle, guint32 timeout,
 	guint32 ret, waited;
 	int thr_ret;
 	gboolean apc_pending = FALSE;
-	gpointer current_thread;
 	gint64 wait_start, timeout_in_ticks;
 
-	current_thread = mono_thread_info_get_handle (mono_thread_info_current ());
-
-	if (handle == _WAPI_THREAD_CURRENT) {
-		handle = current_thread;
-	}
-
 	if ((GPOINTER_TO_UINT (handle) & _WAPI_PROCESS_UNHANDLED) == _WAPI_PROCESS_UNHANDLED) {
 		SetLastError (ERROR_INVALID_HANDLE);
 		return(WAIT_FAILED);
@@ -243,19 +236,8 @@ guint32 SignalObjectAndWait(gpointer signal_handle, gpointer wait,
 	guint32 ret = 0, waited;
 	int thr_ret;
 	gboolean apc_pending = FALSE;
-	gpointer current_thread;
 	gint64 wait_start, timeout_in_ticks;
 
-	current_thread = mono_thread_info_get_handle (mono_thread_info_current ());
-
-	if (signal_handle == _WAPI_THREAD_CURRENT) {
-		signal_handle = current_thread;
-	}
-
-	if (wait == _WAPI_THREAD_CURRENT) {
-		wait = current_thread;
-	}
-
 	if ((GPOINTER_TO_UINT (signal_handle) & _WAPI_PROCESS_UNHANDLED) == _WAPI_PROCESS_UNHANDLED) {
 		SetLastError (ERROR_INVALID_HANDLE);
 		return(WAIT_FAILED);
@@ -435,15 +417,12 @@ guint32 WaitForMultipleObjectsEx(guint32 numobjects, gpointer *handles,
 	guint i;
 	guint32 ret;
 	int thr_ret;
-	gpointer current_thread;
 	guint32 retval;
 	gboolean poll;
 	gpointer sorted_handles [MAXIMUM_WAIT_OBJECTS];
 	gboolean apc_pending = FALSE;
 	gint64 wait_start, timeout_in_ticks;
 	
-	current_thread = mono_thread_info_get_handle (mono_thread_info_current ());
-
 	if (numobjects > MAXIMUM_WAIT_OBJECTS) {
 		MONO_TRACE (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Too many handles: %d", __func__, numobjects);
 
@@ -456,10 +435,6 @@ guint32 WaitForMultipleObjectsEx(guint32 numobjects, gpointer *handles,
 
 	/* Check for duplicates */
 	for (i = 0; i < numobjects; i++) {
-		if (handles[i] == _WAPI_THREAD_CURRENT) {
-			handles[i] = current_thread;
-		}
-
 		if ((GPOINTER_TO_UINT (handles[i]) & _WAPI_PROCESS_UNHANDLED) == _WAPI_PROCESS_UNHANDLED) {
 			MONO_TRACE (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Handle %d pseudo process", __func__,
 				   i);
diff --git a/mono/io-layer/wapi.c b/mono/io-layer/wapi.c
index 5ab47ac9bc6..da38a144927 100644
--- a/mono/io-layer/wapi.c
+++ b/mono/io-layer/wapi.c
@@ -143,8 +143,6 @@ DuplicateHandle (gpointer srcprocess, gpointer src, gpointer targetprocess, gpoi
 
 	if (src == _WAPI_PROCESS_CURRENT) {
 		*target = _wapi_process_duplicate ();
-	} else if (src == _WAPI_THREAD_CURRENT) {
-		g_assert_not_reached ();
 	} else {
 		mono_w32handle_ref (src);
 		*target = src;