#include "gnunet_os_lib.h"
#include "disk.h"
+#if WINDOWS
+#include "gnunet_signal_lib.h"
+
+extern GNUNET_SIGNAL_Handler w32_sigchld_handler;
+
+/**
+ * @brief Waits for a process to terminate and invokes the SIGCHLD handler
+ * @param h handle to the process
+ */
+static DWORD WINAPI
+ChildWaitThread (HANDLE h)
+{
+ WaitForSingleObject (h, INFINITE);
+
+ if (w32_sigchld_handler)
+ w32_sigchld_handler ();
+
+ CloseHandle (h);
+}
+#endif
+
/**
* Set process priority
*
/**
* Start a process.
*
+ * @param pipe_stdin pipe to use to send input to child process (or NULL)
+ * @param pipe_stdout pipe to use to get output from child process (or NULL)
* @param filename name of the binary
* @param ... NULL-terminated list of arguments to the process
* @return process ID of the new process, -1 on error
*/
pid_t
-GNUNET_OS_start_process (struct GNUNET_DISK_PipeHandle *pipe_stdin, struct GNUNET_DISK_PipeHandle *pipe_stdout, const char *filename, ...)
+GNUNET_OS_start_process (struct GNUNET_DISK_PipeHandle *pipe_stdin,
+ struct GNUNET_DISK_PipeHandle *pipe_stdout,
+ const char *filename, ...)
{
/* FIXME: Make this work on windows!!! */
va_list ap;
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "CreateProcess", fn);
return -1;
}
+
+ CreateThread (NULL, 64000, ChildWaitThread, proc.hProcess, 0, NULL);
+
if (fn != filename)
GNUNET_free (fn);
- CloseHandle (proc.hProcess);
CloseHandle (proc.hThread);
GNUNET_free (cmd);
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "fork");
return -1;
}
- CloseHandle (proc.hProcess);
- CloseHandle (proc.hThread);
+ CreateThread (NULL, 64000, ChildWaitThread, proc.hProcess, 0, NULL);
+
+ CloseHandle (proc.hThread);
GNUNET_free (cmd);
return proc.dwProcessId;