[Process] Improve debugging info and slight refactor of CreateProcess

diff --git a/mono/io-layer/handles.c b/mono/io-layer/handles.c
index f31d6cbfb4e1d984b52e866c5c3b5970c370d112..814d216fe5cc24351bdcef16c47b34d417dcdcee 100644 (file)
--- a/mono/io-layer/handles.c
+++ b/mono/io-layer/handles.c
@@ -984,12 +984,12 @@ void _wapi_handle_ref (gpointer handle)
        struct _WapiHandleUnshared *handle_data;
 
        if (!_WAPI_PRIVATE_VALID_SLOT (idx)) {
+               MONO_TRACE (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Attempting to ref invalid private handle %p", __func__, handle);
                return;
        }
        
        if (_wapi_handle_type (handle) == WAPI_HANDLE_UNUSED) {
-               g_warning ("%s: Attempting to ref unused handle %p", __func__,
-                          handle);
+               MONO_TRACE (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Attempting to ref unused handle %p", __func__, handle);
                return;
        }
 

diff --git a/mono/io-layer/io.c b/mono/io-layer/io.c
index 24ec5baffb37370c346d81591ceaae514aac1845..5d10b370a9c8309a629414a236804a9d1a7962c6 100644 (file)
--- a/mono/io-layer/io.c
+++ b/mono/io-layer/io.c
@@ -1172,7 +1172,7 @@ static void pipe_close (gpointer handle, gpointer data)
        struct _WapiHandle_file *pipe_handle = (struct _WapiHandle_file*)data;
        int fd = pipe_handle->fd;
 
-       MONO_TRACE (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: closing pipe handle %p", __func__, handle);
+       MONO_TRACE (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: closing pipe handle %p fd %d", __func__, handle, fd);
 
        /* No filename with pipe handles */
 

diff --git a/mono/io-layer/processes.c b/mono/io-layer/processes.c
index 0157e92f5be08fc6b56f0590393d9f0030d5917f..1136d17dcb2deb3aca5ab0c3d1daf0ca6244862d 100644 (file)
--- a/mono/io-layer/processes.c
+++ b/mono/io-layer/processes.c
@@ -971,19 +971,14 @@ gboolean CreateProcess (const gunichar2 *appname, const gunichar2 *cmdline,
                MONO_TRACE (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: new process startup not synchronized. We may not notice if the newly created process exits immediately.", __func__);
        }
 
-       thr_ret = _wapi_handle_lock_shared_handles ();
-       g_assert (thr_ret == 0);
-       
-       pid = fork ();
-       if (pid == -1) {
-               /* Error */
+       switch (pid = fork ()) {
+       case -1: /* Error */ {
                SetLastError (ERROR_OUTOFMEMORY);
                ret = FALSE;
                fork_failed = TRUE;
-               goto cleanup;
-       } else if (pid == 0) {
-               /* Child */
-               
+               break;
+       }
+       case 0: /* Child */ {
                if (startup_pipe [0] != -1) {
                        /* Wait until the parent has updated it's internal data */
                        ssize_t _i G_GNUC_UNUSED = read (startup_pipe [0], &dummy, 1);
@@ -1028,56 +1023,59 @@ gboolean CreateProcess (const gunichar2 *appname, const gunichar2 *cmdline,
                
                /* set error */
                _exit (-1);
+
+               break;
        }
-       /* parent */
-       
-       process_handle_data = lookup_process_handle (handle);
-       if (!process_handle_data) {
-               g_warning ("%s: error looking up process handle %p", __func__,
-                          handle);
-               _wapi_handle_unref (handle);
-               goto cleanup;
-       }
-       
-       process_handle_data->id = pid;
+       default: /* Parent */ {
+               thr_ret = _wapi_handle_lock_shared_handles ();
+               g_assert (thr_ret == 0);
 
-       /* Add our mono_process into the linked list of mono_processes */
-       mono_process = (struct MonoProcess *) g_malloc0 (sizeof (struct MonoProcess));
-       mono_process->pid = pid;
-       mono_process->handle_count = 1;
-       if (mono_os_sem_init (&mono_process->exit_sem, 0) != 0) {
-               /* If we can't create the exit semaphore, we just don't add anything
-                * to our list of mono processes. Waiting on the process will return 
-                * immediately. */
-               g_warning ("%s: could not create exit semaphore for process.", strerror (errno));
-               g_free (mono_process);
-       } else {
-               /* Keep the process handle artificially alive until the process
-                * exits so that the information in the handle isn't lost. */
-               _wapi_handle_ref (handle);
-               mono_process->handle = handle;
+               process_handle_data = lookup_process_handle (handle);
+               if (!process_handle_data) {
+                       g_warning ("%s: error looking up process handle %p", __func__, handle);
+                       _wapi_handle_unref (handle);
+               } else {
+                       process_handle_data->id = pid;
+
+                       /* Add our mono_process into the linked list of mono_processes */
+                       mono_process = (struct MonoProcess *) g_malloc0 (sizeof (struct MonoProcess));
+                       mono_process->pid = pid;
+                       mono_process->handle_count = 1;
+                       if (mono_os_sem_init (&mono_process->exit_sem, 0) != 0) {
+                               /* If we can't create the exit semaphore, we just don't add anything
+                                * to our list of mono processes. Waiting on the process will return 
+                                * immediately. */
+                               g_warning ("%s: could not create exit semaphore for process.", strerror (errno));
+                               g_free (mono_process);
+                       } else {
+                               /* Keep the process handle artificially alive until the process
+                                * exits so that the information in the handle isn't lost. */
+                               _wapi_handle_ref (handle);
+                               mono_process->handle = handle;
 
-               process_handle_data->mono_process = mono_process;
+                               process_handle_data->mono_process = mono_process;
 
-               mono_os_mutex_lock (&mono_processes_mutex);
-               mono_process->next = mono_processes;
-               mono_processes = mono_process;
-               mono_os_mutex_unlock (&mono_processes_mutex);
-       }
-       
-       if (process_info != NULL) {
-               process_info->hProcess = handle;
-               process_info->dwProcessId = pid;
+                               mono_os_mutex_lock (&mono_processes_mutex);
+                               mono_process->next = mono_processes;
+                               mono_processes = mono_process;
+                               mono_os_mutex_unlock (&mono_processes_mutex);
+                       }
 
-               /* FIXME: we might need to handle the thread info some
-                * day
-                */
-               process_info->hThread = INVALID_HANDLE_VALUE;
-               process_info->dwThreadId = 0;
-       }
+                       if (process_info != NULL) {
+                               process_info->hProcess = handle;
+                               process_info->dwProcessId = pid;
 
-cleanup:
-       _wapi_handle_unlock_shared_handles ();
+                               /* FIXME: we might need to handle the thread info some day */
+                               process_info->hThread = INVALID_HANDLE_VALUE;
+                               process_info->dwThreadId = 0;
+                       }
+               }
+
+               _wapi_handle_unlock_shared_handles ();
+
+               break;
+       }
+       }
 
        if (fork_failed)
                _wapi_handle_unref (handle);