comparison src/process.c @ 83560:738ce3540ffb

Merged from [e-mail] Patches applied: * [e-mail]/emacs--devo--0--patch-660 Update from CVS * [e-mail]/emacs--devo--0--patch-661 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-662 Update from CVS * [e-mail]/emacs--devo--0--patch-663 Update from CVS * [e-mail]/emacs--devo--0--patch-664 Update from CVS * [e-mail]/emacs--devo--0--patch-665 Update from CVS * [e-mail]/emacs--devo--0--patch-666 Fix read-only prompt problem in isearch * [e-mail]/emacs--devo--0--patch-667 Update from CVS * [e-mail]/emacs--devo--0--patch-668 Update from CVS * [e-mail]/emacs--devo--0--patch-669 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-670 Update from CVS * [e-mail]/emacs--devo--0--patch-671 Update from CVS * [e-mail]/emacs--devo--0--patch-672 Update from CVS * [e-mail]/emacs--devo--0--patch-673 Update from CVS * [e-mail]/gnus--rel--5.10--patch-206 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-207 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-208 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-600

83559:edf631bdbb7a

    {
#ifdef SIGCHLD
      Lisp_Object symbol;
      /* Assignment to EMACS_INT stops GCC whining about limited range
	 of data type.  */
      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),
				/* GC treated elements set to nil.  */
				Fdelq (Qnil, deleted_pid_list));

	update_status (p);
      symbol = p->status;
      if (CONSP (p->status))
	symbol = XCAR (p->status);
      if (EQ (symbol, Qsignal) || EQ (symbol, Qexit))
	Fdelete (make_fixnum_or_float (pid), deleted_pid_list);
      else
#endif
	{
	  Fkill_process (process, Qnil);
	  /* Do this now, since remove_process will make sigchld_handler do nothing.  */

create_process (process, new_argv, current_dir)
     Lisp_Object process;
     char **new_argv;
     Lisp_Object current_dir;
{
  int pid, inchannel, outchannel;
  int sv[2];
#ifdef POSIX_SIGNALS
  sigset_t procmask;
  sigset_t blocked;
  struct sigaction sigint_action;

				  conv_sockaddr_to_lisp (&sa1, len1));
	}
#endif
    }

#ifdef HAVE_GETADDRINFO
  if (res != &ai)
    freeaddrinfo (res);
#endif

  immediate_quit = 0;

  /* Discard the unwind protect for closing S, if any.  */
  specpdl_ptr = specpdl + count1;

  /* Unwind bind_polling_period and request_sigio.  */

  sigheld |= sigbit (SIGCHLD);
#endif

  while (1)
    {
      register EMACS_INT pid;
      WAITTYPE w;
      Lisp_Object tail;

#ifdef WNOHANG
#ifndef WUNTRACED
#define WUNTRACED 0
#endif /* no WUNTRACED */
      /* Keep trying to get a status until we get a definitive result.  */
      do
	{
	  errno = 0;
	  pid = wait3 (&w, WNOHANG | WUNTRACED, 0);
	}
      while (pid < 0 && errno == EINTR);

      if (pid <= 0)
	{
	  /* PID == 0 means no processes found, PID == -1 means a real
	     failure.  We have done all our job, so return.  */

#endif /* no WNOHANG */

      /* 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))
	{
	  Fsetcar (tail, Qnil);
	  goto sigchld_end_of_loop;
	}

      /* Otherwise, if it is asynchronous, it is in Vprocess_alist.  */
      p = 0;
      for (tail = Vprocess_alist; GC_CONSP (tail); tail = XCDR (tail))

83560:738ce3540ffb

    {
#ifdef SIGCHLD
      Lisp_Object symbol;
      /* Assignment to EMACS_INT stops GCC whining about limited range
	 of data type.  */
      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),
				/* GC treated elements set to nil.  */
				Fdelq (Qnil, deleted_pid_list));

	update_status (p);
      symbol = p->status;
      if (CONSP (p->status))
	symbol = XCAR (p->status);
      if (EQ (symbol, Qsignal) || EQ (symbol, Qexit))
	deleted_pid_list
	  = Fdelete (make_fixnum_or_float (pid), deleted_pid_list);
      else
#endif
	{
	  Fkill_process (process, Qnil);
	  /* Do this now, since remove_process will make sigchld_handler do nothing.  */

create_process (process, new_argv, current_dir)
     Lisp_Object process;
     char **new_argv;
     Lisp_Object current_dir;
{
  int inchannel, outchannel;
  pid_t pid;
  int sv[2];
#ifdef POSIX_SIGNALS
  sigset_t procmask;
  sigset_t blocked;
  struct sigaction sigint_action;

				  conv_sockaddr_to_lisp (&sa1, len1));
	}
#endif
    }

  immediate_quit = 0;

#ifdef HAVE_GETADDRINFO
  if (res != &ai)
    {
      BLOCK_INPUT;
      freeaddrinfo (res);
      UNBLOCK_INPUT;
    }
#endif

  /* Discard the unwind protect for closing S, if any.  */
  specpdl_ptr = specpdl + count1;

  /* Unwind bind_polling_period and request_sigio.  */

  sigheld |= sigbit (SIGCHLD);
#endif

  while (1)
    {
      pid_t pid;
      WAITTYPE w;
      Lisp_Object tail;

#ifdef WNOHANG
#ifndef WUNTRACED
#define WUNTRACED 0
#endif /* no WUNTRACED */
      /* Keep trying to get a status until we get a definitive result.  */
      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);
	}

      if (pid <= 0)
	{
	  /* PID == 0 means no processes found, PID == -1 means a real
	     failure.  We have done all our job, so return.  */

#endif /* no WNOHANG */

      /* Find the process that signaled us, and record its status.  */

      /* The process can have been deleted by Fdelete_process.  */
      for (tail = deleted_pid_list; GC_CONSP (tail); tail = XCDR (tail))
	{
	  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.  */
      p = 0;
      for (tail = Vprocess_alist; GC_CONSP (tail); tail = XCDR (tail))