emacs: src/process.c comparison

comparison src/process.c @ 90192:173dee4e2611

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-61 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 353-357) - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Thu, 09 Jun 2005 07:13:03 +0000
parents	5b029ff3b08d 9bde03db5726
children	a1b34dec1104

comparison

equal deleted inserted replaced

-:c766b49f5bbd
+:173dee4e2611
 #ifdef ADAPTIVE_READ_BUFFERING
 #define READ_OUTPUT_DELAY_INCREMENT 10000
 #define READ_OUTPUT_DELAY_MAX       (READ_OUTPUT_DELAY_INCREMENT * 5)
 #define READ_OUTPUT_DELAY_MAX_MAX   (READ_OUTPUT_DELAY_INCREMENT * 7)
-/* Number of processes which might be delayed.  */
+/* Number of processes which have a non-zero read_output_delay,
+and therefore might be delayed for adaptive read buffering.  */
 static int process_output_delay_count;
-/* Non-zero if any process has non-nil process_output_skip.  */
+/* Non-zero if any process has non-nil read_output_skip.  */
 static int process_output_skip;
 /* Non-nil means to delay reading process output to improve buffering.
 A value of t means that delay is reset after each send, any other
-non-nil value does not reset the delay.  */
+non-nil value does not reset the delay.  A value of nil disables
+adaptive read buffering completely.  */
 static Lisp_Object Vprocess_adaptive_read_buffering;
 #else
 #define process_output_delay_count 0
 #endif
 itself; it's all taken care of here.  */
 record_unwind_protect (start_process_unwind, proc);
 XPROCESS (proc)->childp = Qt;
 XPROCESS (proc)->plist = Qnil;
-XPROCESS (proc)->command_channel_p = Qnil;
 XPROCESS (proc)->buffer = buffer;
 XPROCESS (proc)->sentinel = Qnil;
 XPROCESS (proc)->filter = Qnil;
 XPROCESS (proc)->filter_multibyte
 = buffer_defaults.enable_multibyte_characters;
 	  if (check_connect)
 	    Connecting = connect_wait_mask;
 #endif
 #ifdef ADAPTIVE_READ_BUFFERING
+	  /* Set the timeout for adaptive read buffering if any
+	     process has non-nil read_output_skip and non-zero
+	     read_output_delay, and we are not reading output for a
+	     specific wait_channel.  It is not executed if
+	     Vprocess_adaptive_read_buffering is nil.  */
 	  if (process_output_skip && check_delay > 0)
 	    {
 	      int usecs = EMACS_USECS (timeout);
 	      if (EMACS_SECS (timeout) > 0 || usecs > READ_OUTPUT_DELAY_MAX)
 		usecs = READ_OUTPUT_DELAY_MAX;
 	      for (channel = 0; check_delay > 0 && channel <= max_process_desc; channel++)
 		{
 		  proc = chan_process[channel];
 		  if (NILP (proc))
 		    continue;
+		  /* Find minimum non-zero read_output_delay among the
+		     processes with non-nil read_output_skip.  */
 		  if (XINT (XPROCESS (proc)->read_output_delay) > 0)
 		    {
 		      check_delay--;
 		      if (NILP (XPROCESS (proc)->read_output_skip))
 			continue;
 	 save the same match data in safely recursive fashion.  */
 if (outer_running_asynch_code)
 	{
 	  Lisp_Object tem;
 	  /* Don't clobber the CURRENT match data, either!  */
-	  tem = Fmatch_data (Qnil, Qnil);
+	  tem = Fmatch_data (Qnil, Qnil, Qnil);
-	  restore_match_data ();
+	  restore_search_regs ();
-	  record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
+	  record_unwind_save_match_data ();
-	  Fset_match_data (tem);
+	  Fset_match_data (tem, Qt);
 	}
 /* For speed, if a search happens within this code,
 	 save the match data in a special nonrecursive fashion.  */
 running_asynch_code = 1;
 					  Fcons (proc, Fcons (text, Qnil))),
 				   !NILP (Vdebug_on_error) ? Qnil : Qerror,
 				   read_process_output_error_handler);
 /* If we saved the match data nonrecursively, restore it now.  */
-restore_match_data ();
+restore_search_regs ();
 running_asynch_code = outer_running_asynch_code;
 /* Handling the process output should not deactivate the mark.  */
 Vdeactivate_mark = odeactivate;
 and we already saved the match data nonrecursively,
 save the same match data in safely recursive fashion.  */
 if (outer_running_asynch_code)
 {
 Lisp_Object tem;
-tem = Fmatch_data (Qnil, Qnil);
+tem = Fmatch_data (Qnil, Qnil, Qnil);
-restore_match_data ();
+restore_search_regs ();
-record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
+record_unwind_save_match_data ();
-Fset_match_data (tem);
+Fset_match_data (tem, Qt);
 }
 /* For speed, if a search happens within this code,
 save the match data in a special nonrecursive fashion.  */
 running_asynch_code = 1;
 				    Fcons (proc, Fcons (reason, Qnil))),
 			     !NILP (Vdebug_on_error) ? Qnil : Qerror,
 			     exec_sentinel_error_handler);
 /* If we saved the match data nonrecursively, restore it now.  */
-restore_match_data ();
+restore_search_regs ();
 running_asynch_code = outer_running_asynch_code;
 Vdeactivate_mark = odeactivate;
 /* Restore waiting_for_user_input_p as it was
 Fprovide (intern ("make-network-process"), subfeatures);
 }
 #endif /* HAVE_SOCKETS */
 #if defined (DARWIN) || defined (MAC_OSX)
 /* PTYs are broken on Darwin < 6, but are sometimes useful for interactive
 processes.  As such, we only change the default value.  */
 if (initialized)
 {
 char *release = get_operating_system_release();
 if (!release || !release[0] || (release[0] < MIN_PTY_KERNEL_VERSION

Mercurial > emacs

comparison src/process.c @ 90192:173dee4e2611