[BACK]Return to finalize.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / gc

Diff for /OpenXM_contrib2/asir2000/gc/finalize.c between version 1.2 and 1.4

version 1.2, 2000/04/10 08:31:31 version 1.4, 2001/04/20 07:39:18
Line 14 
Line 14 
  */   */
 /* Boehm, February 1, 1996 1:19 pm PST */  /* Boehm, February 1, 1996 1:19 pm PST */
 # define I_HIDE_POINTERS  # define I_HIDE_POINTERS
 # include "gc_priv.h"  # include "private/gc_pmark.h"
 # include "gc_mark.h"  
   
 # ifdef FINALIZE_ON_DEMAND  # ifdef FINALIZE_ON_DEMAND
     int GC_finalize_on_demand = 1;      int GC_finalize_on_demand = 1;
Line 86  static signed_word log_fo_table_size = -1;
Line 85  static signed_word log_fo_table_size = -1;
   
 word GC_fo_entries = 0;  word GC_fo_entries = 0;
   
 # ifdef SRC_M3  void GC_push_finalizer_structures GC_PROTO((void))
 void GC_push_finalizer_structures()  
 {  {
     GC_push_all((ptr_t)(&dl_head), (ptr_t)(&dl_head) + sizeof(word));      GC_push_all((ptr_t)(&dl_head), (ptr_t)(&dl_head) + sizeof(word));
     GC_push_all((ptr_t)(&fo_head), (ptr_t)(&fo_head) + sizeof(word));      GC_push_all((ptr_t)(&fo_head), (ptr_t)(&fo_head) + sizeof(word));
       GC_push_all((ptr_t)(&GC_finalize_now),
                   (ptr_t)(&GC_finalize_now) + sizeof(word));
 }  }
 # endif  
   
 /* Double the size of a hash table. *size_ptr is the log of its current */  /* Double the size of a hash table. *size_ptr is the log of its current */
 /* size.  May be a noop.                                                */  /* size.  May be a noop.                                                */
Line 110  signed_word * log_size_ptr;
Line 109  signed_word * log_size_ptr;
     word old_size = ((log_old_size == -1)? 0: (1 << log_old_size));      word old_size = ((log_old_size == -1)? 0: (1 << log_old_size));
     register word new_size = 1 << log_new_size;      register word new_size = 1 << log_new_size;
     struct hash_chain_entry **new_table = (struct hash_chain_entry **)      struct hash_chain_entry **new_table = (struct hash_chain_entry **)
         GC_generic_malloc_inner_ignore_off_page(          GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE(
                 (size_t)new_size * sizeof(struct hash_chain_entry *), NORMAL);                  (size_t)new_size * sizeof(struct hash_chain_entry *), NORMAL);
   
     if (new_table == 0) {      if (new_table == 0) {
Line 179  signed_word * log_size_ptr;
Line 178  signed_word * log_size_ptr;
 #       endif  #       endif
         GC_grow_table((struct hash_chain_entry ***)(&dl_head),          GC_grow_table((struct hash_chain_entry ***)(&dl_head),
                       &log_dl_table_size);                        &log_dl_table_size);
 #       ifdef PRINTSTATS  #       ifdef CONDPRINT
             if (GC_print_stats) {
             GC_printf1("Grew dl table to %lu entries\n",              GC_printf1("Grew dl table to %lu entries\n",
                         (unsigned long)(1 << log_dl_table_size));                          (unsigned long)(1 << log_dl_table_size));
             }
 #       endif  #       endif
 #       ifndef THREADS  #       ifndef THREADS
             ENABLE_SIGNALS();              ENABLE_SIGNALS();
Line 199  signed_word * log_size_ptr;
Line 200  signed_word * log_size_ptr;
             return(1);              return(1);
         }          }
     }      }
 #   ifdef THREADS      new_dl = (struct disappearing_link *)
       new_dl = (struct disappearing_link *)          GC_INTERNAL_MALLOC(sizeof(struct disappearing_link),NORMAL);
         GC_generic_malloc_inner(sizeof(struct disappearing_link),NORMAL);  
 #   else  
       new_dl = (struct disappearing_link *)  
         GC_malloc(sizeof(struct disappearing_link));  
 #   endif  
     if (new_dl != 0) {      if (new_dl != 0) {
         new_dl -> dl_hidden_obj = HIDE_POINTER(obj);          new_dl -> dl_hidden_obj = HIDE_POINTER(obj);
         new_dl -> dl_hidden_link = HIDE_POINTER(link);          new_dl -> dl_hidden_link = HIDE_POINTER(link);
Line 248  signed_word * log_size_ptr;
Line 244  signed_word * log_size_ptr;
             GC_dl_entries--;              GC_dl_entries--;
             UNLOCK();              UNLOCK();
             ENABLE_SIGNALS();              ENABLE_SIGNALS();
             GC_free((GC_PTR)curr_dl);  #           ifdef DBG_HDRS_ALL
                 dl_next(curr_dl) = 0;
   #           else
                 GC_free((GC_PTR)curr_dl);
   #           endif
             return(1);              return(1);
         }          }
         prev_dl = curr_dl;          prev_dl = curr_dl;
