comparison src/ralloc.c @ 31498:17d4a8f3df67

Don't include string.h (redundant). (MAP_ANON) [REL_ALLOC_MMAP]: Ensure it's defined. [!MAP_ANON]: Include fcntl.h. (mmap_fd) [REL_ALLOC_MMAP]: New variable. (r_alloc, r_re_alloc, r_alloc_free) (mmap_enlarge, mmap_set_vars): Use it. (r_alloc_init_fd): New function. (__morecore) [SYSTEM_MALLOC]: Don't declare. (r_alloc_init): Call r_alloc_init_fd. Conditionalize stuff on malloc type.

31497:03cff4e91e67

#ifdef DOUG_LEA_MALLOC
#define M_TOP_PAD           -2 
extern int mallopt ();
#else /* not DOUG_LEA_MALLOC */
extern int __malloc_extra_blocks;
#endif /* not DOUG_LEA_MALLOC */

#else /* not emacs */

#include <stddef.h>

typedef size_t SIZE;
typedef void *POINTER;

#include <unistd.h>
#include <malloc.h>
#include <string.h>

#define safe_bcopy(x, y, z) memmove (y, x, z)
#define bzero(x, len) memset (x, 0, len)

#endif	/* not emacs */

#ifdef REL_ALLOC_MMAP

#include <sys/types.h>
#include <sys/mman.h>
#include <stdio.h>
#include <errno.h>

/* Memory is allocated in regions which are mapped using mmap(2).
   The current implementation let's the system select mapped
   addresses;  we're not using MAP_FIXED in general, except when
   trying to enlarge regions.

   Each mapped region starts with a mmap_region structure, the user
   area starts after that structure, aligned to MEM_ALIGN.

/* Temporary storage for mmap_set_vars, see there.  */

static struct mmap_region *mmap_regions_1;

/* Value is X rounded up to the next multiple of N.  */

#define ROUND(X, N)	(((X) + (N) - 1) / (N) * (N))

/* Size of mmap_region structure plus padding.  */

static struct mmap_region *mmap_find P_ ((POINTER_TYPE *, POINTER_TYPE *));
POINTER_TYPE *r_alloc P_ ((POINTER_TYPE **, size_t));
POINTER_TYPE *r_re_alloc P_ ((POINTER_TYPE **, size_t));
void r_alloc_free P_ ((POINTER_TYPE **ptr));


