comparison src/alloc.c @ 23973:2eb9e2f5aa33

(MMAP_MAX_AREAS): New macro. (allocate_vectorlike, make_uninit_multibyte_string): Use that. (init_alloc_once): Use that.

23972:98ac51fd1935

extern char *sbrk ();

#ifdef DOUG_LEA_MALLOC
#include <malloc.h>
#define __malloc_size_t int
#else
/* The following come from gmalloc.c.  */

#if defined (__STDC__) && __STDC__
#include <stddef.h>

#endif
  p = (struct Lisp_Vector *)lisp_malloc (sizeof (struct Lisp_Vector)
				     + (len - 1) * sizeof (Lisp_Object));
#ifdef DOUG_LEA_MALLOC
  /* Back to a reasonable maximum of mmap'ed areas. */
  mallopt (M_MMAP_MAX, 64);
#endif
  VALIDATE_LISP_STORAGE (p, 0);
  consing_since_gc += (sizeof (struct Lisp_Vector)
		       + (len - 1) * sizeof (Lisp_Object));
  vector_cells_consed += len;

      mallopt (M_MMAP_MAX, 0);
#endif
      new = (struct string_block *) lisp_malloc (sizeof (struct string_block_head) + fullsize);
#ifdef DOUG_LEA_MALLOC
      /* Back to a reasonable maximum of mmap'ed areas. */
      mallopt (M_MMAP_MAX, 64);
#endif
      n_string_blocks++;
      VALIDATE_LISP_STORAGE (new, 0);
      consing_since_gc += sizeof (struct string_block_head) + fullsize;
      new->pos = fullsize;

  all_vectors = 0;
  ignore_warnings = 1;
#ifdef DOUG_LEA_MALLOC
  mallopt (M_TRIM_THRESHOLD, 128*1024); /* trim threshold */
  mallopt (M_MMAP_THRESHOLD, 64*1024); /* mmap threshold */
  mallopt (M_MMAP_MAX, 64); /* max. number of mmap'ed areas */
#endif
  init_strings ();
  init_cons ();
  init_symbol ();
  init_marker ();

23973:2eb9e2f5aa33

extern char *sbrk ();

#ifdef DOUG_LEA_MALLOC
#include <malloc.h>
#define __malloc_size_t int

/* Specify maximum number of areas to mmap.
   It would be nice to use a value that explicitly
   means "no limit".  */
#define MMAP_MAX_AREAS 100000000

#else
/* The following come from gmalloc.c.  */

#if defined (__STDC__) && __STDC__
#include <stddef.h>

#endif
  p = (struct Lisp_Vector *)lisp_malloc (sizeof (struct Lisp_Vector)
				     + (len - 1) * sizeof (Lisp_Object));
#ifdef DOUG_LEA_MALLOC
  /* Back to a reasonable maximum of mmap'ed areas. */
  mallopt (M_MMAP_MAX, MMAP_MAX_AREAS);
#endif
  VALIDATE_LISP_STORAGE (p, 0);
  consing_since_gc += (sizeof (struct Lisp_Vector)
		       + (len - 1) * sizeof (Lisp_Object));
  vector_cells_consed += len;

      mallopt (M_MMAP_MAX, 0);
#endif
      new = (struct string_block *) lisp_malloc (sizeof (struct string_block_head) + fullsize);
#ifdef DOUG_LEA_MALLOC
      /* Back to a reasonable maximum of mmap'ed areas. */
      mallopt (M_MMAP_MAX, MMAP_MAX_AREAS);
#endif
      n_string_blocks++;
      VALIDATE_LISP_STORAGE (new, 0);
      consing_since_gc += sizeof (struct string_block_head) + fullsize;
      new->pos = fullsize;

  all_vectors = 0;
  ignore_warnings = 1;
#ifdef DOUG_LEA_MALLOC
  mallopt (M_TRIM_THRESHOLD, 128*1024); /* trim threshold */
  mallopt (M_MMAP_THRESHOLD, 64*1024); /* mmap threshold */
  mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); /* max. number of mmap'ed areas */
#endif
  init_strings ();
  init_cons ();
  init_symbol ();
  init_marker ();