carray 3.0.3 → 3.0.5

data/ext/ca_obj_object.c

@@ -60,6 +60,15 @@ ca_object_pool_init (void *ap, int8_t ndim)
   ca->dim = (ca_size_t *) ca->_pool;
 }
 
+/* ca->self is the CAObject's own VALUE, which compaction can move; the
+   hooks call back through it, so follow the object to its new slot. */
+static void
+ca_object_compact (void *ap)
+{
+  CAObject *ca = (CAObject *) ap;
+  ca->self = rb_gc_location(ca->self);
+}
+
 const rb_data_type_t caobject_data_type = {
     .parent = &caview_data_type,
     .wrap_struct_name = "CAObject",
@@ -67,7 +76,7 @@ const rb_data_type_t caobject_data_type = {
         .dmark = ca_mark,
         .dfree = ca_free,
         .dsize = ca_object_dsize,
-        .dcompact = NULL
+        .dcompact = ca_object_compact
     },
     .flags = RUBY_TYPED_FREE_IMMEDIATELY
 };
@@ -84,15 +93,23 @@ ca_objectmask_dsize (const void *ap)
 }
 
 /* The mask reads and writes through its CAObject, and its cache is the
-   CAObject's; it keeps the CAObject alive. */
+   CAObject's; it keeps the CAObject alive, and follows it when compaction
+   moves it. */
 static void
 ca_objmask_mark (void *ap)
 {
   CAObjectMask *ca = (CAObjectMask *) ap;
-  rb_gc_mark(ca->array);
+  rb_gc_mark_movable(ca->array);
   ca_mark(ap);
 }
 
+static void
+ca_objmask_compact (void *ap)
+{
+  CAObjectMask *ca = (CAObjectMask *) ap;
+  ca->array = rb_gc_location(ca->array);
+}
+
 const rb_data_type_t caobjectmask_data_type = {
     .parent = &carray_data_type,
     .wrap_struct_name = "CAObjectMask",
@@ -100,7 +117,7 @@ const rb_data_type_t caobjectmask_data_type = {
         .dmark = ca_objmask_mark,
         .dfree = ca_free,
         .dsize = ca_objectmask_dsize,
-        .dcompact = NULL
+        .dcompact = ca_objmask_compact
     },
     .flags = RUBY_TYPED_FREE_IMMEDIATELY
 };
