carray 3.0.1 → 3.0.3

data/ext/ca_obj_tile.c

@@ -16,6 +16,7 @@
 ---------------------------------------------------------------------------- */
 
 #include "carray.h"
+#include "carray_internal.h"
 #include "ca_composite_dispatch.h"
 #include "ca_obj_face.h"  /* CA_FACE_LIFT_IF_FACE */
 
@@ -75,17 +76,24 @@ ca_tile_setup (CATile *ca, CArray *parent, ca_size_t *reps)
   ndim      = parent->ndim;
   bytes     = parent->bytes;
 
-  elements = 1;
-  for (i = 0; i < ndim; i++) {
-    if ( reps[i] <= 0 ) {
-      rb_raise(rb_eIndexError,
-               "invalid reps for %d-th dimension (must be positive)", i);
-    }
-    if ( parent->dim[i] <= 0 ) {
-      rb_raise(rb_eIndexError,
-               "invalid parent dim for %d-th dimension", i);
+  {
+    ca_size_t tiled[CA_RANK_MAX];
+    for (i = 0; i < ndim; i++) {
+      if ( reps[i] <= 0 ) {
+        rb_raise(rb_eIndexError,
+                 "invalid reps for %d-th dimension (must be positive)", i);
+      }
+      if ( __builtin_mul_overflow(parent->dim[i], reps[i], &tiled[i]) ) {
+        rb_raise(rb_eArgError, "too large byte length");
+      }
     }
-    elements *= parent->dim[i] * reps[i];
+    elements = ca_shape_elements(ndim, tiled, bytes);
+  }
+
+  /* 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_TILE;
@@ -118,7 +126,9 @@ ca_tile_setup (CATile *ca, CArray *parent, ca_size_t *reps)
 CATile *
 ca_tile_new (CArray *parent, ca_size_t *reps)
 {
-  CATile *ca = ALLOC(CATile);
+  CATile *ca;
+  ca_tile_setup(NULL, parent, reps);
+  ca = ALLOC(CATile);
   ca_tile_setup(ca, parent, reps);
   return ca;
 }
@@ -196,6 +206,7 @@ static void
 ca_tile_func_xfer_stride (void *ap, ca_size_t *starts, ca_size_t *counts,
                           ca_size_t *strides, void *data, int dir)
 {
+  if ( ca_region_is_empty(((CArray *) ap)->ndim, counts) ) return;
   CATile   *ca = (CATile *) ap;
   CArray   *parent = ca->parent;
   int8_t    ndim = ca->ndim;
@@ -445,10 +456,13 @@ ca_tile_func_xfer_all (void *ap, void *data, int dir)
     parent->ptr = parent_scratch;
     if ( dir == CA_XFER_GET ) ca_tile_attach_into(ca, (char *) data);
     else                       ca_tile_sync_from(ca, (char *) data);
+    /* Put parent->ptr back before the PUT: the PUT can raise (a lazy
+       backing's sync failing), and the scratch is gone once this
+       frame is. */
+    parent->ptr = parent_ptr_saved;
     if ( dir == CA_XFER_PUT ) {
       ca_xfer_all(parent, parent_scratch, CA_XFER_PUT);
     }
-    parent->ptr = parent_ptr_saved;
     ALLOCV_END(holder);
   }
 }
@@ -466,10 +480,7 @@ static void
 ca_tile_func_create_mask (void *ap)
 {
   CATile *ca = (CATile *) ap;
-  ca_update_mask(ca->parent);
-  if ( ! ca->parent->mask ) {
-    ca_create_mask(ca->parent);
-  }
+  ca_create_mask(ca->parent);
   ca->mask = (CArray *) ca_tile_new(ca->parent->mask, ca->reps);
 }
 
@@ -571,11 +582,13 @@ rb_ca_tile_initialize_copy (VALUE self, VALUE other)
 {
   CATile *ca, *cs;
   TypedData_Get_Struct(self,  CATile, &catile_data_type, ca);
+  ca_check_uninitialized(ca);
   TypedData_Get_Struct(other, CATile, &catile_data_type, cs);
   ca_tile_setup(ca, cs->parent, cs->reps);
   return self;
 }
 
