comparison src/process.c @ 56583:64ae47cb68ff

(read_process_output): Use whole read buffer. Don't trigger adaptive read buffering on errors.

56582:591c2d29ca4b

#if 0
          /* On Mac OS X 10.0, the SELECT system call always says input is
             present (for reading) at stdin, even when none is.  This
             causes the call to SELECT below to return 1 and
             status_notify not to be called.  As a result output of
             subprocesses are incorrectly discarded.  
	  */
          FD_CLR (0, &Atemp);
#endif
	  Ctemp = connect_wait_mask;
	  EMACS_SET_SECS_USECS (timeout, 0, 0);

#ifdef DATAGRAM_SOCKETS
  /* We have a working select, so proc_buffered_char is always -1.  */
  if (DATAGRAM_CHAN_P (channel))
    {
      int len = datagram_address[channel].len;
      nbytes = recvfrom (channel, chars + carryover, readmax - carryover,
			 0, datagram_address[channel].sa, &len);
    }
  else
#endif
  if (proc_buffered_char[channel] < 0)
    {
      nbytes = emacs_read (channel, chars + carryover, readmax - carryover);
#ifdef ADAPTIVE_READ_BUFFERING
      if (!NILP (p->adaptive_read_buffering))
	{
	  int delay = XINT (p->read_output_delay);
	  if (nbytes < 256)
	    {
	      if (delay < READ_OUTPUT_DELAY_MAX_MAX)

		  if (delay == 0)
		    process_output_delay_count++;
		  delay += READ_OUTPUT_DELAY_INCREMENT * 2;
		}
	    }
	  else if (delay > 0 && (nbytes == readmax - carryover))
	    {
	      delay -= READ_OUTPUT_DELAY_INCREMENT;
	      if (delay == 0)
		process_output_delay_count--;
	    }

    }
  else
    {
      chars[carryover] = proc_buffered_char[channel];
      proc_buffered_char[channel] = -1;
      nbytes = emacs_read (channel, chars + carryover + 1,  readmax - 1 - carryover);
      if (nbytes < 0)
	nbytes = 1;
      else
	nbytes = nbytes + 1;
    }

56583:64ae47cb68ff

#if 0
          /* On Mac OS X 10.0, the SELECT system call always says input is
             present (for reading) at stdin, even when none is.  This
             causes the call to SELECT below to return 1 and
             status_notify not to be called.  As a result output of
             subprocesses are incorrectly discarded.
	  */
          FD_CLR (0, &Atemp);
#endif
	  Ctemp = connect_wait_mask;
	  EMACS_SET_SECS_USECS (timeout, 0, 0);

#ifdef DATAGRAM_SOCKETS
  /* We have a working select, so proc_buffered_char is always -1.  */
  if (DATAGRAM_CHAN_P (channel))
    {
      int len = datagram_address[channel].len;
      nbytes = recvfrom (channel, chars + carryover, readmax,
			 0, datagram_address[channel].sa, &len);
    }
  else
#endif
  if (proc_buffered_char[channel] < 0)
    {
      nbytes = emacs_read (channel, chars + carryover, readmax);
#ifdef ADAPTIVE_READ_BUFFERING
      if (nbytes > 0 && !NILP (p->adaptive_read_buffering))
	{
	  int delay = XINT (p->read_output_delay);
	  if (nbytes < 256)
	    {
	      if (delay < READ_OUTPUT_DELAY_MAX_MAX)

		  if (delay == 0)
		    process_output_delay_count++;
		  delay += READ_OUTPUT_DELAY_INCREMENT * 2;
		}
	    }
	  else if (delay > 0 && (nbytes == readmax))
	    {
	      delay -= READ_OUTPUT_DELAY_INCREMENT;
	      if (delay == 0)
		process_output_delay_count--;
	    }

    }
  else
    {
      chars[carryover] = proc_buffered_char[channel];
      proc_buffered_char[channel] = -1;
      nbytes = emacs_read (channel, chars + carryover + 1,  readmax - 1);
      if (nbytes < 0)
	nbytes = 1;
      else
	nbytes = nbytes + 1;
    }