@@ -111,6 +128,7 @@ VALUE rb_cCAObjectMask;
 static CAObjectMask *
 ca_objmask_new (VALUE array, int8_t ndim, ca_size_t *dim)
 {
+  /* check: the mask takes the CAObject's own shape, already checked */
   CAObjectMask *ca = ALLOC(CAObjectMask);
   /* CA_OBJ_OBJECT_MASK registers no pool_init, so it lives on the legacy
      ALLOC_N path (dim allocated separately, freed via free_ca_wrap's else
@@ -135,50 +153,126 @@ ca_objmask_mask_data (void *ap)
                     rb_intern("mask"), 0);
 }
 
-/* Calls recv.mid(arg(ap)) with *slot pointing at a caller's buffer for
-   the duration, and puts *slot back however the call leaves.  The bulk
-   bridge lends the buffer this way so that copy_data / sync_data write
-   straight into it; a raise that skipped the restore would leave the
-   array pointing at a buffer its caller is about to free. */
+/* A wrap handed to a hook points at a buffer the caller frees once the
+   hook returns.  Taking it back leaves an array of no cells: a hook that
+   kept it holds something that raises when read, not a pointer into freed
+   memory. */
+static char ca_object_no_cells[16];
+
+static void
+ca_object_empty_wrap (CArray *w)
+{
+  int8_t k;
+  /* Not NULL: an entity whose pointer is NULL reads as detached. */
+  w->ptr      = ca_object_no_cells;
+  w->elements = 0;
+  for ( k = 0; k < w->ndim; k++ ) {
+    w->dim[k] = 0;
+  }
+}
+
+/* Moves the cells of a wrap (or of its lent mask, `w`) into an array of
+   their own, held by `holder` under `name`, and points `w` at them.  The
+   cells are those the hook left in the caller's buffer. */
+static void
+ca_object_keep_cells (VALUE holder, const char *name, CArray *w)
+{
+  volatile VALUE cells;
+  CArray *c;
+  cells = rb_carray_new(w->data_type, w->ndim, w->dim, w->bytes, NULL);
+  c = (CArray *) DATA_PTR(cells);
+  memcpy(c->ptr, w->ptr, (size_t) w->elements * w->bytes);
+  rb_ivar_set(holder, rb_intern(name), cells);
+  w->ptr = c->ptr;
+}
+
+/* Takes the caller's buffer back from a wrap the hook was lent, together
+   with `lent_mask`, the wrap of the data's mask bits it was lent with (or
+   NULL).  When the hook took a view of either, the view outlives the call,
+   so both keep their cells; otherwise both are left with none.  A mask the
+   hook made on the wrap is the wrap's own, with cells of its own. */
+static void
+ca_object_take_back (VALUE wrap, CArray *lent_mask)
+{
+  CArray *w = (CArray *) DATA_PTR(wrap);
+  CArray *m = ( lent_mask != NULL && w->mask == lent_mask ) ? lent_mask : NULL;
+  int viewed = ca_test_flag(w, CA_FLAG_LENT_VIEWED) ||
+               ( m != NULL && ca_test_flag(m, CA_FLAG_LENT_VIEWED) );
+  ca_unset_flag(w, CA_FLAG_LENT | CA_FLAG_LENT_VIEWED);
+  if ( lent_mask != NULL ) {
+    ca_unset_flag(lent_mask, CA_FLAG_LENT | CA_FLAG_LENT_VIEWED);
+  }
+  if ( viewed ) {
+    ca_object_keep_cells(wrap, "kept_cells", w);
+    if ( m != NULL ) {
+      ca_object_keep_cells(wrap, "kept_mask_cells", m);
+    }
+  }
+  else {
+    if ( m != NULL ) {
+      ca_object_empty_wrap(m);
+    }
+    ca_object_empty_wrap(w);
+  }
+}
+
+/* Calls copy_data / sync_data with a wrap of a caller's buffer, shaped as
+   the object, and takes the buffer back however the call leaves.  When the
+   data has a mask, the wrap's mask is a wrap of its bits: a hook that writes
+   masked values masks the object's cells, and the data keeps its mask
+   whatever the hook does with the wrap's.  A mask the hook makes on a wrap
+   that had none is the wrap's own and goes with it.  The data points at the
+   buffer for the duration too, for a hook that reads the object back while
+   it runs. */
 
 typedef struct {
-  char  **slot;
-  char   *saved;
-  VALUE   recv;
-  ID      mid;
-  VALUE (*arg)(void *);
-  void   *ap;
+  CAObject *ca;
+  char     *saved;
+  ID        mid;
+  VALUE     wrap;
+  CArray   *mask;      /* the wrap of the data's mask bits, or NULL */
 } ca_object_lend_t;
 
 static VALUE
 ca_object_lend_body (VALUE varg)
 {
   ca_object_lend_t *l = (ca_object_lend_t *) varg;
-  return rb_funcall(l->recv, l->mid, 1, l->arg(l->ap));
+  return rb_funcall(l->ca->self, l->mid, 1, l->wrap);
 }
 
 static VALUE
 ca_object_lend_restore (VALUE varg)
 {
   ca_object_lend_t *l = (ca_object_lend_t *) varg;
-  *l->slot = l->saved;
+  l->ca->data->ptr = l->saved;
+  ca_object_take_back(l->wrap, l->mask);
   return Qnil;
 }
 
 static void
-ca_object_call_lending (char **slot, void *ptr, VALUE recv, const char *mid,
-                        VALUE (*arg)(void *), void *ap)
+ca_object_call_lending (CAObject *ca, void *ptr, const char *mid)
 {
   ca_object_lend_t l;
-  l.slot  = slot;
-  l.saved = *slot;
-  l.recv  = recv;
+  CArray *data = ca->data;
+  CAWrap *w;
+  w = ca_wrap_new(data->data_type, data->ndim, data->dim, data->bytes,
+                  NULL, (char *) ptr);
+  l.wrap  = ca_wrap_struct(w);
+  l.mask  = NULL;
+  if ( data->mask != NULL ) {
+    l.mask = (CArray *) ca_wrap_new(CA_BOOLEAN, data->ndim, data->dim, 0,
+                                    NULL, data->mask->ptr);
+    ca_set_flag(l.mask, CA_FLAG_LENT);
+    w->mask = l.mask;
+  }
+  ca_set_flag(w, CA_FLAG_LENT);
+  l.ca    = ca;
+  l.saved = data->ptr;
   l.mid   = rb_intern(mid);
-  l.arg   = arg;
-  l.ap    = ap;
-  *slot = (char *) ptr;
+  data->ptr = (char *) ptr;
   rb_ensure(ca_object_lend_body, (VALUE) &l,
             ca_object_lend_restore, (VALUE) &l);
+  RB_GC_GUARD(l.wrap);
 }
 
 /* Calls recv.mid(*argv), where some of argv are transient wraps of a
@@ -187,8 +281,7 @@ ca_object_call_lending (char **slot, void *ptr, VALUE recv, const char *mid,
    when it returns, and a wrap outlives the call: the collector scans the
    machine stack conservatively and still finds it there, and an object
    wrap is marked cell by cell -- through a buffer that is gone.  A wrap
-   taken back points at nothing; a hook that kept it holds an empty
-   handle, not a stale one. */
+   taken back has no cells (ca_object_empty_wrap). */
 
 typedef struct {
   VALUE        recv;
@@ -212,7 +305,7 @@ ca_object_hook_release (VALUE varg)
   ca_object_hook_t *h = (ca_object_hook_t *) varg;
   int i;
   for ( i = 0; i < h->ntrans; i++ ) {
-    ((CArray *) DATA_PTR(h->trans[i]))->ptr = NULL;
+    ca_object_take_back(h->trans[i], NULL);
   }
   return Qnil;
 }
@@ -233,11 +326,6 @@ ca_object_call_transient (VALUE recv, const char *mid,
             ca_object_hook_release, (VALUE) &h);
 }
 
