xemacs-beta: src/mc-alloc.c comparison

comparison src/mc-alloc.c @ 3303:619edf713d55

[xemacs-hg @ 2006-03-26 14:05:29 by crestani] 2006-03-21 Marcus Crestani <crestani@xemacs.org> * mc-alloc.c (visit_all_used_page_headers): * mc-alloc.c (finalize_page_for_disksave): * mc-alloc.c (mc_finalize_for_disksave): * mc-alloc.c (sweep_page): * mc-alloc.c (mc_sweep): * mc-alloc.c (protect_heap_page): * mc-alloc.c (protect_heap_pages): * mc-alloc.c (unprotect_heap_page): * mc-alloc.c (unprotect_heap_pages): * mc-alloc.h: Return number of pages processed. * vdb.c (vdb_start_dirty_bits_recording): Adjust size of page_fault_table to its upper bound (= number of pages that contain BLACK objects) in advance, to avoid malloc in the signal handler.

author	crestani
date	Sun, 26 Mar 2006 14:05:30 +0000
parents	d674024a8674
children	1043bbfa24cf

comparison

equal deleted inserted replaced

-:3d54e5f2dfb0
+:619edf713d55
 }
 #endif /* ERROR_CHECK_GC */
 /* Visits all pages (page_headers) hooked into the used heap pages
 list and executes f with the current page header as
-argument. Needed for sweep. */
+argument. Needed for sweep.  Returns number of processed pages. */
-static void
+static EMACS_INT
-visit_all_used_page_headers (void (*f) (page_header *ph))
+visit_all_used_page_headers (EMACS_INT (*f) (page_header *ph))
 {
+EMACS_INT number_of_pages_processed = 0;
 EMACS_INT i;
 for (i = 0; i < N_USED_PAGE_LISTS; i++)
 if (PLH_FIRST (USED_HEAP_PAGES (i)))
 {
 page_header *ph = PLH_FIRST (USED_HEAP_PAGES (i));
 while (PH_NEXT (ph))
 {
 page_header *next = PH_NEXT (ph); /* in case f removes the page */
-f (ph);
+number_of_pages_processed += f (ph);
 ph = next;
 }
-f (ph);
+number_of_pages_processed += f (ph);
 }
+return number_of_pages_processed;
 }
 /* Finalize a page for disksave. XEmacs calls this routine before it
 dumps the heap image. You have to tell mc-alloc how to call your
 object's finalizer for disksave. Therefore, you have to define the
 macro MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE(ptr). This macro should
 do nothing else then test if there is a finalizer and call it on
-the given argument, which is the heap address of the object. */
+the given argument, which is the heap address of the object.
-static void
+Returns number of processed pages. */
+static EMACS_INT
 finalize_page_for_disksave (page_header *ph)
 {
 EMACS_INT heap_space = (EMACS_INT) PH_HEAP_SPACE (ph);
 EMACS_INT heap_space_step = PH_CELL_SIZE (ph);
 EMACS_INT mark_bit = 0;
 for (mark_bit = 0; mark_bit < mark_bit_max_index; mark_bit++)
 {
 EMACS_INT ptr = (heap_space + (heap_space_step * mark_bit));
 MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE ((void *) ptr);
 }
-}
+return 1;
+}
-/* Finalizes the heap for disksave. */
-void
+/* Finalizes the heap for disksave.  Returns number of processed
+pages. */
+EMACS_INT
 mc_finalize_for_disksave (void)
 {
-visit_all_used_page_headers (finalize_page_for_disksave);
+return visit_all_used_page_headers (finalize_page_for_disksave);
 }
-/* Sweeps a page: all the non-marked cells are freed. If the page is empty
+/* Sweeps a page: all the non-marked cells are freed. If the page is
-in the end, it is removed. If some cells are free, it is moved to the
+empty in the end, it is removed. If some cells are free, it is
-front of its page header list. Full pages stay where they are. */
+moved to the front of its page header list. Full pages stay where
-static void
+they are.  Returns number of processed pages.*/
+static EMACS_INT
 sweep_page (page_header *ph)
 {
 Rawbyte *heap_space = (Rawbyte *) PH_HEAP_SPACE (ph);
 EMACS_INT heap_space_step = PH_CELL_SIZE (ph);
 EMACS_INT mark_bit = 0;
 	GET_BIT (bit, ph, mark_bit * N_MARK_BITS);
 	if (bit)
 	  {
 	    zero_mark_bits (ph);
 	    PH_BLACK_BIT (ph) = 0;
-	    return;
+	    return 1;
 	  }
 }
 for (mark_bit = 0; mark_bit < mark_bit_max_index; mark_bit++)
 {
 PH_BLACK_BIT (ph) = 0;
 if (PH_CELLS_USED (ph) == 0)
 remove_page_from_used_list (ph);
 else if (PH_CELLS_USED (ph) < PH_CELLS_ON_PAGE (ph))
 move_page_header_to_front (ph);
-}
+return 1;
+}
-/* Sweeps the heap. */
-void
+/* Sweeps the heap.  Returns number of processed pages. */
+EMACS_INT
 mc_sweep (void)
 {
-visit_all_used_page_headers (sweep_page);
+return visit_all_used_page_headers (sweep_page);
 }
 /* Frees the cell pointed to by ptr. */
 void
 	  && (PH_PROTECTION_BIT (ph) == 1));
 }
 /* Protect the heap page of given page header ph if black objects are
-on the page. */
+on the page.  Returns number of processed pages. */
-static void
+static EMACS_INT
 protect_heap_page (page_header *ph)
 {
 if (PH_BLACK_BIT (ph))
 {
 void *heap_space = PH_HEAP_SPACE (ph);
 EMACS_INT heap_space_size = PH_N_PAGES (ph) * PAGE_SIZE;
 vdb_protect ((void *) heap_space, heap_space_size);
 PH_PROTECTION_BIT (ph) = 1;
-}
+return 1;
 }
+return 0;
-/* Protect all heap pages with black objects. */
+}
-void
+/* Protect all heap pages with black objects.  Returns number of
+processed pages.*/
+EMACS_INT
 protect_heap_pages (void)
 {
-visit_all_used_page_headers (protect_heap_page);
+return visit_all_used_page_headers (protect_heap_page);
 }
 /* Remove protection (if there) of heap page of given page header
-ph. */
+ph.  Returns number of processed pages. */
-static void
+static EMACS_INT
 unprotect_heap_page (page_header *ph)
 {
 if (PH_PROTECTION_BIT (ph))
 {
 void *heap_space = PH_HEAP_SPACE (ph);
 EMACS_INT heap_space_size = PH_N_PAGES (ph) * PAGE_SIZE;
 vdb_unprotect (heap_space, heap_space_size);
 PH_PROTECTION_BIT (ph) = 0;
-}
+return 1;
 }
+return 0;
-/* Remove protection for all heap pages which are protected. */
+}
-void
+/* Remove protection for all heap pages which are protected.  Returns
+number of processed pages. */
+EMACS_INT
 unprotect_heap_pages (void)
 {
-visit_all_used_page_headers (unprotect_heap_page);
+return visit_all_used_page_headers (unprotect_heap_page);
 }
 /* Remove protection and mark page dirty. */
 void
 unprotect_page_and_mark_dirty (void *ptr)

Mercurial > hg > xemacs-beta

comparison src/mc-alloc.c @ 3303:619edf713d55