+#ifdef CARRAY_DEV_BUILD
 /* Debug-only accessor returning the tile descriptor as a Hash.
    Naming: leading underscore signals internal use. */
 static VALUE
@@ -597,6 +610,7 @@ rb_ca_tile_descriptor (VALUE self)
   rb_hash_aset(hash, ID2SYM(rb_intern("ndim")), INT2NUM(ca->ndim));
   return hash;
 }
+#endif
 
 void
 Init_ca_obj_tile (void)
@@ -616,7 +630,9 @@ Init_ca_obj_tile (void)
   rb_define_method(rb_cCATile, "initialize_copy",
                                       rb_ca_tile_initialize_copy, 1);
 
+#ifdef CARRAY_DEV_BUILD
   /* Debug-only descriptor accessor. */
   rb_define_method(rb_cCATile, "_tile_descriptor",
                                       rb_ca_tile_descriptor, 0);
+#endif
 }

data/ext/ca_obj_time.c

@@ -14,6 +14,7 @@
 --------------------------------------------------------------------------- */
 
 #include "carray.h"
+#include "carray_internal.h"
 #include "ca_obj_face.h"
 
 /* unit enum (base epoch is 1970-01-01) */
@@ -36,7 +37,7 @@ enum {
 typedef struct {
   /* === CAView prefix === */
   int16_t    obj_type;
-  int8_t     data_type;        /* fixed to CA_INT64 */
+  int8_t     data_type;        /* surface: CA_FIXLEN (storage is the int64 parent) */
   int8_t     ndim;
   int32_t    flags;            /* CA_FLAG_IS_FACE set */
   ca_size_t  bytes;            /* fixed to sizeof(int64_t) */
@@ -182,6 +183,12 @@ ca_time_setup (CATime *ca, CArray *parent, int8_t unit, int64_t count)
              "CATime requires int64 storage (parent.data_type != CA_INT64)");
   }
 
+  /* 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_TIME;
   /* The surface data_type is CA_FIXLEN, not CA_INT64: this routes
      mkkernel dispatch onto the ca_*_not_implement stubs so numeric
@@ -227,7 +234,9 @@ ca_time_setup (CATime *ca, CArray *parent, int8_t unit, int64_t count)
 CATime *
 ca_time_new (CArray *parent, int8_t unit, int64_t count)
 {
-  CATime *ca = (CATime *) ca_array_alloc(CA_OBJ_TIME, parent->ndim);
+  CATime *ca;
+  ca_time_setup(NULL, parent, unit, count);
+  ca = (CATime *) ca_array_alloc(CA_OBJ_TIME, parent->ndim);
   ca_time_setup(ca, parent, unit, count);
   return ca;
 }
@@ -266,18 +275,6 @@ ca_time_func_allocate (void *ap)
   ca->ptr = ca->parent->ptr;
 }
 
-static void
-ca_time_func_create_mask (void *ap)
-{
-  CATime *ca = (CATime *) ap;
-  ca_update_mask(ca->parent);
-  if ( ! ca->parent->mask ) {
-    ca_create_mask(ca->parent);
-  }
-  ca->mask = (CArray *) ca_refer_new(ca->parent->mask,
-                                      CA_BOOLEAN, ca->ndim, ca->dim, 0, 0);
-}
-
 ca_operation_function_t ca_time_func = {
   -1, /* CA_OBJ_TIME — filled by ca_install_obj_type */
   CA_VIEW_ARRAY,
@@ -288,7 +285,7 @@ ca_operation_function_t ca_time_func = {
   ca_face_sync,
   ca_face_detach,
   ca_face_fill_data,
-  ca_time_func_create_mask,
+  ca_view_func_create_mask,
   ca_face_xfer_index,
   ca_face_xfer_addrs,
   NULL,                              /* fold_stride: identity Face is not foldable */
@@ -422,16 +419,16 @@ rb_ca_time_unit (VALUE self)
   return ca_time_resolution(ca->count, ca->unit);
 }
 