Line 283  ptr_t p;
Line 283  ptr_t p;
     ptr_t scan_limit;      ptr_t scan_limit;
     ptr_t target_limit = p + WORDS_TO_BYTES(hhdr -> hb_sz) - 1;      ptr_t target_limit = p + WORDS_TO_BYTES(hhdr -> hb_sz) - 1;
   
     if ((descr & DS_TAGS) == DS_LENGTH) {      if ((descr & GC_DS_TAGS) == GC_DS_LENGTH) {
        scan_limit = p + descr - sizeof(word);         scan_limit = p + descr - sizeof(word);
     } else {      } else {
        scan_limit = target_limit + 1 - sizeof(word);         scan_limit = target_limit + 1 - sizeof(word);
Line 324  finalization_mark_proc * mp;
Line 324  finalization_mark_proc * mp;
     struct finalizable_object * curr_fo, * prev_fo;      struct finalizable_object * curr_fo, * prev_fo;
     int index;      int index;
     struct finalizable_object *new_fo;      struct finalizable_object *new_fo;
       hdr *hhdr;
     DCL_LOCK_STATE;      DCL_LOCK_STATE;
   
 #   ifdef THREADS  #   ifdef THREADS
Line 337  finalization_mark_proc * mp;
Line 338  finalization_mark_proc * mp;
 #       endif  #       endif
         GC_grow_table((struct hash_chain_entry ***)(&fo_head),          GC_grow_table((struct hash_chain_entry ***)(&fo_head),
                       &log_fo_table_size);                        &log_fo_table_size);
 #       ifdef PRINTSTATS  #       ifdef CONDPRINT
             if (GC_print_stats) {
             GC_printf1("Grew fo table to %lu entries\n",              GC_printf1("Grew fo table to %lu entries\n",
                         (unsigned long)(1 << log_fo_table_size));                          (unsigned long)(1 << log_fo_table_size));
             }
 #       endif  #       endif
 #       ifndef THREADS  #       ifndef THREADS
             ENABLE_SIGNALS();              ENABLE_SIGNALS();
Line 369  finalization_mark_proc * mp;
Line 372  finalization_mark_proc * mp;
                   /* May not happen if we get a signal.  But a high     */                    /* May not happen if we get a signal.  But a high     */
                   /* estimate will only make the table larger than      */                    /* estimate will only make the table larger than      */
                   /* necessary.                                         */                    /* necessary.                                         */
 #               ifndef THREADS  #               if !defined(THREADS) && !defined(DBG_HDRS_ALL)
                   GC_free((GC_PTR)curr_fo);                    GC_free((GC_PTR)curr_fo);
 #               endif  #               endif
             } else {              } else {
Line 402  finalization_mark_proc * mp;
Line 405  finalization_mark_proc * mp;
 #       endif  #       endif
         return;          return;
     }      }
 #   ifdef THREADS      GET_HDR(base, hhdr);
       new_fo = (struct finalizable_object *)      if (0 == hhdr) {
         GC_generic_malloc_inner(sizeof(struct finalizable_object),NORMAL);        /* We won't collect it, hence finalizer wouldn't be run. */
 #   else  #     ifdef THREADS
       new_fo = (struct finalizable_object *)            UNLOCK();
         GC_malloc(sizeof(struct finalizable_object));            ENABLE_SIGNALS();
 #   endif  #     endif
         return;
       }
       new_fo = (struct finalizable_object *)
           GC_INTERNAL_MALLOC(sizeof(struct finalizable_object),NORMAL);
     if (new_fo != 0) {      if (new_fo != 0) {
         new_fo -> fo_hidden_base = (word)HIDE_POINTER(base);          new_fo -> fo_hidden_base = (word)HIDE_POINTER(base);
         new_fo -> fo_fn = fn;          new_fo -> fo_fn = fn;
         new_fo -> fo_client_data = (ptr_t)cd;          new_fo -> fo_client_data = (ptr_t)cd;
         new_fo -> fo_object_size = GC_size(base);          new_fo -> fo_object_size = hhdr -> hb_sz;
         new_fo -> fo_mark_proc = mp;          new_fo -> fo_mark_proc = mp;
         fo_set_next(new_fo, fo_head[index]);          fo_set_next(new_fo, fo_head[index]);
         GC_fo_entries++;          GC_fo_entries++;
Line 478  finalization_mark_proc * mp;
Line 485  finalization_mark_proc * mp;
                                 ocd, GC_null_finalize_mark_proc);                                  ocd, GC_null_finalize_mark_proc);
 }  }
   
   #ifndef NO_DEBUGGING
   void GC_dump_finalization()
   {
       struct disappearing_link * curr_dl;
       struct finalizable_object * curr_fo;
       ptr_t real_ptr, real_link;
       int dl_size = (log_dl_table_size == -1 ) ? 0 : (1 << log_dl_table_size);
       int fo_size = (log_fo_table_size == -1 ) ? 0 : (1 << log_fo_table_size);
       int i;
   
       GC_printf0("Disappearing links:\n");
       for (i = 0; i < dl_size; i++) {
         for (curr_dl = dl_head[i]; curr_dl != 0; curr_dl = dl_next(curr_dl)) {
           real_ptr = (ptr_t)REVEAL_POINTER(curr_dl -> dl_hidden_obj);
           real_link = (ptr_t)REVEAL_POINTER(curr_dl -> dl_hidden_link);
           GC_printf2("Object: 0x%lx, Link:0x%lx\n", real_ptr, real_link);
         }
       }
       GC_printf0("Finalizers:\n");
       for (i = 0; i < fo_size; i++) {
         for (curr_fo = fo_head[i]; curr_fo != 0; curr_fo = fo_next(curr_fo)) {
           real_ptr = (ptr_t)REVEAL_POINTER(curr_fo -> fo_hidden_base);
           GC_printf1("Finalizable object: 0x%lx\n", real_ptr);
         }
       }
   }
   #endif
   
 /* Called with world stopped.  Cause disappearing links to disappear,   */  /* Called with world stopped.  Cause disappearing links to disappear,   */
 /* and invoke finalizers.                                               */  /* and invoke finalizers.                                               */
 void GC_finalize()  void GC_finalize()