-static VALUE
-ca_object_data_of (void *ap)
-{
-  return rb_ivar_get(((CAObject *) ap)->self, rb_intern("__data__"));
-}
 
 
 /* Forward declaration: ca_object_wrap_transient (defined further down,
@@ -706,14 +794,19 @@ ca_object_setup (CAObject *ca,
                int8_t data_type, int8_t ndim, ca_size_t *dim, ca_size_t bytes)
 {
   ca_size_t elements;
-  int8_t i;
 
   /* check arguments */
 
-  CA_CHECK_DATA_TYPE(data_type);
-  CA_CHECK_RANK(ndim);
-  CA_CHECK_DIM(ndim, dim);
-  CA_CHECK_BYTES(data_type, bytes);
+  CA_CHECK_DATA_TYPE_GIVEN(data_type);
+  CA_CHECK_RANK_GIVEN(ndim);
+  CA_CHECK_DIM_GIVEN(ndim, dim);
+  CA_CHECK_BYTES_GIVEN(data_type, bytes);
+
+  /* ca == NULL asks for the checks above only, so that a constructor can
+     run them before it allocates. */
+  if ( ca == NULL ) {
+    return 0;
+  }
 
   /* calculate total number of elements */
 
@@ -745,7 +838,9 @@ ca_object_setup (CAObject *ca,
 static CAObject *
 ca_object_new (int8_t data_type, int8_t ndim, ca_size_t *dim, ca_size_t bytes)
 {
-  CAObject *ca = (CAObject *) ca_array_alloc(CA_OBJ_OBJECT, ndim);
+  CAObject *ca;
+  ca_object_setup(NULL, data_type, ndim, dim, bytes);
+  ca = (CAObject *) ca_array_alloc(CA_OBJ_OBJECT, ndim);
   ca_object_setup(ca, data_type, ndim, dim, bytes);
   return ca;
 }
@@ -755,7 +850,12 @@ free_ca_object (void *ap)
 {
   CAObject *ca = (CAObject *) ap;
   if ( ca != NULL ) {
-    /* ca->mask will be GC-ed by Ruby interpreter */
+    /* A Face's mask is a view over its parent's mask (made by
+       ca_view_func_create_mask) and belongs to this struct.  Otherwise
+       the mask is a Ruby object held in @mask, and the GC frees it. */
+    if ( ca_is_face(ca) ) {
+      ca_free(ca->mask);
+    }
     if ( ca->_pool ) {
       ca_array_free(ca);          /* dim lives in _pool */
     }
@@ -789,6 +889,19 @@ ca_object_mask_bytes (CAObject *ca)
   return (boolean8_t *) ca->mask->ptr;
 }
 
+/* Whether the mask of this object comes from its mask_* hooks.  Then a
+   fetched value says nothing about the mask: a cell the hooks mask stays
+   masked when its value is read, and only a fetcher answering UNDEF marks
+   one.  Without hooks the mask is what the fetches have answered, so a
+   value fetched clears the cell. */
+static int
+ca_object_mask_from_hooks (CAObject *ca)
+{
+  return rb_obj_respond_to(ca->self, rb_intern("mask_fetch_addr"), Qtrue)
+      || rb_obj_respond_to(ca->self, rb_intern("mask_fetch_index"), Qtrue)
+      || rb_obj_respond_to(ca->self, rb_intern("mask_copy_data"), Qtrue);
+}
+
 /* per-cell cores: the addr- and index-primary Ruby-callback bridge logic,
    direction-unified.  The fetch_* / store_* slots below are thin
    forwarders onto these. */
@@ -809,7 +922,7 @@ ca_object_xfer_addr_one (CAObject *ca, ca_size_t addr, void *ptr, int dir)
         }
       }
       else {
-        if ( ca_has_mask(ca) ) {
+        if ( ! ca_object_mask_from_hooks(ca) && ca_has_mask(ca) ) {
           ca_object_mask_bytes(ca)[addr] = 0;
         }
         rb_ca_obj2ptr(ca->self, rval, ptr);
@@ -831,7 +944,7 @@ ca_object_xfer_addr_one (CAObject *ca, ca_size_t addr, void *ptr, int dir)
         }
       }
       else {
-        if ( ca_has_mask(ca) ) {
+        if ( ! ca_object_mask_from_hooks(ca) && ca_has_mask(ca) ) {
           ca_object_mask_bytes(ca)[ca_index2addr(ca->mask, idx)] = 0;
         }
         rb_ca_obj2ptr(ca->self, rval, ptr);
@@ -877,7 +990,7 @@ ca_object_xfer_index_one (CAObject *ca, ca_size_t *idx, void *ptr, int dir)
         }
       }
       else {
-        if ( ca_has_mask(ca) ) {
+        if ( ! ca_object_mask_from_hooks(ca) && ca_has_mask(ca) ) {
           ca_object_mask_bytes(ca)[ca_index2addr(ca->mask, idx)] = 0;
         }
         rb_ca_obj2ptr(ca->self, rval, ptr);
@@ -895,7 +1008,7 @@ ca_object_xfer_index_one (CAObject *ca, ca_size_t *idx, void *ptr, int dir)
         }
       }
       else {
-        if ( ca_has_mask(ca) ) {
+        if ( ! ca_object_mask_from_hooks(ca) && ca_has_mask(ca) ) {
           ca_object_mask_bytes(ca)[addr] = 0;
         }
         rb_ca_obj2ptr(ca->self, rval, ptr);
@@ -924,8 +1037,8 @@ static void
 ca_object_func_allocate (void *ap)
 {
   CAObject *ca = (CAObject *) ap;
-  /* ca->data->ptr = ALLOC_N(char, ca_length(ca)); */
-  ca->data->ptr = xmalloc(ca_length(ca));  
+  /* cells: seeded with 0, which a copy_data that skips cells leaves visible */
+  ca->data->ptr = xmalloc(ca_length(ca));
   if ( ca_is_object_type(ca->data) ) { /* GC safe */
     VALUE *p = (VALUE *) ca->data->ptr;
     VALUE zero = INT2NUM(0);
@@ -951,12 +1064,51 @@ ca_object_func_allocate (void *ap)
    arithmetic all work via the slow per-element fallback. The fast bulk
    path is opt-in by defining copy_data / sync_data / fill_data. */
 
+/* copy_data of an object whose mask comes from its hooks: the array it is
+   handed must not carry the mask's cache, or a store of its values into it
+   (d[] = src) would clear the cells the hooks mask.  It is handed without a
+   mask, and a mask the call makes on it is dropped. */
+typedef struct {
+  CAObject *ca;
+  void     *ptr;
+  CArray   *mask;
+} ca_object_copy_bare_t;
+
+static VALUE
+ca_object_copy_bare_body (VALUE arg)
+{
+  ca_object_copy_bare_t *c = (ca_object_copy_bare_t *) arg;
+  ca_object_call_lending(c->ca, c->ptr, "copy_data");
+  return Qnil;
+}
+
+static VALUE
+ca_object_copy_bare_restore (VALUE arg)
+{
+  ca_object_copy_bare_t *c = (ca_object_copy_bare_t *) arg;
+  CArray *made = c->ca->data->mask;
+  if ( made != NULL && made != c->mask ) {
+    ca_free(made);
+  }
+  c->ca->data->mask = c->mask;
+  return Qnil;
+}
+
 static void
 ca_object_dispatch_copy (CAObject *ca, void *ptr)
 {
   if ( rb_obj_respond_to(ca->self, rb_intern("copy_data"), Qtrue) ) {
-    ca_object_call_lending(&ca->data->ptr, ptr, ca->self, "copy_data",
-                           ca_object_data_of, ca);
+    if ( ca->data->mask != NULL && ca_object_mask_from_hooks(ca) ) {
+      ca_object_copy_bare_t c;
+      c.ca   = ca;
+      c.ptr  = ptr;
+      c.mask = ca->data->mask;
+      ca->data->mask = NULL;
+      rb_ensure(ca_object_copy_bare_body, (VALUE) &c,
+                ca_object_copy_bare_restore, (VALUE) &c);
+      return;
+    }
+    ca_object_call_lending(ca, ptr, "copy_data");
   }
   else {
     ca_size_t addr;
@@ -971,8 +1123,7 @@ static void
 ca_object_dispatch_sync (CAObject *ca, void *ptr)
 {
   if ( rb_obj_respond_to(ca->self, rb_intern("sync_data"), Qtrue) ) {
-    ca_object_call_lending(&ca->data->ptr, ptr, ca->self, "sync_data",
-                           ca_object_data_of, ca);
+    ca_object_call_lending(ca, ptr, "sync_data");
   }
   else {
     ca_size_t addr;
@@ -1017,7 +1168,7 @@ ca_object_func_attach (void *ap)
     ca_face_attach(ap);
     return;
   }
-  /* ca->data->ptr = ALLOC_N(char, ca_length(ca)); */
+  /* cells: seeded with 0, which a copy_data that skips cells leaves visible */
   ca->data->ptr = xmalloc(ca_length(ca));
   if ( ca_is_object_type(ca->data) ) { /* GC safe */
     VALUE *p = (VALUE *) ca->data->ptr;
@@ -1094,6 +1245,7 @@ ca_object_wrap_transient (int8_t data_type, ca_size_t bytes,
   }
 
   wrap = ca_wrap_new(data_type, ndim, dim, bytes, NULL, (char *) data);
+  ca_set_flag(wrap, CA_FLAG_LENT);
   return ca_wrap_struct(wrap);
 }
 
@@ -1468,6 +1620,12 @@ rb_ca_object_initialize_copy (VALUE self, VALUE other)
   data = ca_wrap_struct(ca->data);
   rb_ivar_set(self, rb_intern("__data__"), data);
 
+  /* A Face's mask is a C struct owned by the Face, so the copy makes its
+     own from the parent when it is asked for one. */
+  if ( ca_is_face(ca) ) {
+    return self;
+  }
+
   ca_update_mask(cs);
   if ( cs->mask ) {
     ca->mask = cs->mask;
@@ -1567,7 +1725,7 @@ rb_ca_object_initialize (int argc, VALUE *argv, VALUE self)
   }
 
   Check_Type(rdim, T_ARRAY);
-  CA_CHECK_RANK(RARRAY_LEN(rdim));     /* before dim[] is filled */
+  CA_CHECK_RANK_GIVEN(RARRAY_LEN(rdim));     /* before dim[] is filled */
 
   ndim = RARRAY_LEN(rdim);
   for (i=0; i<ndim; i++) {

data/ext/ca_obj_record.c

@@ -100,6 +100,12 @@ ca_record_setup (CARecord *ca, CArray *parent, VALUE data_class)
              parent->data_type);
   }
 
+  /* ca == NULL asks for the checks above only, so that a constructor can
+     run them before it allocates. */
+  if ( ca == NULL ) {
+    return 0;
+  }
+
   ca->obj_type   = CA_OBJ_RECORD;
   ca->data_type  = CA_FIXLEN;
   ca->flags      = CA_FLAG_IS_FACE;
@@ -119,9 +125,6 @@ ca_record_setup (CARecord *ca, CArray *parent, VALUE data_class)
 
   ca->data_class = data_class;
 
-  if ( ca_has_mask(parent) ) {
-    ca_create_mask((CArray *) ca);
-  }
 
   if ( ca_is_scalar(parent) ) {
     ca_set_flag(ca, CA_FLAG_SCALAR);
@@ -137,8 +140,11 @@ ca_record_setup (CARecord *ca, CArray *parent, VALUE data_class)
 CARecord *
 ca_record_new (CArray *parent, VALUE data_class)
 {
-  CARecord *ca = (CARecord *) ca_array_alloc(CA_OBJ_RECORD, parent->ndim);
+  CARecord *ca;
+  ca_record_setup(NULL, parent, data_class);
+  ca = (CARecord *) ca_array_alloc(CA_OBJ_RECORD, parent->ndim);
   ca_record_setup(ca, parent, data_class);
+  ca_fill_or_free((CArray *) ca, ca_view_inherit_mask, (VALUE) ca);
   return ca;
 }
 
@@ -270,9 +276,7 @@ rb_ca_record_s_new (int argc, VALUE *argv, VALUE klass)
     shape_offset = 1;
   }
   ndim = argc - shape_offset;
-  if ( ndim < 0 || ndim > CA_RANK_MAX ) {
-    rb_raise(rb_eArgError, "invalid number of shape arguments (%d)", ndim);
-  }
+  ca_check_rank_fits(ndim, NULL);
   for ( i = 0; i < ndim; i++ ) {
     dim[i] = NUM2SIZE(argv[shape_offset + i]);
   }
@@ -305,6 +309,9 @@ rb_ca_record_s_wrap (int argc, VALUE *argv, VALUE klass)
     rb_scan_args(argc, argv, "2", &entity_val, &data_class);
   }
   rb_check_carray_object(entity_val);
+  /* A record array (or another Face) is wrapped from its storage, so the
+     new record is not a Face over a Face. */
+  entity_val = rb_ca_strip_face_value(entity_val);
   return ca_record_build(klass, data_class, entity_val);
 }
 
@@ -362,6 +369,7 @@ rb_ca_record_initialize_copy (VALUE self, VALUE other)
     ca_array_pool_alloc(ca, CA_OBJ_RECORD, cs->parent->ndim);
   }
   ca_record_setup(ca, cs->parent, cs->data_class);
+  ca_view_inherit_mask((VALUE) ca);
   /* Marshal loads into an empty instance through here without copying
      ivars, so the parent pin is set from `other`, not inherited. */
   rb_ca_set_parent(self, rb_ca_parent(other));

data/ext/ca_obj_reduce.c

@@ -56,6 +56,16 @@ ca_reduce_setup (CAReduce *ca, CArray *parent, ca_size_t count, ca_size_t offset
              "[BUG] CAReduce can't inherit other than boolean array");
   }
 
+  if ( count <= 0 ) {
+    rb_raise(rb_eArgError, "CAReduce: count should be positive");
+  }
+
+  /* ca == NULL asks for the checks above only, so that a constructor can
+     run them before it allocates. */
+  if ( ca == NULL ) {
+    return 0;
+  }
+
   elements  = parent->elements / count;
 
   ca->obj_type  = CA_OBJ_REDUCE;
@@ -75,9 +85,6 @@ ca_reduce_setup (CAReduce *ca, CArray *parent, ca_size_t count, ca_size_t offset
   ca->count     = count;
   ca->offset    = offset;
 
-  if ( ca_has_mask(parent) ) {
-    ca_create_mask(ca);
-  }
 
   if ( ca_is_scalar(parent) ) {
     ca_set_flag(ca, CA_FLAG_SCALAR);
@@ -89,8 +96,11 @@ ca_reduce_setup (CAReduce *ca, CArray *parent, ca_size_t count, ca_size_t offset
 CAReduce *
 ca_reduce_new (CArray *parent, ca_size_t count, ca_size_t offset)
 {
-  CAReduce *ca = ALLOC(CAReduce);
+  CAReduce *ca;
+  ca_reduce_setup(NULL, parent, count, offset);
+  ca = ALLOC(CAReduce);
   ca_reduce_setup(ca, parent, count, offset);
+  ca_fill_or_free((CArray *) ca, ca_view_inherit_mask, (VALUE) ca);
   return ca;
 }
 
@@ -193,8 +203,7 @@ ca_reduce_func_allocate (void *ap)
 {
   CAReduce *ca = (CAReduce *) ap;
   ca_attach(ca->parent);
-  /* ca->ptr = ALLOC_N(char, ca->elements); */
-  ca->ptr = xmalloc(ca_length(ca));  
+  ca->ptr = ca_alloc_cells((CArray *) ca);
 }
 
 static void
@@ -204,8 +213,7 @@ ca_reduce_func_attach (void *ap)
   char *p;
   ca_size_t i;
   ca_attach(ca->parent);
-  /* ca->ptr = ALLOC_N(char, ca->elements); */
-  ca->ptr = xmalloc(ca_length(ca));  
+  ca->ptr = ca_alloc_cells((CArray *) ca);
   p = ca->ptr;
   for (i=0; i<ca->elements; i++) {
     ca_reduce_func_xfer_addrs(ca, 1, &i, p, CA_XFER_GET);
@@ -314,6 +322,7 @@ rb_ca_reduce_initialize_copy (VALUE self, VALUE other)
   TypedData_Get_Struct(other, CAReduce, &careduce_data_type, cs);
 
   ca_reduce_setup(ca, cs->parent, cs->count, cs->offset);
+  ca_view_inherit_mask((VALUE) ca);
 
   return self;
 }