#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
*
/* convert to MINGW/Unix values */
switch (prio)
{
- case GNUNET_SCHEDULER_PRIORITY_DEFAULT:
+ case GNUNET_SCHEDULER_PRIORITY_UI:
+ case GNUNET_SCHEDULER_PRIORITY_URGENT:
#ifdef MINGW
- rprio = NORMAL_PRIORITY_CLASS;
+ rprio = HIGH_PRIORITY_CLASS;
#else
rprio = 0;
#endif
break;
+
case GNUNET_SCHEDULER_PRIORITY_HIGH:
#ifdef MINGW
rprio = ABOVE_NORMAL_PRIORITY_CLASS;
#else
- rprio = -5;
+ rprio = 5;
#endif
break;
- case GNUNET_SCHEDULER_PRIORITY_BACKGROUND:
+
+ case GNUNET_SCHEDULER_PRIORITY_DEFAULT:
#ifdef MINGW
- rprio = BELOW_NORMAL_PRIORITY_CLASS;
+ rprio = NORMAL_PRIORITY_CLASS;
#else
- rprio = 10;
+ rprio = 7;
#endif
break;
- case GNUNET_SCHEDULER_PRIORITY_UI:
- case GNUNET_SCHEDULER_PRIORITY_URGENT:
+
+ case GNUNET_SCHEDULER_PRIORITY_BACKGROUND:
#ifdef MINGW
- rprio = HIGH_PRIORITY_CLASS;
+ rprio = BELOW_NORMAL_PRIORITY_CLASS;
#else
- rprio = -10;
+ rprio = 10;
#endif
break;
+
case GNUNET_SCHEDULER_PRIORITY_IDLE:
#ifdef MINGW
rprio = IDLE_PRIORITY_CLASS;
/* Set process priority */
#ifdef MINGW
SetPriorityClass (GetCurrentProcess (), rprio);
-#else
- if (proc == getpid ())
+#elif LINUX
+ if ( (0 == proc) ||
+ (proc == getpid () ) )
{
+ int have = nice (0);
+ int delta = rprio - have;
errno = 0;
- if ((-1 == nice (rprio)) && (errno != 0))
+ if ( (delta != 0) &&
+ (rprio == nice (delta)) &&
+ (errno != 0) )
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING |
GNUNET_ERROR_TYPE_BULK, "nice");
return GNUNET_SYSERR;
}
}
+#else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
+ "Priority management not availabe for this platform\n");
#endif
return GNUNET_OK;
}
/**
* 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!!! */
- /* FIXME: Make this work with stdin as well as stdout! */
va_list ap;
#ifndef MINGW
char **argv;
int argc;
int fd_stdout_write;
+ int fd_stdout_read;
int fd_stdin_read;
+ int fd_stdin_write;
argc = 0;
va_start (ap, filename);
argc++;
va_end (ap);
if (pipe_stdout != NULL)
- GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdout, GNUNET_DISK_PIPE_END_WRITE), &fd_stdout_write, sizeof (int));
+ {
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdout, GNUNET_DISK_PIPE_END_WRITE), &fd_stdout_write, sizeof (int));
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdout, GNUNET_DISK_PIPE_END_READ), &fd_stdout_read, sizeof (int));
+ }
if (pipe_stdin != NULL)
- GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdout, GNUNET_DISK_PIPE_END_READ), &fd_stdin_read, sizeof (int));
+ {
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdin, GNUNET_DISK_PIPE_END_READ), &fd_stdin_read, sizeof (int));
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdin, GNUNET_DISK_PIPE_END_WRITE), &fd_stdin_write, sizeof (int));
+ }
#if HAVE_WORKING_VFORK
ret = vfork ();
}
else
{
+
#if HAVE_WORKING_VFORK
/* let's hope vfork actually works; for some extreme cases (including
a testcase) we need 'execvp' to have run before we return, since
#else
/* let's give the child process a chance to run execvp, 1s should
be plenty in practice */
- sleep (1);
if (pipe_stdout != NULL)
GNUNET_DISK_pipe_close_end(pipe_stdout, GNUNET_DISK_PIPE_END_WRITE);
if (pipe_stdin != NULL)
GNUNET_DISK_pipe_close_end(pipe_stdin, GNUNET_DISK_PIPE_END_READ);
+ sleep (1);
#endif
}
GNUNET_free (argv);
{
dup2(fd_stdout_write, 1);
close (fd_stdout_write);
+ close (fd_stdout_read);
}
- if (pipe_stdout != NULL)
+ if (pipe_stdin != NULL)
{
+
dup2(fd_stdin_read, 0);
close (fd_stdin_read);
+ close (fd_stdin_write);
}
execvp (filename, argv);
char *cmd, *idx;
STARTUPINFO start;
PROCESS_INFORMATION proc;
+#if NILS
+ HANDLE stdin_handle;
+ HANDLE stdout_handle;
+#endif
char *fn;
int len;
+ char path[MAX_PATH + 1];
cmdlen = 0;
va_start (ap, filename);
memset (&start, 0, sizeof (start));
start.cb = sizeof (start);
- len = strlen (filename);
- if (strnicmp (filename + len - 4, ".exe", 4) == 0)
- fn = filename;
- else
- GNUNET_asprintf (&fn, "%s.exe", filename);
+#if NILS
+ if ((pipe_stdin != NULL) || (pipe_stdout != NULL))
+ start.dwFlags |= STARTF_USESTDHANDLES;
+
+ if (pipe_stdin != NULL)
+ {
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdin, GNUNET_DISK_PIPE_END_READ), &stdin_handle, sizeof (HANDLE));
+ start.hStdInput = stdin_handle;
+ }
+
+ if (pipe_stdout != NULL)
+ {
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdout, GNUNET_DISK_PIPE_END_WRITE), &stdout_handle, sizeof (HANDLE));
+ start.hStdOutput = stdout_handle;
+ }
+#endif
+ if (FindExecutable(filename, NULL, path) <= 32)
+ {
+ SetErrnoFromWinError (GetLastError ());
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "FindExecutable", fn);
+ return -1;
+ }
if (!CreateProcess
- (fn, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &start,
+ (path, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &start,
&proc))
{
SetErrnoFromWinError (GetLastError ());
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;
projects / oweals / gnunet.git / blobdiff