/* Return a region overlapping address range START...END, or null if
   none.  END is not including, i.e. the last byte in the range
   is at END - 1.  */

      else
	{
	  POINTER_TYPE *p;
      
	  p = mmap (region_end, nbytes, PROT_READ | PROT_WRITE,
		    MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0);
	  if (p == MAP_FAILED)
	    {
	      fprintf (stderr, "mmap: %s\n", emacs_strerror (errno));
	      success = 0;
	    }

void
mmap_set_vars (restore_p)
     int restore_p;
{
  struct mmap_region *r;

  if (restore_p)
    {
      mmap_regions = mmap_regions_1;
      for (r = mmap_regions; r; r = r->next)
	*r->var = MMAP_USER_AREA (r);
    }
  else
    {
      for (r = mmap_regions; r; r = r->next)
	*r->var = NULL;
      mmap_regions_1 = mmap_regions;
      mmap_regions = NULL;
    }
}


/* Return total number of bytes mapped.  */

  void *p;
  size_t map;

  if (!r_alloc_initialized)
    r_alloc_init ();

  map = ROUND (nbytes + MMAP_REGION_STRUCT_SIZE, page_size);
  p = mmap (NULL, map, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
  
  if (p == MAP_FAILED)
    {
      if (errno != ENOMEM)
	fprintf (stderr, "mmap: %s\n", emacs_strerror (errno));

{
  POINTER_TYPE *result;
  
  if (!r_alloc_initialized)
    r_alloc_init ();

  if (*var == NULL)
    result = r_alloc (var, nbytes);
  else if (nbytes == 0) 
    {

r_alloc_free (var)
     POINTER_TYPE **var;
{
  if (!r_alloc_initialized)
    r_alloc_init ();

  if (*var)
    {
      mmap_free (MMAP_REGION (*var));
      *var = NULL;

 ***********************************************************************/

/* The hook `malloc' uses for the function which gets more space
   from the system.  */

extern POINTER (*__morecore) ();

/* Initialize various things for memory allocation.  */

static void
r_alloc_init ()
{
  if (r_alloc_initialized)
    return;

  r_alloc_initialized = 1;
  real_morecore = __morecore;
  __morecore = r_alloc_sbrk;

  first_heap = last_heap = &heap_base;
  first_heap->next = first_heap->prev = NIL_HEAP;
  first_heap->start = first_heap->bloc_start
    = virtual_break_value = break_value = (*real_morecore) (0);
  if (break_value == NIL)
    abort ();

  page_size = PAGE;
  extra_bytes = ROUNDUP (50000);

#ifdef DOUG_LEA_MALLOC
    mallopt (M_TOP_PAD, 64 * 4096);
#else
  /* Give GNU malloc's morecore some hysteresis
     so that we move all the relocatable blocks much less often.  */
  __malloc_extra_blocks = 64;
#endif

  first_heap->end = (POINTER) ROUNDUP (first_heap->start);

  /* The extra call to real_morecore guarantees that the end of the
     address space is a multiple of page_size, even if page_size is
     not really the page size of the system running the binary in

  /* Doubly true, with the additional call that explicitly adds the
     rest of that page to the address space.  */
  bzero (first_heap->start,
	 (char *) first_heap->end - (char *) first_heap->start);
  virtual_break_value = break_value = first_heap->bloc_start = first_heap->end;
  use_relocatable_buffers = 1;
}

31498:17d4a8f3df67

#ifdef DOUG_LEA_MALLOC
#define M_TOP_PAD           -2 
extern int mallopt ();
#else /* not DOUG_LEA_MALLOC */
#ifndef SYSTEM_MALLOC
extern int __malloc_extra_blocks;
#endif /* SYSTEM_MALLOC */
#endif /* not DOUG_LEA_MALLOC */

#else /* not emacs */

#include <stddef.h>

typedef size_t SIZE;
typedef void *POINTER;

#include <unistd.h>
#include <malloc.h>

#define safe_bcopy(x, y, z) memmove (y, x, z)
#define bzero(x, len) memset (x, 0, len)

#endif	/* not emacs */

#ifdef REL_ALLOC_MMAP

#include <sys/types.h>
#include <sys/mman.h>
#ifndef MAP_ANON
#ifdef MAP_ANONYMOUS
#define MAP_ANON MAP_ANONYMOUS
#else
#define MAP_ANON 0
#endif
#endif
#include <stdio.h>
#include <errno.h>
#if !MAP_ANON
#include <fcntl.h>
#endif

/* Memory is allocated in regions which are mapped using mmap(2).
   The current implementation lets the system select mapped
   addresses;  we're not using MAP_FIXED in general, except when
   trying to enlarge regions.

   Each mapped region starts with a mmap_region structure, the user
   area starts after that structure, aligned to MEM_ALIGN.

/* Temporary storage for mmap_set_vars, see there.  */

static struct mmap_region *mmap_regions_1;

/* File descriptor for mmap.  If we don't have anonymous mapping,
   /dev/zero will be opened on it.  */

static int mmap_fd = -1;

/* Value is X rounded up to the next multiple of N.  */

#define ROUND(X, N)	(((X) + (N) - 1) / (N) * (N))

/* Size of mmap_region structure plus padding.  */

static struct mmap_region *mmap_find P_ ((POINTER_TYPE *, POINTER_TYPE *));
POINTER_TYPE *r_alloc P_ ((POINTER_TYPE **, size_t));
POINTER_TYPE *r_re_alloc P_ ((POINTER_TYPE **, size_t));
void r_alloc_free P_ ((POINTER_TYPE **ptr));


void
r_alloc_init_fd ()
{
  /* No anonymous mmap -- we need the file descriptor.  */
  mmap_fd = open ("/dev/zero", O_RDONLY);
  if (mmap_fd < 0)
    fatal ("cannot open /dev/zero");
}

/* Return a region overlapping address range START...END, or null if
   none.  END is not including, i.e. the last byte in the range
   is at END - 1.  */

      else
	{
	  POINTER_TYPE *p;
      
	  p = mmap (region_end, nbytes, PROT_READ | PROT_WRITE,
		    MAP_ANON | MAP_PRIVATE | MAP_FIXED, mmap_fd, 0);
	  if (p == MAP_FAILED)
	    {
	      fprintf (stderr, "mmap: %s\n", emacs_strerror (errno));
	      success = 0;
	    }

void
mmap_set_vars (restore_p)
     int restore_p;
{
  struct mmap_region *r;
  static int fd;

  if (restore_p)
    {
      mmap_regions = mmap_regions_1;
      for (r = mmap_regions; r; r = r->next)
	*r->var = MMAP_USER_AREA (r);
      mmap_fd = fd;
    }
  else
    {
      for (r = mmap_regions; r; r = r->next)
	*r->var = NULL;
      mmap_regions_1 = mmap_regions;
      mmap_regions = NULL;
      mmap_fd = -1;
    }
}


/* Return total number of bytes mapped.  */

  void *p;
  size_t map;

  if (!r_alloc_initialized)
    r_alloc_init ();
#if defined (REL_ALLOC_MMAP) && !MAP_ANON
  if (mmap_fd == -1)
    r_alloc_init_fd ();
#endif

  map = ROUND (nbytes + MMAP_REGION_STRUCT_SIZE, page_size);
  p = mmap (NULL, map, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE,
	    mmap_fd, 0);
  
  if (p == MAP_FAILED)
    {
      if (errno != ENOMEM)
	fprintf (stderr, "mmap: %s\n", emacs_strerror (errno));

{
  POINTER_TYPE *result;
  
  if (!r_alloc_initialized)
    r_alloc_init ();
#if defined (REL_ALLOC_MMAP) && !MAP_ANON
  if (mmap_fd == -1)
    r_alloc_init_fd ();
#endif

  if (*var == NULL)
    result = r_alloc (var, nbytes);
  else if (nbytes == 0) 
    {

r_alloc_free (var)
     POINTER_TYPE **var;
{
  if (!r_alloc_initialized)
    r_alloc_init ();
#if defined (REL_ALLOC_MMAP) && !MAP_ANON
  if (mmap_fd == -1)
    r_alloc_init_fd ();
#endif

  if (*var)
    {
      mmap_free (MMAP_REGION (*var));
      *var = NULL;

 ***********************************************************************/

/* The hook `malloc' uses for the function which gets more space
   from the system.  */

#ifndef SYSTEM_MALLOC
extern POINTER (*__morecore) ();
#endif

/* Initialize various things for memory allocation.  */

static void
r_alloc_init ()
{
  if (r_alloc_initialized)
    return;

  r_alloc_initialized = 1;
  page_size = PAGE;
#ifndef SYSTEM_MALLOC
  real_morecore = __morecore;
  __morecore = r_alloc_sbrk;
#endif

#ifndef REL_ALLOC_MMAP
  first_heap = last_heap = &heap_base;
  first_heap->next = first_heap->prev = NIL_HEAP;
  first_heap->start = first_heap->bloc_start
    = virtual_break_value = break_value = (*real_morecore) (0);
  if (break_value == NIL)
    abort ();

  extra_bytes = ROUNDUP (50000);
#endif

#ifdef DOUG_LEA_MALLOC
    mallopt (M_TOP_PAD, 64 * 4096);
#else
#ifndef SYSTEM_MALLOC
  /* Give GNU malloc's morecore some hysteresis
     so that we move all the relocatable blocks much less often.  */
  __malloc_extra_blocks = 64;
#endif
#endif

#ifndef REL_ALLOC_MMAP
  first_heap->end = (POINTER) ROUNDUP (first_heap->start);

  /* The extra call to real_morecore guarantees that the end of the
     address space is a multiple of page_size, even if page_size is
     not really the page size of the system running the binary in

  /* Doubly true, with the additional call that explicitly adds the
     rest of that page to the address space.  */
  bzero (first_heap->start,
	 (char *) first_heap->end - (char *) first_heap->start);
  virtual_break_value = break_value = first_heap->bloc_start = first_heap->end;
#endif
  use_relocatable_buffers = 1;
  r_alloc_init_fd ();
}