pike.git/ src/ mapping.c

Branch: Tag:

2003-09-08

2003-09-08 15:28:15 by Martin Stjernholm <mast@lysator.liu.se>

Added more tracking in the gc to help track down bugs when the gc follows
munged pointers in the mark pass. Activated with GC_MARK_DEBUG.

Rev: src/array.c:1.135
Rev: src/gc.c:1.196
Rev: src/gc.h:1.95
Rev: src/mapping.c:1.160
Rev: src/object.c:1.221
Rev: src/program.c:1.478
Rev: src/svalue.c:1.156

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: mapping.c,v 1.159 2003/06/02 16:35:33 mast Exp $ + || $Id: mapping.c,v 1.160 2003/09/08 15:28:14 mast Exp $   */      #include "global.h" - RCSID("$Id: mapping.c,v 1.159 2003/06/02 16:35:33 mast Exp $"); + RCSID("$Id: mapping.c,v 1.160 2003/09/08 15:28:14 mast Exp $");   #include "main.h"   #include "object.h"   #include "mapping.h"
2085:   #define DO_IF_MAPPING_SIZE_DEBUG(x)   #endif    - #define GC_RECURSE_MD_IN_USE(MD, RECURSE_FN, IND_TYPES, VAL_TYPES) do { \ + #define GC_RECURSE_MD_IN_USE(M, MD, RECURSE_FN, IND_TYPES, VAL_TYPES) do { \    INT32 e; \    struct keypair *k; \    IND_TYPES = MD->ind_types; \    NEW_MAPPING_LOOP(MD) { \ -  if (!IS_DESTRUCTED(&k->ind) && RECURSE_FN(&k->ind, 1)) { \ -  DO_IF_DEBUG(Pike_fatal("Didn't expect an svalue zapping now.\n")); \ +  if (!IS_DESTRUCTED(&k->ind) && \ +  RECURSE_FN(&k->ind, 1, T_MAPPING, M)) { \ +  DO_IF_DEBUG(Pike_fatal("Didn't expect an svalue zapping now.\n")); \    } \ -  RECURSE_FN(&k->val, 1); \ +  RECURSE_FN(&k->val, 1, T_MAPPING, M); \    VAL_TYPES |= 1 << k->val.type; \    } \   } while (0)    - #define GC_RECURSE(MD, REC_KEYPAIR, TYPE, IND_TYPES, VAL_TYPES) do { \ + #define GC_RECURSE(M, MD, REC_KEYPAIR, TYPE, IND_TYPES, VAL_TYPES) do { \    INT32 e; \    int remove; \    struct keypair *k,**prev; \
2107:    { \    for(prev= MD->hash + e;(k=*prev);) \    { \ -  REC_KEYPAIR(remove, \ +  REC_KEYPAIR(M, remove, \    PIKE_CONCAT(TYPE, _svalues), \    PIKE_CONCAT(TYPE, _weak_svalues), \    PIKE_CONCAT(TYPE, _without_recurse), \
2120:    MD->free_list->val.type = T_INT; \    MD->size--; \    DO_IF_MAPPING_SIZE_DEBUG( \ -  if(m->data ==MD) \ -  m->debug_size--; \ +  if(M->data ==MD) \ +  M->debug_size--; \    ); \    }else{ \    VAL_TYPES |= 1 << k->val.type; \
2132:    } \   } while (0)    - #define GC_REC_KP(REMOVE, N_REC, W_REC, N_TST, W_TST) do { \ -  if ((REMOVE = N_REC(&k->ind, 1))) \ + #define GC_REC_KP(M, REMOVE, N_REC, W_REC, N_TST, W_TST) do { \ +  if ((REMOVE = N_REC(&k->ind, 1, T_MAPPING, M))) \    gc_free_svalue(&k->val); \    else \ -  N_REC(&k->val, 1); \ +  N_REC(&k->val, 1, T_MAPPING, M); \   } while (0)    - #define GC_REC_KP_IND(REMOVE, N_REC, W_REC, N_TST, W_TST) do { \ -  if ((REMOVE = W_REC(&k->ind, 1))) \ + #define GC_REC_KP_IND(M, REMOVE, N_REC, W_REC, N_TST, W_TST) do { \ +  if ((REMOVE = W_REC(&k->ind, 1, T_MAPPING, M))) \    gc_free_svalue(&k->val); \    else \ -  N_REC(&k->val, 1); \ +  N_REC(&k->val, 1, T_MAPPING, M); \   } while (0)    - #define GC_REC_KP_VAL(REMOVE, N_REC, W_REC, N_TST, W_TST) do { \ + #define GC_REC_KP_VAL(M, REMOVE, N_REC, W_REC, N_TST, W_TST) do { \    if ((REMOVE = N_TST(&k->ind))) /* Don't recurse now. */ \    gc_free_svalue(&k->val); \ -  else if ((REMOVE = W_REC(&k->val, 1))) \ +  else if ((REMOVE = W_REC(&k->val, 1, T_MAPPING, M))) \    gc_free_svalue(&k->ind); \    else \ -  N_REC(&k->ind, 1); /* Now we can recurse the index. */ \ +  N_REC(&k->ind, 1, T_MAPPING, M); /* Now we can recurse the index. */ \   } while (0)    - #define GC_REC_KP_BOTH(REMOVE, N_REC, W_REC, N_TST, W_TST) do { \ + #define GC_REC_KP_BOTH(M, REMOVE, N_REC, W_REC, N_TST, W_TST) do { \    if ((REMOVE = W_TST(&k->ind))) /* Don't recurse now. */ \    gc_free_svalue(&k->val); \ -  else if ((REMOVE = W_REC(&k->val, 1))) \ +  else if ((REMOVE = W_REC(&k->val, 1, T_MAPPING, M))) \    gc_free_svalue(&k->ind); \    else \ -  W_REC(&k->ind, 1); /* Now we can recurse the index. */ \ +  W_REC(&k->ind, 1, T_MAPPING, M); /* Now we can recurse the index. */ \   } while (0)      void gc_mark_mapping_as_referenced(struct mapping *m)
2189:    TYPE_FIELD ind_types = 0, val_types = 0;    if (MAPPING_DATA_IN_USE(md)) {    /* Must leave the mapping data untouched if it's busy. */ -  GC_RECURSE_MD_IN_USE(md, gc_mark_svalues, ind_types, val_types); +  debug_malloc_touch(m); +  debug_malloc_touch(md); +  GC_RECURSE_MD_IN_USE(m, md, debug_gc_mark_svalues, ind_types, val_types);    gc_assert_checked_as_nonweak(md);    }    else    switch (md->flags & MAPPING_WEAK) {    case 0: -  GC_RECURSE(md, GC_REC_KP, gc_mark, ind_types, val_types); +  debug_malloc_touch(m); +  debug_malloc_touch(md); +  GC_RECURSE(m, md, GC_REC_KP, debug_gc_mark, ind_types, val_types);    gc_assert_checked_as_nonweak(md);    break;    case MAPPING_WEAK_INDICES: -  GC_RECURSE(md, GC_REC_KP_IND, gc_mark, ind_types, val_types); +  debug_malloc_touch(m); +  debug_malloc_touch(md); +  GC_RECURSE(m, md, GC_REC_KP_IND, debug_gc_mark, ind_types, val_types);    gc_assert_checked_as_weak(md);    break;    case MAPPING_WEAK_VALUES: -  GC_RECURSE(md, GC_REC_KP_VAL, gc_mark, ind_types, val_types); +  debug_malloc_touch(m); +  debug_malloc_touch(md); +  GC_RECURSE(m, md, GC_REC_KP_VAL, debug_gc_mark, ind_types, val_types);    gc_assert_checked_as_weak(md);    break;    default: -  GC_RECURSE(md, GC_REC_KP_BOTH, gc_mark, ind_types, val_types); +  debug_malloc_touch(m); +  debug_malloc_touch(md); +  GC_RECURSE(m, md, GC_REC_KP_BOTH, debug_gc_mark, ind_types, val_types);    gc_assert_checked_as_weak(md);    break;    }
2235:    /* Must leave the mapping data untouched if it's busy. */    debug_malloc_touch(m);    debug_malloc_touch(md); -  GC_RECURSE_MD_IN_USE(md, gc_cycle_check_svalues, ind_types, val_types); +  GC_RECURSE_MD_IN_USE(m, md, debug_gc_cycle_check_svalues, ind_types, val_types);    gc_assert_checked_as_nonweak(md);    }    else
2243:    case 0:    debug_malloc_touch(m);    debug_malloc_touch(md); -  GC_RECURSE(md, GC_REC_KP, gc_cycle_check, ind_types, val_types); +  GC_RECURSE(m, md, GC_REC_KP, debug_gc_cycle_check, ind_types, val_types);    gc_assert_checked_as_nonweak(md);    break;    case MAPPING_WEAK_INDICES:    debug_malloc_touch(m);    debug_malloc_touch(md); -  GC_RECURSE(md, GC_REC_KP_IND, gc_cycle_check, ind_types, val_types); +  GC_RECURSE(m, md, GC_REC_KP_IND, debug_gc_cycle_check, ind_types, val_types);    gc_assert_checked_as_weak(md);    break;    case MAPPING_WEAK_VALUES:    debug_malloc_touch(m);    debug_malloc_touch(md); -  GC_RECURSE(md, GC_REC_KP_VAL, gc_cycle_check, ind_types, val_types); +  GC_RECURSE(m, md, GC_REC_KP_VAL, debug_gc_cycle_check, ind_types, val_types);    gc_assert_checked_as_weak(md);    break;    default:    debug_malloc_touch(m);    debug_malloc_touch(md); -  GC_RECURSE(md, GC_REC_KP_BOTH, gc_cycle_check, ind_types, val_types); +  GC_RECURSE(m, md, GC_REC_KP_BOTH, debug_gc_cycle_check, ind_types, val_types);    gc_assert_checked_as_weak(md);    break;    }
2388:    gc_mark_mapping_pos = m->next;    gc_mark_mapping_as_referenced(m);    } -  discard_queue(&gc_mark_queue); +  gc_mark_discard_queue();   }      void gc_free_all_unreferenced_mappings(void)