#include "gnunet_os_lib.h"
#include "disk.h"
+struct GNUNET_OS_Process
+{
+ pid_t pid;
+#if WINDOWS
+ HANDLE handle;
+#endif
+};
+
+static struct GNUNET_OS_Process current_process;
+
+
+#if WINDOWS
+void
+GNUNET_OS_process_set_handle(struct GNUNET_OS_Process *proc, HANDLE handle)
+{
+ if (proc->handle != NULL)
+ CloseHandle (proc->handle);
+ proc->handle = handle;
+}
+#endif
+
+
+/**
+ * Get process structure for current process
+ *
+ * The pointer it returns points to static memory location and must not be
+ * deallocated/closed
+ *
+ * @return pointer to the process sturcutre for this process
+ */
+struct GNUNET_OS_Process *
+GNUNET_OS_process_current ()
+{
+#if WINDOWS
+ current_process.pid = GetCurrentProcessId ();
+ current_process.handle = GetCurrentProcess ();
+#else
+ current_process.pid = 0;
+#endif
+ return ¤t_process;
+}
+
+int
+GNUNET_OS_process_kill (struct GNUNET_OS_Process *proc, int sig)
+{
+#if WINDOWS
+ if (sig == SIGKILL || sig == SIGTERM)
+ {
+ HANDLE h = proc->handle;
+ if (NULL == h)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Invalid process information {%d, %08X}\n"),
+ proc->pid,
+ h);
+ return -1;
+ }
+ if (!TerminateProcess (h, 0))
+ {
+ SetErrnoFromWinError (GetLastError ());
+ return -1;
+ }
+ else
+ return 0;
+ }
+ errno = EINVAL;
+ return -1;
+#else
+ return kill (proc->pid, sig);
+#endif
+}
+
+/**
+ * Get the pid of the process in question
+ *
+ * @param proc the process to get the pid of
+ *
+ * @return the current process id
+ */
+pid_t
+GNUNET_OS_process_get_pid (struct GNUNET_OS_Process *proc)
+{
+ return proc->pid;
+}
+
+void
+GNUNET_OS_process_close (struct GNUNET_OS_Process *proc)
+{
+#if WINDOWS
+ if (proc->handle != NULL)
+ CloseHandle (proc->handle);
+#endif
+ GNUNET_free (proc);
+}
+
#if WINDOWS
#include "gnunet_signal_lib.h"
extern GNUNET_SIGNAL_Handler w32_sigchld_handler;
+/**
+ * Make seaspider happy.
+ */
+#define DWORD_WINAPI DWORD WINAPI
+
/**
* @brief Waits for a process to terminate and invokes the SIGCHLD handler
- * @param h handle to the process
+ * @param proc pointer to process structure
*/
-static DWORD WINAPI
-ChildWaitThread (HANDLE h)
+static DWORD_WINAPI
+ChildWaitThread (void *arg)
{
- WaitForSingleObject (h, INFINITE);
+ struct GNUNET_OS_Process *proc = (struct GNUNET_OS_Process *) arg;
+ WaitForSingleObject (proc->handle, INFINITE);
if (w32_sigchld_handler)
w32_sigchld_handler ();
- CloseHandle (h);
+ return 0;
}
#endif
/**
* Set process priority
*
- * @param proc id of the process
+ * @param proc pointer to process structure
* @param prio priority value
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
-GNUNET_OS_set_process_priority (pid_t proc,
+GNUNET_OS_set_process_priority (struct GNUNET_OS_Process *proc,
enum GNUNET_SCHEDULER_Priority prio)
{
- int rprio = 0;
+ int rprio;
GNUNET_assert (prio < GNUNET_SCHEDULER_PRIORITY_COUNT);
if (prio == GNUNET_SCHEDULER_PRIORITY_KEEP)
return GNUNET_OK;
+
/* convert to MINGW/Unix values */
switch (prio)
{
GNUNET_assert (0);
return GNUNET_SYSERR;
}
+
/* Set process priority */
#ifdef MINGW
- SetPriorityClass (GetCurrentProcess (), rprio);
+ {
+ HANDLE h = proc->handle;
+ GNUNET_assert (h != NULL);
+ SetPriorityClass (h, rprio);
+ }
#elif LINUX
- if ( (0 == proc) ||
- (proc == getpid () ) )
+ pid_t pid;
+
+ pid = proc->pid;
+ if ( (0 == pid) ||
+ (pid == getpid () ) )
{
int have = nice (0);
int delta = rprio - have;
}
else
{
- if (0 != setpriority (PRIO_PROCESS, proc, rprio))
-
+ if (0 != setpriority (PRIO_PROCESS, pid, rprio))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING |
GNUNET_ERROR_TYPE_BULK, "setpriority");
* @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
+ * @return pointer to process structure of the new process, NULL on error
*/
-pid_t
+struct GNUNET_OS_Process *
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;
#ifndef MINGW
pid_t ret;
+ struct GNUNET_OS_Process *gnunet_proc = NULL;
char **argv;
int argc;
int fd_stdout_write;
GNUNET_DISK_pipe_close_end(pipe_stdin, GNUNET_DISK_PIPE_END_READ);
sleep (1);
#endif
+ gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
+ gnunet_proc->pid = ret;
}
GNUNET_free (argv);
- return ret;
+ return gnunet_proc;
}
if (pipe_stdout != NULL)
{
- dup2(fd_stdout_write, 1);
- close (fd_stdout_write);
- close (fd_stdout_read);
+ GNUNET_break (0 == close (fd_stdout_read));
+ if (-1 == dup2(fd_stdout_write, 1))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "dup2");
+ GNUNET_break (0 == close (fd_stdout_write));
}
if (pipe_stdin != NULL)
{
- dup2(fd_stdin_read, 0);
- close (fd_stdin_read);
- close (fd_stdin_write);
+ GNUNET_break (0 == close (fd_stdin_write));
+ if (-1 == dup2(fd_stdin_read, 0))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "dup2");
+ GNUNET_break (0 == close (fd_stdin_read));
}
-
execvp (filename, argv);
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "execvp", filename);
_exit (1);
char *cmd, *idx;
STARTUPINFO start;
PROCESS_INFORMATION proc;
-#if NILS
+ struct GNUNET_OS_Process *gnunet_proc = NULL;
+
HANDLE stdin_handle;
HANDLE stdout_handle;
-#endif
- char *fn;
- int len;
+
char path[MAX_PATH + 1];
cmdlen = 0;
cmdlen = cmdlen + strlen (arg) + 3;
va_end (ap);
- cmd = idx = GNUNET_malloc (sizeof (char) * cmdlen);
+ cmd = idx = GNUNET_malloc (sizeof (char) * (cmdlen + 1));
va_start (ap, filename);
while (NULL != (arg = va_arg (ap, char *)))
idx += sprintf (idx, "\"%s\" ", arg);
memset (&start, 0, sizeof (start));
start.cb = sizeof (start);
-#if NILS
if ((pipe_stdin != NULL) || (pipe_stdout != NULL))
start.dwFlags |= STARTF_USESTDHANDLES;
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)
+
+ if (32 >= (int) FindExecutableA (filename, NULL, path))
{
SetErrnoFromWinError (GetLastError ());
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "FindExecutable", fn);
- return -1;
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "FindExecutable", filename);
+ return NULL;
}
- if (!CreateProcess
- (path, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &start,
+ if (!CreateProcessA
+ (path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &start,
&proc))
{
SetErrnoFromWinError (GetLastError ());
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "CreateProcess", fn);
- return -1;
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "CreateProcess", path);
+ return NULL;
}
- CreateThread (NULL, 64000, ChildWaitThread, proc.hProcess, 0, NULL);
+ gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
+ gnunet_proc->pid = proc.dwProcessId;
+ gnunet_proc->handle = proc.hProcess;
+
+ CreateThread (NULL, 64000, ChildWaitThread, (void *) gnunet_proc, 0, NULL);
- if (fn != filename)
- GNUNET_free (fn);
CloseHandle (proc.hThread);
GNUNET_free (cmd);
- return proc.dwProcessId;
+ return gnunet_proc;
#endif
}
/**
* Start a process.
*
+ * @param lsocks array of listen sockets to dup systemd-style (or NULL);
+ * must be NULL on platforms where dup is not supported
* @param filename name of the binary
* @param argv NULL-terminated list of arguments to the process
* @return process ID of the new process, -1 on error
*/
-pid_t
-GNUNET_OS_start_process_v (const char *filename, char *const argv[])
+struct GNUNET_OS_Process *
+GNUNET_OS_start_process_v (const int *lsocks,
+ const char *filename, char *const argv[])
{
#ifndef MINGW
pid_t ret;
-
+ char lpid[16];
+ char fds[16];
+ struct GNUNET_OS_Process *gnunet_proc = NULL;
+ int i;
+ int j;
+ int k;
+ int tgt;
+ int flags;
+ int *lscp;
+ unsigned int ls;
+
+ lscp = NULL;
+ ls = 0;
+ if (lsocks != NULL)
+ {
+ i = 0;
+ while (-1 != (k = lsocks[i++]))
+ GNUNET_array_append (lscp, ls, k);
+ GNUNET_array_append (lscp, ls, -1);
+ }
#if HAVE_WORKING_VFORK
ret = vfork ();
#else
be plenty in practice */
sleep (1);
#endif
+ gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
+ gnunet_proc->pid = ret;
}
- return ret;
+ GNUNET_array_grow (lscp, ls, 0);
+ return gnunet_proc;
}
+ if (lscp != NULL)
+ {
+ /* read systemd documentation... */
+ GNUNET_snprintf (lpid, sizeof (lpid), "%u", getpid());
+ setenv ("LISTEN_PID", lpid, 1);
+ i = 0;
+ tgt = 3;
+ while (-1 != lscp[i])
+ {
+ j = i + 1;
+ while (-1 != lscp[j])
+ {
+ if (lscp[j] == tgt)
+ {
+ /* dup away */
+ k = dup (lscp[j]);
+ GNUNET_assert (-1 != k);
+ GNUNET_assert (0 == close (lscp[j]));
+ lscp[j] = k;
+ break;
+ }
+ j++;
+ }
+ if (lscp[i] != tgt)
+ {
+ /* Bury any existing FD, no matter what; they should all be closed
+ on exec anyway and the important onces have been dup'ed away */
+ (void) close (tgt);
+ GNUNET_assert (-1 != dup2 (lscp[i], tgt));
+ }
+ /* unset close-on-exec flag */
+ flags = fcntl (tgt, F_GETFD);
+ GNUNET_assert (flags >= 0);
+ flags &= ~FD_CLOEXEC;
+ fflush (stderr);
+ (void) fcntl (tgt, F_SETFD, flags);
+ tgt++;
+ i++;
+ }
+ GNUNET_snprintf (fds, sizeof (fds), "%u", i);
+ setenv ("LISTEN_FDS", fds, 1);
+ }
+ GNUNET_array_grow (lscp, ls, 0);
execvp (filename, argv);
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "execvp", filename);
_exit (1);
#else
- char **arg;
+ char **arg, **non_const_argv;
unsigned int cmdlen;
char *cmd, *idx;
STARTUPINFO start;
PROCESS_INFORMATION proc;
+ int argcount = 0;
+ char non_const_filename[MAX_PATH +1];
+ struct GNUNET_OS_Process *gnunet_proc = NULL;
- cmdlen = 0;
- arg = argv;
+ GNUNET_assert (lsocks == NULL);
+
+ if (32 >= (int) FindExecutableA (filename, NULL, non_const_filename))
+ {
+ SetErrnoFromWinError (GetLastError ());
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "FindExecutable", filename);
+ return NULL;
+ }
+
+ /* Count the number of arguments */
+ arg = (char **) argv;
+ while (*arg)
+ {
+ arg++;
+ argcount++;
+ }
+
+ /* Allocate a copy argv */
+ non_const_argv = GNUNET_malloc (sizeof (char *) * (argcount + 1));
+
+ /* Copy all argv strings */
+ argcount = 0;
+ arg = (char **) argv;
+ while (*arg)
+ {
+ non_const_argv[argcount] = GNUNET_strdup (*arg);
+ arg++;
+ argcount++;
+ }
+ non_const_argv[argcount] = NULL;
+
+ /* Count cmd len */
+ cmdlen = 1;
+ arg = non_const_argv;
while (*arg)
{
cmdlen = cmdlen + strlen (*arg) + 3;
arg++;
}
+ /* Allocate and create cmd */
cmd = idx = GNUNET_malloc (sizeof (char) * cmdlen);
- arg = argv;
+ arg = non_const_argv;
while (*arg)
{
idx += sprintf (idx, "\"%s\" ", *arg);
start.cb = sizeof (start);
if (!CreateProcess
- (filename, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &start,
+ (non_const_filename, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &start,
&proc))
{
SetErrnoFromWinError (GetLastError ());
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "fork");
- return -1;
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "CreateProcess");
+ return NULL;
}
- CreateThread (NULL, 64000, ChildWaitThread, proc.hProcess, 0, NULL);
+ gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
+ gnunet_proc->pid = proc.dwProcessId;
+ gnunet_proc->handle = proc.hProcess;
+
+ CreateThread (NULL, 64000, ChildWaitThread, (void *) gnunet_proc, 0, NULL);
CloseHandle (proc.hThread);
GNUNET_free (cmd);
- return proc.dwProcessId;
+ while (argcount > 0)
+ GNUNET_free (non_const_argv[--argcount]);
+ GNUNET_free (non_const_argv);
+
+ return gnunet_proc;
#endif
}
* @return GNUNET_OK on success, GNUNET_NO if the process is still running, GNUNET_SYSERR otherwise
*/
int
-GNUNET_OS_process_status (pid_t proc, enum GNUNET_OS_ProcessStatusType *type,
+GNUNET_OS_process_status (struct GNUNET_OS_Process *proc,
+ enum GNUNET_OS_ProcessStatusType *type,
unsigned long *code)
{
#ifndef MINGW
int ret;
GNUNET_assert (0 != proc);
- ret = waitpid (proc, &status, WNOHANG);
+ ret = waitpid (proc->pid, &status, WNOHANG);
+ if (ret < 0)
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+ return GNUNET_SYSERR;
+ }
if (0 == ret)
{
*type = GNUNET_OS_PROCESS_RUNNING;
*code = 0;
return GNUNET_NO;
}
- if (proc != ret)
+ if (proc->pid != ret)
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
return GNUNET_SYSERR;
}
#else
HANDLE h;
- DWORD c;
+ DWORD c, error_code, ret;
- h = OpenProcess (PROCESS_QUERY_INFORMATION, FALSE, proc);
- if (INVALID_HANDLE_VALUE == h)
+ h = proc->handle;
+ ret = proc->pid;
+ if (h == NULL || ret == 0)
{
- SetErrnoFromWinError (GetLastError ());
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "OpenProcess");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid process information {%d, %08X}\n", ret, h);
return GNUNET_SYSERR;
}
-
- c = GetExitCodeProcess (proc, &c);
+ if (h == NULL)
+ h = GetCurrentProcess ();
+
+ SetLastError (0);
+ ret = GetExitCodeProcess (h, &c);
+ error_code = GetLastError ();
+ if (ret == 0 || error_code != NO_ERROR)
+ {
+ SetErrnoFromWinError (error_code);
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "GetExitCodeProcess");
+ return GNUNET_SYSERR;
+ }
if (STILL_ACTIVE == c)
{
*type = GNUNET_OS_PROCESS_RUNNING;
*code = 0;
- CloseHandle (h);
return GNUNET_NO;
}
*type = GNUNET_OS_PROCESS_EXITED;
*code = c;
- CloseHandle (h);
#endif
return GNUNET_OK;
/**
* Wait for a process
- * @param proc process ID to wait for
+ * @param proc pointer to process structure
* @return GNUNET_OK on success, GNUNET_SYSERR otherwise
*/
int
-GNUNET_OS_process_wait (pid_t proc)
+GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc)
{
+
#ifndef MINGW
- if (proc != waitpid (proc, NULL, 0))
+ pid_t pid = proc->pid;
+ if (pid != waitpid (pid, NULL, 0))
return GNUNET_SYSERR;
-
return GNUNET_OK;
#else
HANDLE h;
- DWORD c;
int ret;
- h = OpenProcess (PROCESS_QUERY_INFORMATION, FALSE, proc);
- if (INVALID_HANDLE_VALUE == h)
+ h = proc->handle;
+ if (NULL == h)
{
- SetErrnoFromWinError (GetLastError ());
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid process information {%d, %08X}\n",
+ proc->pid,
+ h);
return GNUNET_SYSERR;
}
+ if (h == NULL)
+ h = GetCurrentProcess ();
if (WAIT_OBJECT_0 != WaitForSingleObject (h, INFINITE))
{
else
ret = GNUNET_OK;
- CloseHandle (h);
-
return ret;
#endif
}
projects / oweals / gnunet.git / blobdiff