Line 515  void GC_finalize()
Line 550  void GC_finalize()
     }      }
   /* Mark all objects reachable via chains of 1 or more pointers        */    /* Mark all objects reachable via chains of 1 or more pointers        */
   /* from finalizable objects.                                          */    /* from finalizable objects.                                          */
 #   ifdef PRINTSTATS      GC_ASSERT(GC_mark_state == MS_NONE);
         if (GC_mark_state != MS_NONE) ABORT("Bad mark state");  
 #   endif  
     for (i = 0; i < fo_size; i++) {      for (i = 0; i < fo_size; i++) {
       for (curr_fo = fo_head[i]; curr_fo != 0; curr_fo = fo_next(curr_fo)) {        for (curr_fo = fo_head[i]; curr_fo != 0; curr_fo = fo_next(curr_fo)) {
         real_ptr = (ptr_t)REVEAL_POINTER(curr_fo -> fo_hidden_base);          real_ptr = (ptr_t)REVEAL_POINTER(curr_fo -> fo_hidden_base);
Line 560  void GC_finalize()
Line 593  void GC_finalize()
               GC_words_finalized +=                GC_words_finalized +=
                         ALIGNED_WORDS(curr_fo -> fo_object_size)                          ALIGNED_WORDS(curr_fo -> fo_object_size)
                         + ALIGNED_WORDS(sizeof(struct finalizable_object));                          + ALIGNED_WORDS(sizeof(struct finalizable_object));
 #           ifdef PRINTSTATS              GC_ASSERT(GC_is_marked((ptr_t)curr_fo));
               if (!GC_is_marked((ptr_t)curr_fo)) {  
                 ABORT("GC_finalize: found accessible unmarked object\n");  
               }  
 #           endif  
             curr_fo = next_fo;              curr_fo = next_fo;
         } else {          } else {
             prev_fo = curr_fo;              prev_fo = curr_fo;
Line 619  void GC_finalize()
Line 648  void GC_finalize()
 void GC_enqueue_all_finalizers()  void GC_enqueue_all_finalizers()
 {  {
     struct finalizable_object * curr_fo, * prev_fo, * next_fo;      struct finalizable_object * curr_fo, * prev_fo, * next_fo;
     ptr_t real_ptr, real_link;      ptr_t real_ptr;
     register int i;      register int i;
     int fo_size;      int fo_size;
   
Line 694  GC_API void GC_finalize_all()
Line 723  GC_API void GC_finalize_all()
 }  }
 #endif  #endif
   
   /* Returns true if it is worth calling GC_invoke_finalizers. (Useful if */
   /* finalizers can only be called from some kind of `safe state' and     */
   /* getting into that safe state is expensive.)                          */
   int GC_should_invoke_finalizers GC_PROTO((void))
   {
       return GC_finalize_now != 0;
   }
   
 /* Invoke finalizers for all objects that are ready to be finalized.    */  /* Invoke finalizers for all objects that are ready to be finalized.    */
 /* Should be called without allocation lock.                            */  /* Should be called without allocation lock.                            */
 int GC_invoke_finalizers()  int GC_invoke_finalizers()
Line 731  int GC_invoke_finalizers()
Line 768  int GC_invoke_finalizers()
     return count;      return count;
 }  }
   
   void (* GC_finalizer_notifier)() = (void (*) GC_PROTO((void)))0;
   
   static GC_word last_finalizer_notification = 0;
   
   void GC_notify_or_invoke_finalizers GC_PROTO((void))
   {
       if (GC_finalize_now == 0) return;
       if (!GC_finalize_on_demand) {
           (void) GC_invoke_finalizers();
           GC_ASSERT(GC_finalize_now == 0);
           return;
       }
       if (GC_finalizer_notifier != (void (*) GC_PROTO((void)))0
           && last_finalizer_notification != GC_gc_no) {
           last_finalizer_notification = GC_gc_no;
           GC_finalizer_notifier();
       }
   }
   
 # ifdef __STDC__  # ifdef __STDC__
     GC_PTR GC_call_with_alloc_lock(GC_fn_type fn,      GC_PTR GC_call_with_alloc_lock(GC_fn_type fn,
                                          GC_PTR client_data)                                           GC_PTR client_data)
Line 750  int GC_invoke_finalizers()
Line 806  int GC_invoke_finalizers()
 #   endif  #   endif
     result = (*fn)(client_data);      result = (*fn)(client_data);
 #   ifdef THREADS  #   ifdef THREADS
       UNSET_LOCK_HOLDER();  #     ifndef GC_ASSERTIONS
           UNSET_LOCK_HOLDER();
   #     endif /* o.w. UNLOCK() does it implicitly */
       UNLOCK();        UNLOCK();
       ENABLE_SIGNALS();        ENABLE_SIGNALS();
 #   endif  #   endif
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.4
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>