-/* storage_to_scalar implemented in C to avoid per-cell Ruby method dispatch
-   on the fetch hot path.  CAREFUL: there must be no Ruby `storage_to_scalar`
+/* storage_to_element implemented in C to avoid per-cell Ruby method dispatch
+   on the fetch hot path.  CAREFUL: there must be no Ruby `storage_to_element`
    def in lib/carray/time.rb — require order would let a Ruby version
-   shadow this C method (the Ruby `scalar_to_storage` write hook is a
+   shadow this C method (the Ruby `element_to_storage` write hook is a
    distinct method and does not collide).
    Since the Face surface is CA_FIXLEN, fetch delivers an 8-byte raw
    String.  Decode it as the parent int64 (= storage), then construct
    CATime::Element(epoch, unit). */
 static VALUE
-rb_ca_time_storage_to_scalar (VALUE self, VALUE raw)
+rb_ca_time_storage_to_element (VALUE self, VALUE raw)
 {
   CATime *ca;
   CATimeElement *s;
@@ -443,7 +440,7 @@ rb_ca_time_storage_to_scalar (VALUE self, VALUE raw)
   if ( TYPE(raw) == T_STRING ) {
     if ( RSTRING_LEN(raw) != (long) sizeof(int64_t) ) {
       rb_raise(rb_eArgError,
-               "CATime#storage_to_scalar: expected %lu bytes, got %ld",
+               "CATime#storage_to_element: expected %lu bytes, got %ld",
                (unsigned long) sizeof(int64_t), RSTRING_LEN(raw));
     }
     memcpy(&epoch, RSTRING_PTR(raw), sizeof(int64_t));
@@ -476,6 +473,7 @@ rb_ca_time_initialize_copy (VALUE self, VALUE other)
 {
   CATime *ca, *cs;
   TypedData_Get_Struct(self,  CATime, &catime_data_type, ca);
+  ca_check_uninitialized(ca);
   TypedData_Get_Struct(other, CATime, &catime_data_type, cs);
   if ( ca_func[CA_OBJ_TIME].pool_init ) {
     ca_array_pool_alloc(ca, CA_OBJ_TIME, cs->parent->ndim);
@@ -517,12 +515,12 @@ Init_ca_obj_time (void)
   rb_define_singleton_method(rb_cCATime, "__wrap__",
                                      rb_ca_time_wrap_method, 2);
   rb_define_method(rb_cCATime, "unit", rb_ca_time_unit, 0);
-  rb_define_method(rb_cCATime, "storage_to_scalar",
-                                     rb_ca_time_storage_to_scalar, 1);
-  /* Registers the C-level fast path so CA_FACE_STORAGE_TO_SCALAR_IF_FACE can
+  rb_define_method(rb_cCATime, "storage_to_element",
+                                     rb_ca_time_storage_to_element, 1);
+  /* Registers the C-level fast path so CA_FACE_STORAGE_TO_ELEMENT_IF_FACE can
      skip rb_funcall on the hot path. */
-  ca_face_register_storage_to_scalar(CA_OBJ_TIME,
-                                     rb_ca_time_storage_to_scalar);
+  ca_face_register_storage_to_element(CA_OBJ_TIME,
+                                     rb_ca_time_storage_to_element);
   ca_face_register_state_compatible(CA_OBJ_TIME,
                                     ca_time_state_compatible);
   /* unit is pure metadata (= no per-parent buffer), so the Face wrap can

data/ext/ca_obj_timedelta.c

@@ -14,6 +14,7 @@
 --------------------------------------------------------------------------- */
 
 #include "carray.h"
+#include "carray_internal.h"
 #include "ca_obj_face.h"
 
 /* The unit enum is shared with CATime (= same unit system).
@@ -26,7 +27,7 @@ extern void   ca_time_extract_unit (VALUE unit, int8_t *base, int64_t *count);
 typedef struct {
   /* === CAView prefix === */
   int16_t    obj_type;
-  int8_t     data_type;        /* fixed to CA_INT64 */
+  int8_t     data_type;        /* surface: CA_FIXLEN (storage is the int64 parent) */
   int8_t     ndim;
   int32_t    flags;            /* CA_FLAG_IS_FACE set */
   ca_size_t  bytes;            /* fixed to sizeof(int64_t) */
@@ -161,6 +162,12 @@ ca_timedelta_setup (CATimedelta *ca, CArray *parent, int8_t unit, int64_t count)
              "CATimedelta requires int64 storage (parent.data_type != CA_INT64)");
   }
 
+  /* 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_TIMEDELTA;
   /* NonNumeric surface (the FIXLEN gate), like CATime: the storage is a
      count of `count x unit` ticks, and letting the numeric kernels read it
@@ -208,7 +215,9 @@ ca_timedelta_setup (CATimedelta *ca, CArray *parent, int8_t unit, int64_t count)
 CATimedelta *
 ca_timedelta_new (CArray *parent, int8_t unit, int64_t count)
 {
-  CATimedelta *ca = (CATimedelta *) ca_array_alloc(CA_OBJ_TIMEDELTA, parent->ndim);
+  CATimedelta *ca;
+  ca_timedelta_setup(NULL, parent, unit, count);
+  ca = (CATimedelta *) ca_array_alloc(CA_OBJ_TIMEDELTA, parent->ndim);
   ca_timedelta_setup(ca, parent, unit, count);
   return ca;
 }
@@ -246,18 +255,6 @@ ca_timedelta_func_allocate (void *ap)
   ca->ptr = ca->parent->ptr;
 }
 
-static void
-ca_timedelta_func_create_mask (void *ap)
-{
-  CATimedelta *ca = (CATimedelta *) ap;
-  ca_update_mask(ca->parent);
-  if ( ! ca->parent->mask ) {
-    ca_create_mask(ca->parent);
-  }
-  ca->mask = (CArray *) ca_refer_new(ca->parent->mask,
-                                      CA_BOOLEAN, ca->ndim, ca->dim, 0, 0);
-}
-
 ca_operation_function_t ca_timedelta_func = {
   -1, /* CA_OBJ_TIMEDELTA — filled by ca_install_obj_type */
   CA_VIEW_ARRAY,
@@ -268,7 +265,7 @@ ca_operation_function_t ca_timedelta_func = {
   ca_face_sync,
   ca_face_detach,
   ca_face_fill_data,
-  ca_timedelta_func_create_mask,
+  ca_view_func_create_mask,
   ca_face_xfer_index,
   ca_face_xfer_addrs,
   NULL,                              /* fold_stride */
@@ -330,6 +327,7 @@ rb_ca_timedelta_initialize_copy (VALUE self, VALUE other)
 {
   CATimedelta *ca, *cs;
   TypedData_Get_Struct(self,  CATimedelta, &catimedelta_data_type, ca);
+  ca_check_uninitialized(ca);
   TypedData_Get_Struct(other, CATimedelta, &catimedelta_data_type, cs);
   if ( ca_func[CA_OBJ_TIMEDELTA].pool_init ) {
     ca_array_pool_alloc(ca, CA_OBJ_TIMEDELTA, cs->parent->ndim);
@@ -338,12 +336,12 @@ rb_ca_timedelta_initialize_copy (VALUE self, VALUE other)
   return self;
 }
 
-/* storage_to_scalar implemented in C to avoid per-cell Ruby method dispatch
+/* storage_to_element implemented in C to avoid per-cell Ruby method dispatch
    on the fetch hot path.  Accepts either an Integer (INT64 surface fetch)
    or an 8-byte String (FIXLEN surface fetch); decodes the parent int64
    and constructs CATimedelta::Element(value, unit). */
 static VALUE
-rb_ca_timedelta_storage_to_scalar (VALUE self, VALUE raw)
+rb_ca_timedelta_storage_to_element (VALUE self, VALUE raw)
 {
   CATimedelta *ca;
   CATimedeltaElement *s;
@@ -355,7 +353,7 @@ rb_ca_timedelta_storage_to_scalar (VALUE self, VALUE raw)
   if ( TYPE(raw) == T_STRING ) {
     if ( RSTRING_LEN(raw) != (long) sizeof(int64_t) ) {
       rb_raise(rb_eArgError,
-               "CATimedelta#storage_to_scalar: expected %lu bytes, got %ld",
+               "CATimedelta#storage_to_element: expected %lu bytes, got %ld",
                (unsigned long) sizeof(int64_t), RSTRING_LEN(raw));
     }
     memcpy(&value, RSTRING_PTR(raw), sizeof(int64_t));
@@ -408,17 +406,17 @@ Init_ca_obj_timedelta (void)
   rb_define_singleton_method(rb_cCATimedelta, "__wrap__",
                                     rb_ca_timedelta_wrap_method, 2);
   rb_define_method(rb_cCATimedelta, "unit", rb_ca_timedelta_unit, 0);
-  rb_define_method(rb_cCATimedelta, "storage_to_scalar",
-                                    rb_ca_timedelta_storage_to_scalar, 1);
-  /* Registers the state-compatibility predicate so CA_FACE_STORAGE_TO_SCALAR_IF_FACE
+  rb_define_method(rb_cCATimedelta, "storage_to_element",
+                                    rb_ca_timedelta_storage_to_element, 1);
+  /* Registers the state-compatibility predicate so CA_FACE_STORAGE_TO_ELEMENT_IF_FACE
      can skip rb_funcall on the hot path. */
   ca_face_register_state_compatible(CA_OBJ_TIMEDELTA,
                                     ca_timedelta_state_compatible);
   /* unit is pure metadata, no per-parent buffer; multi-parent Face lift
      is safe (portable = 1). */
   ca_face_register_state_portable(CA_OBJ_TIMEDELTA, 1);
-  ca_face_register_storage_to_scalar(CA_OBJ_TIMEDELTA,
-                                     rb_ca_timedelta_storage_to_scalar);
+  ca_face_register_storage_to_element(CA_OBJ_TIMEDELTA,
+                                     rb_ca_timedelta_storage_to_element);
 
   /* CATimedelta::Element as a C-backed TypedData class.  The Ruby-side
      definition in lib/carray/time.rb keeps Comparable + to_seconds /

data/ext/ca_obj_transpose.c

@@ -37,11 +37,11 @@ ca_trans_setup (CAStride *ca, CArray *parent, ca_size_t *imap)
   for (i = 0; i < ndim; i++) {
     idim = imap[i];
     if (idim < 0 || idim >= ndim) {
-      rb_raise(rb_eRuntimeError,
+      rb_raise(rb_eArgError,
                "specified %i-th dimension number out of range", i);
     }
     if (map[idim] != -1) {
-      rb_raise(rb_eRuntimeError,
+      rb_raise(rb_eArgError,
                "specified %i-th dimension number is duplicated", i);
     }
     map[idim] = i;
@@ -58,6 +58,12 @@ ca_trans_setup (CAStride *ca, CArray *parent, ca_size_t *imap)
     strides[i] = parent_byte_stride[imap[i]];
   }
 
+  /* ca == NULL asks for the checks above only, so that a constructor can
+     run them before it allocates. */
+  if ( ca == NULL ) {
+    return 0;
+  }
+
   ca_stride_setup(ca, CA_OBJ_TRANSPOSE, parent,
                   parent->data_type, parent->bytes,
                   ndim, newdim, strides, 0);
@@ -67,7 +73,9 @@ ca_trans_setup (CAStride *ca, CArray *parent, ca_size_t *imap)
 CAStride *
 ca_trans_new (CArray *parent, ca_size_t *imap)
 {
-  CAStride *ca = (CAStride *) ca_array_alloc(CA_OBJ_TRANSPOSE, parent->ndim);
+  CAStride *ca;
+  ca_trans_setup(NULL, parent, imap);
+  ca = (CAStride *) ca_array_alloc(CA_OBJ_TRANSPOSE, parent->ndim);
   ca_trans_setup(ca, parent, imap);
   return ca;
 }
@@ -126,6 +134,7 @@ rb_ca_trans_initialize_copy (VALUE self, VALUE other)
 {
   CAStride *ca, *cs;
   TypedData_Get_Struct(self,  CAStride, &castride_data_type, ca);
+  ca_check_uninitialized(ca);
   TypedData_Get_Struct(other, CAStride, &castride_data_type, cs);
   if ( ca_func[CA_OBJ_TRANSPOSE].pool_init ) {
     ca_array_pool_alloc(ca, CA_OBJ_TRANSPOSE, cs->ndim);