#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
-#include <fcntl.h>
#include <sched.h>
#include <sys/signal.h>
#include <sys/wait.h>
#include "user.h"
#include "kern_util.h"
+#include "user_util.h"
#include "os.h"
struct helper_data {
{
struct helper_data *data = arg;
char **argv = data->argv;
+ int errval;
if(helper_pause){
signal(SIGHUP, helper_hup);
if(data->pre_exec != NULL)
(*data->pre_exec)(data->pre_data);
execvp(argv[0], argv);
+ errval = errno;
printk("execvp of '%s' failed - errno = %d\n", argv[0], errno);
- write(data->fd, &errno, sizeof(errno));
+ os_write_file(data->fd, &errval, sizeof(errval));
os_kill_process(os_getpid(), 0);
return(0);
}
-/* XXX The alloc_stack here breaks if this is called in the tracing thread */
-
+/* Returns either the pid of the child process we run or -E* on failure.
+ * XXX The alloc_stack here breaks if this is called in the tracing thread */
int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
unsigned long *stack_out)
{
struct helper_data data;
unsigned long stack, sp;
- int pid, fds[2], err, n;
+ int pid, fds[2], ret, n;
if((stack_out != NULL) && (*stack_out != 0))
stack = *stack_out;
else stack = alloc_stack(0, um_in_interrupt());
- if(stack == 0) return(-ENOMEM);
+ if(stack == 0)
+ return(-ENOMEM);
- err = os_pipe(fds, 1, 0);
- if(err){
- printk("run_helper : pipe failed, errno = %d\n", -err);
- return(err);
+ ret = os_pipe(fds, 1, 0);
+ if(ret < 0){
+ printk("run_helper : pipe failed, ret = %d\n", -ret);
+ goto out_free;
}
- if(fcntl(fds[1], F_SETFD, 1) != 0){
- printk("run_helper : setting FD_CLOEXEC failed, errno = %d\n",
- errno);
- return(-errno);
+
+ ret = os_set_exec_close(fds[1], 1);
+ if(ret < 0){
+ printk("run_helper : setting FD_CLOEXEC failed, ret = %d\n",
+ -ret);
+ goto out_close;
}
sp = stack + page_size() - sizeof(void *);
pid = clone(helper_child, (void *) sp, CLONE_VM | SIGCHLD, &data);
if(pid < 0){
printk("run_helper : clone failed, errno = %d\n", errno);
- return(-errno);
+ ret = -errno;
+ goto out_close;
}
- close(fds[1]);
- n = read(fds[0], &err, sizeof(err));
+
+ os_close_file(fds[1]);
+ fds[1] = -1;
+
+ /*Read the errno value from the child.*/
+ n = os_read_file(fds[0], &ret, sizeof(ret));
if(n < 0){
- printk("run_helper : read on pipe failed, errno = %d\n",
- errno);
- return(-errno);
+ printk("run_helper : read on pipe failed, ret = %d\n", -n);
+ ret = n;
+ os_kill_process(pid, 1);
}
else if(n != 0){
- waitpid(pid, NULL, 0);
- pid = -err;
+ CATCH_EINTR(n = waitpid(pid, NULL, 0));
+ ret = -errno;
+ } else {
+ ret = pid;
}
- if(stack_out == NULL) free_stack(stack, 0);
- else *stack_out = stack;
- return(pid);
+out_close:
+ if (fds[1] != -1)
+ os_close_file(fds[1]);
+ os_close_file(fds[0]);
+out_free:
+ if(stack_out == NULL)
+ free_stack(stack, 0);
+ else *stack_out = stack;
+ return(ret);
}
int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
return(-errno);
}
if(stack_out == NULL){
- pid = waitpid(pid, &status, 0);
- if(pid < 0)
+ CATCH_EINTR(pid = waitpid(pid, &status, 0));
+ if(pid < 0){
printk("run_helper_thread - wait failed, errno = %d\n",
- pid);
+ errno);
+ pid = -errno;
+ }
if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0))
printk("run_helper_thread - thread returned status "
"0x%x\n", status);
free_stack(stack, stack_order);
}
- else *stack_out = stack;
+ else *stack_out = stack;
return(pid);
}
{
int ret;
- ret = waitpid(pid, NULL, WNOHANG);
+ CATCH_EINTR(ret = waitpid(pid, NULL, WNOHANG));
if(ret < 0){
printk("helper_wait : waitpid failed, errno = %d\n", errno);
return(-errno);