pike.git/ src/ array.c

1996-03-28

1996-03-28 21:33:36 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

• c94c37ca405654c667395ccd4f30008bc38aeb17 (82 lines) (+38/-44) ^{[ Show | Annotate ]}
  Branch: c94c37ca405654c667395ccd4f30008bc38aeb17

garbage collect rewritten

Rev: src/array.c:1.9
Rev: src/array.h:1.6
Rev: src/gc.c:1.2
Rev: src/gc.h:1.2
Rev: src/list.c:1.3
Rev: src/list.h:1.2
Rev: src/mapping.c:1.4
Rev: src/mapping.h:1.3
Rev: src/object.c:1.8
Rev: src/object.h:1.5
Rev: src/program.c:1.8
Rev: src/program.h:1.4
Rev: src/svalue.c:1.8

27:    0, /* malloced Size = 0 */    0, /* no types */    T_MIXED, /* mixed array */ -  0, /* no flags */ +    };      
61:       v->malloced_size=size+extra_space;    v->size=size; -  v->flags=0; +     v->refs=1;    v->prev=&empty_array;    v->next=empty_array.next;
1286: Inside #if defined(GC2)
     #ifdef GC2    - void gc_check_array(struct array *a) + void gc_mark_array_as_referenced(struct array *a)   { -  if(a == gc_ptr) gc_refs++; -  if(a->flags & GC_MARK) return; -  a->flags |= GC_MARK; -  if(!(a->type_field & BIT_COMPLEX)) return; -  gc_check_svalues(ITEM(a), a->size); +  if(gc_mark(a)) +  if(a->type_field & BIT_COMPLEX) +  gc_mark_svalues(ITEM(a), a->size);   }    -  +    void gc_check_all_arrays()   { -  struct array *a,*n; -  +  struct array *a;    a=&empty_array;    do    { -  if(!(a->flags & GC_MARK) && a->type_field & BIT_COMPLEX) -  { -  gc_ptr=a; -  gc_refs=0; +  if(a->type_field & BIT_COMPLEX) +  gc_check_svalues(ITEM(a), a->size);    -  gc_check_array(a); +  a=a->next; +  } while (a != & empty_array); + }    -  a->refs++; +     -  if(gc_refs == a->refs) + void gc_mark_all_arrays()   { -  /* This structure contains as many references to itself as -  * it has referenes, which means that it is circular and -  * should be destroyed, so please go away. -  */ +  struct array *a;    -  free_svalues(ITEM(a), a->size, a->type_field); +  a=&empty_array; +  do +  { +  if(gc_is_referenced(a)) +  gc_mark_array_as_referenced(a);    -  a->size=0; -  -  } -  -  if(!(n=a->next)) -  fatal("Null pointer in array list.\n"); -  -  free_array(a); -  a=n; -  }else{ +     a=a->next; -  } +     } while (a != & empty_array);   }    - void gc_clear_array_marks() + void gc_free_all_unreferenced_arrays()   { -  struct array *a; +  struct array *a,*next;       a=&empty_array;    do    { -  a->flags &=~ GC_MARK; -  a=a->next; +  if(gc_do_free(a)) +  { +  a->refs++; +  free_svalues(ITEM(a), a->size, a->type_field); +  a->size=0;    -  +  if(!(next=a->next)) +  fatal("Null pointer in array list.\n"); +  +  free_array(a); +  a=next; +  }else{ +  a=a->next; +  }    } while (a != & empty_array);   }       -  +    #endif /* GC2 */