comparison src/alloc.c @ 55767:ee3a30045908

(marker_blocks_pending_free): New var. (gc_sweep): Store free marker blocks on that list. (Fgarbage_collect): Free them after undo-list cleanup.

55766:d5fe47c900ee

struct marker_block *marker_block;
int marker_block_index;

union Lisp_Misc *marker_free_list;

/* Total number of marker blocks now in use.  */

int n_marker_blocks;

void
init_marker ()
{
  marker_block = NULL;
  marker_block_index = MARKER_BLOCK_SIZE;
  marker_free_list = 0;
  n_marker_blocks = 0;
}

/* Return a newly allocated Lisp_Misc object, with no substructure.  */

		  }
	      }
	  }

	nextb = nextb->next;
      }
  }

  /* Clear the mark bits that we set in certain root slots.  */

    struct marker_block **mprev = &marker_block;
    register int lim = marker_block_index;
    register int num_free = 0, num_used = 0;

    marker_free_list = 0;

    for (mblk = marker_block; mblk; mblk = *mprev)
      {
	register int i;
	int this_free = 0;

	  }
	lim = MARKER_BLOCK_SIZE;
	/* If this block contains only free markers and we have already
	   seen more than two blocks worth of free markers then deallocate
	   this block.  */
#if 0
	/* There may still be pointers to these markers from a buffer's
	   undo list, so don't free them.  KFS 2004-05-21  /
	if (this_free == MARKER_BLOCK_SIZE && num_free > MARKER_BLOCK_SIZE)
	  {
	    *mprev = mblk->next;
	    /* Unhook from the free list.  */
	    marker_free_list = mblk->markers[0].u_free.chain;
	    lisp_free (mblk);
	    n_marker_blocks--;
	  }
	else
#endif
	  {
	    num_free += this_free;
	    mprev = &mblk->next;
	  }
      }

55767:ee3a30045908

struct marker_block *marker_block;
int marker_block_index;

union Lisp_Misc *marker_free_list;

/* Marker blocks which should be freed at end of GC.  */

struct marker_block *marker_blocks_pending_free;

/* Total number of marker blocks now in use.  */

int n_marker_blocks;

void
init_marker ()
{
  marker_block = NULL;
  marker_block_index = MARKER_BLOCK_SIZE;
  marker_free_list = 0;
  marker_blocks_pending_free = 0;
  n_marker_blocks = 0;
}

/* Return a newly allocated Lisp_Misc object, with no substructure.  */

		  }
	      }
	  }

	nextb = nextb->next;
      }
  }

  /* Undo lists have been cleaned up, so we can free marker blocks now.  */

  {
    struct marker_block *mblk;

    while ((mblk = marker_blocks_pending_free) != 0)
      {
	marker_blocks_pending_free = mblk->next;
	lisp_free (mblk);
      }
  }

  /* Clear the mark bits that we set in certain root slots.  */

    struct marker_block **mprev = &marker_block;
    register int lim = marker_block_index;
    register int num_free = 0, num_used = 0;

    marker_free_list = 0;
    marker_blocks_pending_free = 0;

    for (mblk = marker_block; mblk; mblk = *mprev)
      {
	register int i;
	int this_free = 0;

	  }
	lim = MARKER_BLOCK_SIZE;
	/* If this block contains only free markers and we have already
	   seen more than two blocks worth of free markers then deallocate
	   this block.  */
	if (this_free == MARKER_BLOCK_SIZE && num_free > MARKER_BLOCK_SIZE)
	  {
	    *mprev = mblk->next;
	    /* Unhook from the free list.  */
	    marker_free_list = mblk->markers[0].u_free.chain;
	    n_marker_blocks--;

	    /* It is not safe to free the marker block at this stage,
	       since there may still be pointers to these markers from
	       a buffer's undo list.  KFS 2004-05-25.  */
	    mblk->next = marker_blocks_pending_free;
	    marker_blocks_pending_free = mblk;
	  }
	else
	  {
	    num_free += this_free;
	    mprev = &mblk->next;
	  }
      }