comparison src/callproc.c @ 62982:d7793ac6df62

(Fcall_process): Don't use alloca to gradually increase size of buf, as it effectively uses twice the necessary space on the stack. Instead, pre-allocate buf of full size, and gradually increase the read size.

62981:79e0dd73c671

  Lisp_Object infile, buffer, current_dir, path;
  int display_p;
  int fd[2];
  int filefd;
  register int pid;
  char buf[16384];
  char *bufptr = buf;
  int bufsize = sizeof buf;
  int count = SPECPDL_INDEX ();

  register const unsigned char **new_argv
    = (const unsigned char **) alloca ((max (2, nargs - 2)) * sizeof (char *));
  struct buffer *old = current_buffer;

	   of the buffer size we have.  But don't read
	   less than 1024--save that for the next bufferful.  */
	nread = carryover;
	while (nread < bufsize - 1024)
	  {
	    int this_read = emacs_read (fd[0], bufptr + nread,
					bufsize - nread);

	    if (this_read < 0)
	      goto give_up;

	immediate_quit = 0;

	if (!NILP (buffer))
	  {
	    if (! CODING_MAY_REQUIRE_DECODING (&process_coding))
	      insert_1_both (bufptr, nread, nread, 0, 1, 0);
	    else
	      {			/* We have to decode the input.  */
		int size;
		char *decoding_buf;

		   system requires EOL detection.  Here, we have to
		   check only whether or not the coding system
		   requires text-encoding detection.  */
		if (process_coding.type == coding_type_undecided)
		  {
		    detect_coding (&process_coding, bufptr, nread);
		    if (process_coding.composing != COMPOSITION_DISABLED)
		      /* We have not yet allocated the composition
			 data because the coding type was undecided.  */
		      coding_allocate_composition_data (&process_coding, PT);
		  }
		if (process_coding.cmp_data)
		  process_coding.cmp_data->char_offset = PT;

		decode_coding (&process_coding, bufptr, decoding_buf,
			       nread, size);

		if (display_on_the_fly
		    && saved_coding.type == coding_type_undecided
		    && process_coding.type != coding_type_undecided)

		nread -= process_coding.consumed;
		carryover = nread;
		if (carryover > 0)
		  /* As CARRYOVER should not be that large, we had
		     better avoid overhead of bcopy.  */
		  BCOPY_SHORT (bufptr + process_coding.consumed, bufptr,
			       carryover);
		if (process_coding.result == CODING_FINISH_INSUFFICIENT_CMP)
		  {
		    /* The decoding ended because of insufficient data
		       area to record information about composition.

	  }

	if (process_coding.mode & CODING_MODE_LAST_BLOCK)
	  break;

	/* Make the buffer bigger as we continue to read more data,
	   but not past 64k.  */
	if (bufsize < 64 * 1024 && total_read > 32 * bufsize)
	  {
	    char *tempptr;
	    bufsize *= 2;

	    tempptr = (char *) alloca (bufsize);
	    bcopy (bufptr, tempptr, bufsize / 2);
	    bufptr = tempptr;
	  }

	if (display_p)
	  {
	    if (first)
	      prepare_menu_bars ();

62982:d7793ac6df62

  Lisp_Object infile, buffer, current_dir, path;
  int display_p;
  int fd[2];
  int filefd;
  register int pid;
#define CALLPROC_BUFFER_SIZE_MIN (16 * 1024)
#define CALLPROC_BUFFER_SIZE_MAX (4 * CALLPROC_BUFFER_SIZE_MIN)
  char buf[CALLPROC_BUFFER_SIZE_MAX];
  int bufsize = CALLPROC_BUFFER_SIZE_MIN;
  int count = SPECPDL_INDEX ();

  register const unsigned char **new_argv
    = (const unsigned char **) alloca ((max (2, nargs - 2)) * sizeof (char *));
  struct buffer *old = current_buffer;

	   of the buffer size we have.  But don't read
	   less than 1024--save that for the next bufferful.  */
	nread = carryover;
	while (nread < bufsize - 1024)
	  {
	    int this_read = emacs_read (fd[0], buf + nread,
					bufsize - nread);

	    if (this_read < 0)
	      goto give_up;

	immediate_quit = 0;

	if (!NILP (buffer))
	  {
	    if (! CODING_MAY_REQUIRE_DECODING (&process_coding))
	      insert_1_both (buf, nread, nread, 0, 1, 0);
	    else
	      {			/* We have to decode the input.  */
		int size;
		char *decoding_buf;

		   system requires EOL detection.  Here, we have to
		   check only whether or not the coding system
		   requires text-encoding detection.  */
		if (process_coding.type == coding_type_undecided)
		  {
		    detect_coding (&process_coding, buf, nread);
		    if (process_coding.composing != COMPOSITION_DISABLED)
		      /* We have not yet allocated the composition
			 data because the coding type was undecided.  */
		      coding_allocate_composition_data (&process_coding, PT);
		  }
		if (process_coding.cmp_data)
		  process_coding.cmp_data->char_offset = PT;

		decode_coding (&process_coding, buf, decoding_buf,
			       nread, size);

		if (display_on_the_fly
		    && saved_coding.type == coding_type_undecided
		    && process_coding.type != coding_type_undecided)

		nread -= process_coding.consumed;
		carryover = nread;
		if (carryover > 0)
		  /* As CARRYOVER should not be that large, we had
		     better avoid overhead of bcopy.  */
		  BCOPY_SHORT (buf + process_coding.consumed, buf,
			       carryover);
		if (process_coding.result == CODING_FINISH_INSUFFICIENT_CMP)
		  {
		    /* The decoding ended because of insufficient data
		       area to record information about composition.

	  }

	if (process_coding.mode & CODING_MODE_LAST_BLOCK)
	  break;

#if (CALLPROC_BUFFER_SIZE_MIN != CALLPROC_BUFFER_SIZE_MAX)
	/* Make the buffer bigger as we continue to read more data,
	   but not past CALLPROC_BUFFER_SIZE_MAX.  */
	if (bufsize < CALLPROC_BUFFER_SIZE_MAX && total_read > 32 * bufsize)
	  if ((bufsize *= 2) > CALLPROC_BUFFER_SIZE_MAX)
	    bufsize = CALLPROC_BUFFER_SIZE_MAX;
#endif

	if (display_p)
	  {
	    if (first)
	      prepare_menu_bars ();