Add fix for bug #106971, and remove some unneeded '|| die' text.

(Portage version: 2.0.51.22-r2)

1 files changed, 206 insertions, 0 deletions

diff --git a/dev-lang/mono/files/mono-1.1.9.1-io-layer-fix.diff b/dev-lang/mono/files/mono-1.1.9.1-io-layer-fix.diff
new file mode 100644
index 000000000000..a42d7484e516
--- /dev/null
+++ b/dev-lang/mono/files/mono-1.1.9.1-io-layer-fix.diff
@@ -0,0 +1,206 @@
+Index: mono/io-layer/handles.c
+===================================================================
+--- mono/io-layer/handles.c	(revision 50600)
++++ mono/io-layer/handles.c	(working copy)
+@@ -351,10 +351,6 @@
+ 		_wapi_private_handle_count += _WAPI_HANDLE_INITIAL_COUNT;
+ 	}
+ 		
+-	thr_ret = mono_mutex_unlock (&scan_mutex);
+-	g_assert (thr_ret == 0);
+-	pthread_cleanup_pop (0);
+-		
+ 	/* Make sure we left the space for fd mappings */
+ 	g_assert (handle_idx >= _wapi_fd_reserve);
+ 	
+@@ -375,7 +371,8 @@
+ 							  handle_specific);
+ 			if (offset == 0) {
+ 				/* FIXME: grow the arrays */
+-				return (_WAPI_HANDLE_INVALID);
++				handle = _WAPI_HANDLE_INVALID;
++				goto done;
+ 			}
+ 		}
+ 		
+@@ -386,7 +383,8 @@
+ 
+ 			if (ref == 0) {
+ 				/* FIXME: grow the arrays */
+-				return (_WAPI_HANDLE_INVALID);
++				handle = _WAPI_HANDLE_INVALID;
++				goto done;
+ 			}
+ 		}
+ 		
+@@ -396,6 +394,11 @@
+ 			   ref);
+ #endif
+ 	}
++		
++done:
++	thr_ret = mono_mutex_unlock (&scan_mutex);
++	g_assert (thr_ret == 0);
++	pthread_cleanup_pop (0);
+ 	
+ 	return(handle);
+ }
+@@ -403,7 +406,7 @@
+ gpointer _wapi_handle_new_from_offset (WapiHandleType type, guint32 offset)
+ {
+ 	guint32 handle_idx = 0;
+-	gpointer handle;
++	gpointer handle = INVALID_HANDLE_VALUE;
+ 	int thr_ret, i, k;
+ 	
+ 	mono_once (&shared_init_once, shared_init);
+@@ -417,6 +420,11 @@
+ 	g_assert(_WAPI_SHARED_HANDLE(type));
+ 	g_assert(offset != 0);
+ 		
++	pthread_cleanup_push ((void(*)(void *))mono_mutex_unlock_in_cleanup,
++			      (void *)&scan_mutex);
++	thr_ret = mono_mutex_lock (&scan_mutex);
++	g_assert (thr_ret == 0);
++
+ 	for (i = SLOT_INDEX (0); _wapi_private_handles [i] != NULL; i++) {
+ 		for (k = SLOT_OFFSET (0); k < _WAPI_HANDLE_INITIAL_COUNT; k++) {
+ 			struct _WapiHandleUnshared *handle_data = &_wapi_private_handles [i][k];
+@@ -424,14 +432,24 @@
+ 			if (handle_data->type == type &&
+ 			    handle_data->u.shared.offset == offset) {
+ 				handle = GUINT_TO_POINTER (i * _WAPI_HANDLE_INITIAL_COUNT + k);
+-				_wapi_handle_ref (handle);
++				goto first_pass_done;
++			}
++		}
++	}
+ 
++first_pass_done:
++	thr_ret = mono_mutex_unlock (&scan_mutex);
++	g_assert (thr_ret == 0);
++	pthread_cleanup_pop (0);
++
++	if (handle != INVALID_HANDLE_VALUE) {
++		_wapi_handle_ref (handle);
++
+ #ifdef DEBUG
+-				g_message ("%s: Returning old handle %p referencing 0x%x", __func__, handle, offset);
++		g_message ("%s: Returning old handle %p referencing 0x%x",
++			   __func__, handle, offset);
+ #endif
+-				return (handle);
+-			}
+-		}
++		return (handle);
+ 	}
+ 
+ 	pthread_cleanup_push ((void(*)(void *))mono_mutex_unlock_in_cleanup,
+@@ -713,8 +731,13 @@
+ 	gpointer ret = NULL;
+ 	guint32 i, k;
+ 	gboolean found = FALSE;
++	int thr_ret;
+ 
+-
++	pthread_cleanup_push ((void(*)(void *))mono_mutex_unlock_in_cleanup,
++			      (void *)&scan_mutex);
++	thr_ret = mono_mutex_lock (&scan_mutex);
++	g_assert (thr_ret == 0);
++	
+ 	for (i = SLOT_INDEX (0); !found && _wapi_private_handles [i] != NULL; i++) {
+ 		for (k = SLOT_OFFSET (0); k < _WAPI_HANDLE_INITIAL_COUNT; k++) {
+ 			handle_data = &_wapi_private_handles [i][k];
+@@ -729,6 +752,10 @@
+ 		}
+ 	}
+ 
++	thr_ret = mono_mutex_unlock (&scan_mutex);
++	g_assert (thr_ret == 0);
++	pthread_cleanup_pop (0);
++
+ 	if (!found && _WAPI_SHARED_HANDLE (type)) {
+ 		/* Not found yet, so search the shared memory too */
+ #ifdef DEBUG
+@@ -1564,7 +1591,13 @@
+ {
+ 	struct _WapiHandleUnshared *handle_data;
+ 	guint32 i, k;
+-
++	int thr_ret;
++	
++	pthread_cleanup_push ((void(*)(void *))mono_mutex_unlock_in_cleanup,
++			      (void *)&scan_mutex);
++	thr_ret = mono_mutex_lock (&scan_mutex);
++	g_assert (thr_ret == 0);
++	
+ 	for(i = SLOT_INDEX (0); _wapi_private_handles [i] != NULL; i++) {
+ 		for (k = SLOT_OFFSET (0); k < _WAPI_HANDLE_INITIAL_COUNT; k++) {
+ 			handle_data = &_wapi_private_handles [i][k];
+@@ -1582,6 +1615,10 @@
+ 			g_print ("\n");
+ 		}
+ 	}
++
++	thr_ret = mono_mutex_unlock (&scan_mutex);
++	g_assert (thr_ret == 0);
++	pthread_cleanup_pop (0);
+ }
+ 
+ static void _wapi_shared_details (gpointer handle_info)
+@@ -1602,6 +1639,10 @@
+ 	thr_ret = _wapi_shm_sem_lock (_WAPI_SHARED_SEM_SHARE);
+ 	g_assert(thr_ret == 0);
+ 
++	pthread_cleanup_push ((void(*)(void *))mono_mutex_unlock_in_cleanup,
++			      (void *)&scan_mutex);
++	thr_ret = mono_mutex_lock (&scan_mutex);
++	
+ 	for(i = SLOT_INDEX (0); _wapi_private_handles [i] != NULL; i++) {
+ 		for (k = SLOT_OFFSET (0); k < _WAPI_HANDLE_INITIAL_COUNT; k++) {
+ 			struct _WapiHandleUnshared *handle = &_wapi_private_handles [i][k];
+@@ -1644,6 +1685,10 @@
+ 			}
+ 		}
+ 	}
++
++	thr_ret = mono_mutex_unlock (&scan_mutex);
++	g_assert (thr_ret == 0);
++	pthread_cleanup_pop (0);
+ 	
+ 	thr_ret = _wapi_shm_sem_unlock (_WAPI_SHARED_SEM_SHARE);
+ 
+Index: mono/io-layer/processes.c
+===================================================================
+--- mono/io-layer/processes.c	(revision 50600)
++++ mono/io-layer/processes.c	(working copy)
+@@ -97,6 +97,11 @@
+ 	int status;
+ 	pid_t ret;
+ 	
++	if (_wapi_handle_issignalled (test)) {
++		/* We've already done this one */
++		return (FALSE);
++	}
++	
+ 	ok = _wapi_lookup_handle (test, WAPI_HANDLE_PROCESS,
+ 				  (gpointer *)&process);
+ 	if (ok == FALSE) {
+@@ -104,14 +109,14 @@
+ 	}
+ 	
+ 	do {
+-		ret == waitpid (process->id, &status, WNOHANG);
++		ret = waitpid (process->id, &status, WNOHANG);
+ 	} while (errno == EINTR);
+ 	
+ 	if (ret <= 0) {
+ 		/* Process not ready for wait */
+ #ifdef DEBUG
+-		g_message ("%s: Process %d not ready for waiting for",
+-			   __func__, ret);
++		g_message ("%s: Process %d not ready for waiting for: %s",
++			   __func__, process->id, g_strerror (errno));
+ #endif
+ 
+ 		return (FALSE);