comparison src/alloc.c @ 64611:47f158dcf216

(gc_cons_threshold): Not static. (gc_cons_combined_threshold): Var deleted. (gc_relative_threshold): New variable. (Fgarbage_collect, init_alloc_once): Compute gc_relative_threshold instead of gc_cons_combined_threshold.

64610:06bf5258607d

EMACS_INT string_chars_consed;
EMACS_INT misc_objects_consed;
EMACS_INT intervals_consed;
EMACS_INT strings_consed;

/* Number of bytes of consing since GC before another GC should be done. */

static EMACS_INT gc_cons_threshold;
EMACS_INT gc_cons_combined_threshold;
static Lisp_Object Vgc_cons_percentage;

/* Nonzero during GC.  */

int gc_in_progress;

  consing_since_gc = 0;
  if (gc_cons_threshold < 10000)
    gc_cons_threshold = 10000;

  gc_cons_combined_threshold = gc_cons_threshold;

  if (FLOATP (Vgc_cons_percentage))
    { /* Set gc_cons_combined_threshold.  */
      EMACS_INT total = 0;
      EMACS_INT threshold;
      total += total_conses  * sizeof (struct Lisp_Cons);
      total += total_symbols * sizeof (struct Lisp_Symbol);
      total += total_markers * sizeof (union Lisp_Misc);
      total += total_string_size;
      total += total_vector_size * sizeof (Lisp_Object);
      total += total_floats  * sizeof (struct Lisp_Float);
      total += total_intervals * sizeof (struct interval);
      total += total_strings * sizeof (struct Lisp_String);
      
      threshold = total * XFLOAT_DATA (Vgc_cons_percentage);
      if (threshold > gc_cons_combined_threshold)
	gc_cons_combined_threshold = threshold;
    }

  if (garbage_collection_messages)
    {
      if (message_p || minibuf_level > 0)
	restore_message ();

  gcprolist = 0;
  byte_stack_list = 0;
  staticidx = 0;
  consing_since_gc = 0;
  gc_cons_threshold = 100000 * sizeof (Lisp_Object);
  gc_cons_combined_threshold = gc_cons_threshold;
#ifdef VIRT_ADDR_VARIES
  malloc_sbrk_unused = 1<<22;	/* A large number */
  malloc_sbrk_used = 100000;	/* as reasonable as any number */
#endif /* VIRT_ADDR_VARIES */
}

64611:47f158dcf216

EMACS_INT string_chars_consed;
EMACS_INT misc_objects_consed;
EMACS_INT intervals_consed;
EMACS_INT strings_consed;

/* Minimum number of bytes of consing since GC before next GC. */

EMACS_INT gc_cons_threshold;

/* Similar minimum, computed from Vgc_cons_percentage.  */

EMACS_INT gc_relative_threshold;

static Lisp_Object Vgc_cons_percentage;

/* Nonzero during GC.  */

int gc_in_progress;

  consing_since_gc = 0;
  if (gc_cons_threshold < 10000)
    gc_cons_threshold = 10000;

  if (FLOATP (Vgc_cons_percentage))
    { /* Set gc_cons_combined_threshold.  */
      EMACS_INT total = 0;

      total += total_conses  * sizeof (struct Lisp_Cons);
      total += total_symbols * sizeof (struct Lisp_Symbol);
      total += total_markers * sizeof (union Lisp_Misc);
      total += total_string_size;
      total += total_vector_size * sizeof (Lisp_Object);
      total += total_floats  * sizeof (struct Lisp_Float);
      total += total_intervals * sizeof (struct interval);
      total += total_strings * sizeof (struct Lisp_String);
      
      gc_relative_threshold = total * XFLOAT_DATA (Vgc_cons_percentage);
    }
  else
    gc_relative_threshold = 0;

  if (garbage_collection_messages)
    {
      if (message_p || minibuf_level > 0)
	restore_message ();

  gcprolist = 0;
  byte_stack_list = 0;
  staticidx = 0;
  consing_since_gc = 0;
  gc_cons_threshold = 100000 * sizeof (Lisp_Object);
  gc_relative_threshold = 0;

#ifdef VIRT_ADDR_VARIES
  malloc_sbrk_unused = 1<<22;	/* A large number */
  malloc_sbrk_used = 100000;	/* as reasonable as any number */
#endif /* VIRT_ADDR_VARIES */
}