comparison src/process.c @ 14802:45827a5afe4d

[!subprocesses] (wait_reading_process_input): Port the timer changes from the other wait_reading_process_input.

14801:8bf3083f6499

  stop_polling ();

  for (;;)
    {
      int nfds;

      if (XINT (read_kbd))
	FD_SET (0, &waitchannels);
      else
	FD_ZERO (&waitchannels);

	 since we want to return C-g as an input character.
	 Otherwise, do pending quit if requested.  */
      if (XINT (read_kbd) >= 0)
	QUIT;

      if (timeout_p)
	{
	  EMACS_GET_TIME (*timeout_p);
	  EMACS_SUB_TIME (*timeout_p, end_time, *timeout_p);
	  if (EMACS_TIME_NEG_P (*timeout_p))
	    break;
	}

      /* Cause C-g and alarm signals to take immediate action,
	 and cause input available signals to zero out timeout.  */
      if (XINT (read_kbd) < 0)
	set_waiting_for_input (&timeout);

      /* If a frame has been newly mapped and needs updating,
	 reprocess its display stuff.  */
      if (frame_garbaged && do_display)
	redisplay_preserve_echo_area ();

      if (XINT (read_kbd) && detect_input_pending ())
	nfds = 0;
      else
	nfds = select (1, &waitchannels, (SELECT_TYPE *)0, (SELECT_TYPE *)0,
		       timeout_p);

      /* Make C-g and alarm signals set flags again */
      clear_waiting_for_input ();

	kill (getpid (), SIGIO);
#endif

      /* If we have timed out (nfds == 0) or found some input (nfds > 0),
	 we should exit.  */
      if (nfds >= 0)
	break;
    }

  start_polling ();

14802:45827a5afe4d

  stop_polling ();

  for (;;)
    {
      int nfds;
      int timeout_reduced_for_timers = 0;

      if (XINT (read_kbd))
	FD_SET (0, &waitchannels);
      else
	FD_ZERO (&waitchannels);

	 since we want to return C-g as an input character.
	 Otherwise, do pending quit if requested.  */
      if (XINT (read_kbd) >= 0)
	QUIT;

      /* Compute time from now till when time limit is up */
      /* Exit if already run out */
      if (timeout_p)
	{
	  EMACS_GET_TIME (*timeout_p);
	  EMACS_SUB_TIME (*timeout_p, end_time, *timeout_p);
	  if (EMACS_TIME_NEG_P (*timeout_p))
	    break;
	}

      /* If our caller will not immediately handle keyboard events,
	 run timer events directly.
	 (Callers that will immediately read keyboard events
	 call timer_delay on their own.)  */
      if (read_kbd >= 0)
	{
	  EMACS_TIME timer_delay;
	  int old_timers_run = timers_run;
	  timer_delay = timer_check (1);
	  if (timers_run != old_timers_run && do_display)
	    redisplay_preserve_echo_area ();
	  if (! EMACS_TIME_NEG_P (timer_delay) && timeout_p)
	    {
	      EMACS_TIME difference;
	      EMACS_SUB_TIME (difference, timer_delay, *timeout_p);
	      if (EMACS_TIME_NEG_P (difference))
		{
		  *timeout_p = timer_delay;
		  timeout_reduced_for_timers = 1;
		}
	    }
	}

      /* Cause C-g and alarm signals to take immediate action,
	 and cause input available signals to zero out timeout.  */
      if (XINT (read_kbd) < 0)
	set_waiting_for_input (&timeout);

      /* If a frame has been newly mapped and needs updating,
	 reprocess its display stuff.  */
      if (frame_garbaged && do_display)
	redisplay_preserve_echo_area ();

      nfds = 1;
      if (XINT (read_kbd) < 0 && detect_input_pending ())
	{
	  swallow_events (do_display);
	  if (detect_input_pending ())
	    nfds = 0;
	}

      if ((XINT (read_kbd) > 0) 
	  && detect_input_pending_run_timers (do_display))
	{
	  swallow_events (do_display);
	  if (detect_input_pending_run_timers (do_display))
	    nfds = 0;
	}

      if (nfds)
	nfds = select (1, &waitchannels, (SELECT_TYPE *)0, (SELECT_TYPE *)0,
		       timeout_p);

      /* Make C-g and alarm signals set flags again */
      clear_waiting_for_input ();

	kill (getpid (), SIGIO);
#endif

      /* If we have timed out (nfds == 0) or found some input (nfds > 0),
	 we should exit.  */
      if (nfds >= 0 && ! timeout_reduced_for_timers)
	break;
    }

  start_polling ();