diff options
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/src/process.c b/src/process.c index 8b1da4ac5cc..6d84d4c4a87 100644 --- a/src/process.c +++ b/src/process.c @@ -817,7 +817,7 @@ nil, indicating the current buffer's process. */) Lisp_Object symbol; /* Assignment to EMACS_INT stops GCC whining about limited range of data type. */ - EMACS_INT pid = p->pid;; + EMACS_INT pid = p->pid; /* No problem storing the pid here, as it is still in Vprocess_alist. */ deleted_pid_list = Fcons (make_fixnum_or_float (pid), @@ -830,7 +830,8 @@ nil, indicating the current buffer's process. */) if (CONSP (p->status)) symbol = XCAR (p->status); if (EQ (symbol, Qsignal) || EQ (symbol, Qexit)) - Fdelete (make_fixnum_or_float (pid), deleted_pid_list); + deleted_pid_list + = Fdelete (make_fixnum_or_float (pid), deleted_pid_list); else #endif { @@ -1818,7 +1819,8 @@ create_process (process, new_argv, current_dir) char **new_argv; Lisp_Object current_dir; { - int pid, inchannel, outchannel; + int inchannel, outchannel; + pid_t pid; int sv[2]; #ifdef POSIX_SIGNALS sigset_t procmask; @@ -3339,13 +3341,17 @@ usage: (make-network-process &rest ARGS) */) #endif } + immediate_quit = 0; + #ifdef HAVE_GETADDRINFO if (res != &ai) - freeaddrinfo (res); + { + BLOCK_INPUT; + freeaddrinfo (res); + UNBLOCK_INPUT; + } #endif - immediate_quit = 0; - /* Discard the unwind protect for closing S, if any. */ specpdl_ptr = specpdl + count1; @@ -6491,7 +6497,7 @@ sigchld_handler (signo) while (1) { - register EMACS_INT pid; + pid_t pid; WAITTYPE w; Lisp_Object tail; @@ -6500,12 +6506,17 @@ sigchld_handler (signo) #define WUNTRACED 0 #endif /* no WUNTRACED */ /* Keep trying to get a status until we get a definitive result. */ - do + while (1) { errno = 0; pid = wait3 (&w, WNOHANG | WUNTRACED, 0); + if (! (pid < 0 && errno == EINTR)) + break; + /* Avoid a busyloop: wait3 is a system call, so we do not want + to prevent the kernel from actually sending SIGCHLD to emacs + by asking for it all the time. */ + sleep (1); } - while (pid < 0 && errno == EINTR); if (pid <= 0) { @@ -6531,11 +6542,15 @@ sigchld_handler (signo) /* Find the process that signaled us, and record its status. */ /* The process can have been deleted by Fdelete_process. */ - tail = Fmember (make_fixnum_or_float (pid), deleted_pid_list); - if (!NILP (tail)) + for (tail = deleted_pid_list; GC_CONSP (tail); tail = XCDR (tail)) { - Fsetcar (tail, Qnil); - goto sigchld_end_of_loop; + Lisp_Object xpid = XCAR (tail); + if ((GC_INTEGERP (xpid) && pid == (pid_t) XINT (xpid)) + || (GC_FLOATP (xpid) && pid == (pid_t) XFLOAT_DATA (xpid))) + { + XSETCAR (tail, Qnil); + goto sigchld_end_of_loop; + } } /* Otherwise, if it is asynchronous, it is in Vprocess_alist. */ |