comparison src/alloc.c @ 28411:ecba29fa0198

(xstrdup): Moved here from xfaces.c. (allocating_for_lisp): Variable removed. (lisp_malloc): Block input around the calls to malloc and mem_insert.

28410:2812a333e746

#define SPARE_MEMORY (1 << 14)

/* Number of extra blocks malloc should get when it needs more core.  */

static int malloc_hysteresis;

/* Nonzero when malloc is called for allocating Lisp object space.
   Currently set but not used.  */

int allocating_for_lisp;

/* Non-nil means defun should do purecopy on the function definition.  */

Lisp_Object Vpurify_flag;

  free (block);
  UNBLOCK_INPUT;
}


/* Like malloc but used for allocating Lisp data.  NBYTES is the
   number of bytes to allocate, TYPE describes the intended use of the
   allcated memory block (for strings, for conses, ...).  */

static void *

     enum mem_type type;
{
  register void *val;

  BLOCK_INPUT;
  allocating_for_lisp++;
  val = (void *) malloc (nbytes);
  allocating_for_lisp--;
  UNBLOCK_INPUT;

  if (!val && nbytes)
    memory_full ();
  
#if GC_MARK_STACK
  if (type != MEM_TYPE_NON_LISP)
    mem_insert (val, (char *) val + nbytes, type);
#endif
  
  return val;
}


/* Return a new buffer structure allocated from the heap with

void
lisp_free (block)
     long *block;
{
  BLOCK_INPUT;
  allocating_for_lisp++;
  free (block);
#if GC_MARK_STACK
  mem_delete (mem_find (block));
#endif
  allocating_for_lisp--;
  UNBLOCK_INPUT;
}


/* Arranging to disable input signals while we're in malloc.

28411:ecba29fa0198

#define SPARE_MEMORY (1 << 14)

/* Number of extra blocks malloc should get when it needs more core.  */

static int malloc_hysteresis;

/* Non-nil means defun should do purecopy on the function definition.  */

Lisp_Object Vpurify_flag;

  free (block);
  UNBLOCK_INPUT;
}


/* Like strdup, but uses xmalloc.  */

char *
xstrdup (s)
     char *s;
{
  int len = strlen (s) + 1;
  char *p = (char *) xmalloc (len);
  bcopy (s, p, len);
  return p;
}


/* Like malloc but used for allocating Lisp data.  NBYTES is the
   number of bytes to allocate, TYPE describes the intended use of the
   allcated memory block (for strings, for conses, ...).  */

static void *

     enum mem_type type;
{
  register void *val;

  BLOCK_INPUT;
  val = (void *) malloc (nbytes);

#if GC_MARK_STACK
  if (val && type != MEM_TYPE_NON_LISP)
    mem_insert (val, (char *) val + nbytes, type);
#endif
  
  UNBLOCK_INPUT;
  if (!val && nbytes)
    memory_full ();
  return val;
}


/* Return a new buffer structure allocated from the heap with

void
lisp_free (block)
     long *block;
{
  BLOCK_INPUT;
  free (block);
#if GC_MARK_STACK
  mem_delete (mem_find (block));
#endif
  UNBLOCK_INPUT;
}


/* Arranging to disable input signals while we're in malloc.