[svn-r28164] Added VDS SWMR test generator and writer files. These test files

are executed manually for now.

Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) gcc 4.9.2
           serial only

5 files changed, 495 insertions, 2 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 2561496..4c7b26c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -78,7 +78,7 @@ check_PROGRAMS=$(TEST_PROG) error_test err_compat tcheck_version \
     links_env flushrefresh use_append_chunk use_append_mchunks use_disable_mdc_flushes \
     swmr_generator swmr_start_write swmr_reader swmr_writer swmr_remove_reader \
     swmr_remove_writer swmr_addrem_writer swmr_sparse_reader swmr_sparse_writer \
-    swmr_check_compat_vfd
+    swmr_check_compat_vfd vds_swmr_gen vds_swmr_reader vds_swmr_writer
 if HAVE_SHARED_CONDITIONAL
   check_PROGRAMS+= plugin
 endif
@@ -182,7 +182,7 @@ CHECK_CLEANFILES+=accum.h5 cmpd_dset.h5 compact_dataset.h5 dataset.h5 \
     flushrefresh.h5 flushrefresh_VERIFICATION_START                  \
     flushrefresh_VERIFICATION_CHECKPOINT1 flushrefresh_VERIFICATION_CHECKPOINT2 \
     flushrefresh_VERIFICATION_DONE atomic_data accum_swmr_big.h5 ohdr_swmr.h5 \
-    test_swmr*.h5 cache_logging.h5
+    test_swmr*.h5 cache_logging.h5 vds_swmr.h5 vds_swmr_src_*.h5
 
 # Sources for testhdf5 executable
 testhdf5_SOURCES=testhdf5.c tarray.c tattr.c tchecksum.c tconfig.c tfile.c \
diff --git a/test/vds_swmr.h b/test/vds_swmr.h
new file mode 100644
index 0000000..eb51db5
--- /dev/null
+++ b/test/vds_swmr.h
@@ -0,0 +1,165 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+ * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef VDS_SWMR_H
+#define VDS_SWMR_H
+
+#include <hdf5.h>
+
+/* virtual dataset <---> source dataset mapping and sizes
+
+   *****************  --+
+   *       A       *    K
+   *****************  --+
+   *               *    |
+   *       B       *    N
+   *               *    |
+   *****************  --+
+   *       C       *
+   *****************
+   *               *
+   *       D       *
+   *               *
+   *****************
+   *       E       *
+   *****************
+   *               *
+   *       F       *
+   *               *
+   *****************
+
+   |               |
+   +-------M-------+
+
+
+        dim[0]
+       /
+      /
+     /
+    -----> dim[2]
+    |
+    |
+    |
+   dim[1]
+
+
+   NOTE: This use case also checks for varying numbers of written planes.
+         Dataset A contains the full number of planes and each successive
+         dataset contains one fewer plane, down to the last dataset, which
+         contains zero planes. Each dataset is set to have an (unlimited
+         dimension) extent equal to the number of planes written, so the
+         "empty" regions will contain the VDS fill value.
+*/
+
+
+/* All datasets are 3D */
+#define RANK                3
+
+/* Lengths of string identifiers (file, dataset names, etc.) */
+#define NAME_LEN            32
+
+/* Compression level */
+#define COMPRESSION_LEVEL   7
+
+/* Number of source files */
+#define N_SOURCES      6
+
+/* Dataset dimensions */
+#define SM_HEIGHT      2   /* K */
+#define LG_HEIGHT      4   /* N */
+#define SM_LG_HEIGHT   6   /* SM_HEIGHT + LG_HEIGHT */
+#define FULL_HEIGHT    18  /* (3 * K) + (3 * N) */
+#define HALF_HEIGHT    9
+#define WIDTH          8   /* M */
+#define HALF_WIDTH     4
+
+/* Max number of planes in the dataset */
+#define N_MAX_PLANES   H5S_UNLIMITED
+
+/* Number of planes each writer will write */
+#define N_PLANES_TO_WRITE   1000
+
+/* Dataset datatypes */
+#define SOURCE_DATATYPE    H5T_STD_I32LE
+#define VDS_DATATYPE       H5T_STD_I32LE
+
+/* Starting size of datasets, both source and VDS */
+static hsize_t DIMS[N_SOURCES][RANK] = {
+    {0, SM_HEIGHT, WIDTH},
+    {0, LG_HEIGHT, WIDTH},
+    {0, SM_HEIGHT, WIDTH},
+    {0, LG_HEIGHT, WIDTH},
+    {0, SM_HEIGHT, WIDTH},
+    {0, LG_HEIGHT, WIDTH}
+};
+static hsize_t VDS_DIMS[RANK] = {0, FULL_HEIGHT, WIDTH};
+
+/* Maximum size of datasets, both source and VDS.
+ * NOTE: Theoretical (i.e.: H5S_UNLIMITED), not the actual max
+ * number of planes written out by the writers before they stop.
+ * That number is specified separately.
+ */
+static hsize_t MAX_DIMS[N_SOURCES][RANK] = {
+    {N_MAX_PLANES, SM_HEIGHT, WIDTH},
+    {N_MAX_PLANES, LG_HEIGHT, WIDTH},
+    {N_MAX_PLANES, SM_HEIGHT, WIDTH},
+    {N_MAX_PLANES, LG_HEIGHT, WIDTH},
+    {N_MAX_PLANES, SM_HEIGHT, WIDTH},
+    {N_MAX_PLANES, LG_HEIGHT, WIDTH}
+};
+static hsize_t VDS_MAX_DIMS[RANK] = {N_MAX_PLANES, FULL_HEIGHT, WIDTH};
+
+/* Planes */
+static hsize_t PLANES[N_SOURCES][RANK] = {
+    {1, SM_HEIGHT, WIDTH},
+    {1, LG_HEIGHT, WIDTH},
+    {1, SM_HEIGHT, WIDTH},
+    {1, LG_HEIGHT, WIDTH},
+    {1, SM_HEIGHT, WIDTH},
+    {1, LG_HEIGHT, WIDTH}
+};
+static hsize_t VDS_PLANE[RANK] = {1, FULL_HEIGHT, WIDTH};
+
+/* File names for source datasets */
+static char FILE_NAMES[N_SOURCES][NAME_LEN] = {
+    {"vds_swmr_src_a.h5"},
+    {"vds_swmr_src_b.h5"},
+    {"vds_swmr_src_c.h5"},
+    {"vds_swmr_src_d.h5"},
+    {"vds_swmr_src_e.h5"},
+    {"vds_swmr_src_f.h5"}
+};
+
+/* VDS file name */
+static char VDS_FILE_NAME[NAME_LEN] = "vds_swmr.h5";
+
+/* Dataset names */
+static char SOURCE_DSET_NAME[NAME_LEN] = "source_dset";
+static char SOURCE_DSET_PATH[NAME_LEN] = "/source_dset";
+static char VDS_DSET_NAME[NAME_LEN]    = "vds_dset";
+
+/* Fill values */
+static int32_t FILL_VALUES[N_SOURCES] = {
+    -1,
+    -2,
+    -3,
+    -4,
+    -5,
+    -6
+};
+static int32_t VDS_FILL_VALUE = -9;
+
+#endif /* VDS_SWMR_H */
+
diff --git a/test/vds_swmr_gen.c b/test/vds_swmr_gen.c
new file mode 100644
index 0000000..d71a741
--- /dev/null
+++ b/test/vds_swmr_gen.c
@@ -0,0 +1,166 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+ * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "h5test.h"
+#include "vds_swmr.h"
+
+int
+main(int argc, char *argv[])
+{
+    hid_t src_sid       = -1;   /* source dataset's dataspace ID            */
+    hid_t src_dcplid    = -1;   /* source dataset property list ID          */
+
+    hid_t vds_sid       = -1;   /* VDS dataspace ID                         */
+    hid_t vds_dcplid    = -1;   /* VDS dataset property list ID             */
+
+    hid_t fid           = -1;   /* HDF5 file ID                             */
+    hid_t did           = -1;   /* dataset ID                               */
+
+    hsize_t start[RANK];        /* starting point for hyperslab             */
+    int map_start       = -1;   /* starting point in the VDS map            */
+
+    int i;                      /* iterator                         */
+
+
+    /* Start by creating the virtual dataset (VDS) dataspace and creation
+     * property list. The individual source datasets are then created
+     * and the VDS map (stored in the VDS property list) is updated.
+     */
+
+    /* Create VDS dcpl */
+    if((vds_dcplid = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        TEST_ERROR
+    if(H5Pset_fill_value(vds_dcplid, VDS_DATATYPE,
+                &VDS_FILL_VALUE) < 0)
+        TEST_ERROR
+
+    /* Create VDS dataspace */
+    if((vds_sid = H5Screate_simple(RANK, VDS_DIMS,
+                    VDS_MAX_DIMS)) < 0)
+        TEST_ERROR
+
+    /************************************
+     * Create source files and datasets *
+     ************************************/
+
+    start[0] = 0;
+    start[1] = 0;
+    start[2] = 0;
+    map_start = 0;
+
+    for(i = 0; i < N_SOURCES; i++) {
+
+        /* source dataset dcpl */
+        if((src_dcplid = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+            TEST_ERROR
+        if(H5Pset_chunk(src_dcplid, RANK, PLANES[i]) < 0)
+            TEST_ERROR
+        if(H5Pset_fill_value(src_dcplid, SOURCE_DATATYPE,
+                    &FILL_VALUES[i]) < 0)
+            TEST_ERROR
+
+        /* Use a mix of compressed and uncompressed datasets */
+        if(0 != i % 2)
+            if(H5Pset_deflate(src_dcplid, COMPRESSION_LEVEL) < 0)
+                TEST_ERROR
+
+        /* Create source file, dataspace, and dataset */
+        if((fid = H5Fcreate(FILE_NAMES[i], H5F_ACC_TRUNC,
+                        H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            TEST_ERROR
+        if((src_sid = H5Screate_simple(RANK, DIMS[i],
+                        MAX_DIMS[i])) < 0)
+            TEST_ERROR
+        if((did = H5Dcreate2(fid, SOURCE_DSET_NAME,
+                        SOURCE_DATATYPE, src_sid,
+                        H5P_DEFAULT, src_dcplid, H5P_DEFAULT)) < 0)
+            TEST_ERROR
+
+        /* set up hyperslabs for source and destination datasets */
+        start[1] = 0;
+        if(H5Sselect_hyperslab(src_sid, H5S_SELECT_SET, start, NULL,
+                    MAX_DIMS[i], NULL) < 0)
+            TEST_ERROR
+        start[1] = map_start;
+        if(H5Sselect_hyperslab(vds_sid, H5S_SELECT_SET, start, NULL,
+                    MAX_DIMS[i], NULL) < 0)
+            TEST_ERROR
+        map_start += PLANES[i][1];
+
+        /* Add VDS mapping */
+        if(H5Pset_virtual(vds_dcplid, vds_sid, FILE_NAMES[i],
+                    SOURCE_DSET_PATH, src_sid) < 0)
+            TEST_ERROR
+
+        /* close */
+        if(H5Sclose(src_sid) < 0)
+            TEST_ERROR
+        if(H5Pclose(src_dcplid) < 0)
+            TEST_ERROR
+        if(H5Dclose(did) < 0)
+            TEST_ERROR
+        if(H5Fclose(fid) < 0)
+            TEST_ERROR
+
+    } /* end for */
+
+
+    /*******************
+     * Create VDS file *
+     *******************/
+
+    /* file */
+    if((fid = H5Fcreate(VDS_FILE_NAME, H5F_ACC_TRUNC,
+                    H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+
+    /* dataset */
+    if((did = H5Dcreate2(fid, VDS_DSET_NAME, VDS_DATATYPE, vds_sid,
+                    H5P_DEFAULT, vds_dcplid, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+
+    /* close */
+    if(H5Pclose(vds_dcplid) < 0)
+        TEST_ERROR
+    if(H5Sclose(vds_sid) < 0)
+        TEST_ERROR
+    if(H5Dclose(did) < 0)
+        TEST_ERROR
+    if(H5Fclose(fid) < 0)
+        TEST_ERROR
+
+    return EXIT_SUCCESS;
+
+error:
+
+    H5E_BEGIN_TRY {
+        if(src_sid >= 0)
+            (void)H5Sclose(src_sid);
+        if(src_dcplid >= 0)
+            (void)H5Pclose(src_dcplid);
+        if(vds_sid >= 0)
+            (void)H5Sclose(vds_sid);
+        if(vds_dcplid >= 0)
+            (void)H5Pclose(vds_dcplid);
+        if(fid >= 0)
+            (void)H5Fclose(fid);
+        if(did >= 0)
+            (void)H5Dclose(did);
+    } H5E_END_TRY
+
+    return EXIT_FAILURE;
+
+} /* end main */
+
diff --git a/test/vds_swmr_reader.c b/test/vds_swmr_reader.c
new file mode 100644
index 0000000..133295b
--- /dev/null
+++ b/test/vds_swmr_reader.c
@@ -0,0 +1,25 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+ * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "h5test.h"
+#include "vds_swmr.h"
+
+int
+main(int argc, char *argv[])
+{
+    return EXIT_FAILURE;
+
+} /* end main */
+
diff --git a/test/vds_swmr_writer.c b/test/vds_swmr_writer.c
new file mode 100644
index 0000000..90dee62
--- /dev/null
+++ b/test/vds_swmr_writer.c
@@ -0,0 +1,137 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+ * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+
+#include "h5test.h"
+#include "vds_swmr.h"
+
+int
+main(int argc, char *argv[])
+{
+    int file_number     = -1;   /* Source file number               */
+
+    hid_t fid           = -1;   /* HDF5 file ID                     */
+    hid_t did           = -1;   /* dataset ID                       */
+    hid_t msid          = -1;   /* memory dataspace ID              */
+    hid_t fsid          = -1;   /* file dataspace ID                */
+
+    hsize_t extent[RANK];       /* dataset extents                  */
+    hsize_t start[RANK];        /* hyperslab start point            */
+
+    int *buffer         = NULL; /* data buffer                      */
+    int value           = -1;   /* value written to datasets        */
+
+    hsize_t n_elements  = 0;    /* number of elements in a plane    */
+
+    hsize_t i;                  /* iterator                         */
+    hsize_t j;                  /* iterator                         */
+
+
+    /******************************
+     * Fill a source dataset file *
+     ******************************/
+
+    /* The file number is passed on the command line.
+     * This is an integer index into the FILE_NAMES array. 
+     */
+    if(argc != 2) {
+        fprintf(stderr, "ERROR: Must pass the source file number on the command line.\n");
+        return EXIT_FAILURE;
+    }
+
+    file_number = atoi(argv[1]);
+    if(file_number < 0 || file_number >= N_SOURCES)
+        TEST_ERROR
+
+    /* Open the source file and dataset */
+    if((fid = H5Fopen(FILE_NAMES[file_number], H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if((did = H5Dopen2(fid, SOURCE_DSET_PATH, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+
+
+    /* Create a data buffer that represents a plane */
+    n_elements = PLANES[file_number][1] * PLANES[file_number][2];
+    if(NULL == (buffer = (int *)malloc(n_elements * sizeof(int))))
+        TEST_ERROR
+
+    /* Create the memory dataspace */
+    if((msid = H5Screate_simple(RANK, PLANES[file_number], NULL)) < 0)
+        TEST_ERROR
+
+    /* Write planes to the dataset */
+    for(i = 0; i < N_PLANES_TO_WRITE; i++) {
+
+        /* Set the dataset's extent. This is inefficient but that's ok here. */
+        extent[0] = i + 1;
+        extent[1] = PLANES[file_number][1];
+        extent[2] = PLANES[file_number][2];
+        if(H5Dset_extent(did, extent) < 0)
+            TEST_ERROR
+
+        /* Get the file dataspace */
+        if((fsid = H5Dget_space(did)) < 0)
+            TEST_ERROR
+
+        /* Each plane is filled with the plane number as a data value. */
+        value = (((int)i + 1) * 10) + (int)i;
+        for(j = 0; j < n_elements; j++)
+           buffer[j] = value;
+
+        /* Set up the hyperslab for writing. */
+        start[0] = i;
+        start[1] = 0;
+        start[2] = 0;
+        if(H5Sselect_hyperslab(fsid, H5S_SELECT_SET, start, NULL, PLANES[file_number], NULL) < 0)
+            TEST_ERROR
+
+        /* Write the plane to the dataset. */
+        if(H5Dwrite(did, H5T_NATIVE_INT, msid, fsid, H5P_DEFAULT, buffer) < 0)
+            TEST_ERROR
+
+    } /* end for */
+
+    if(H5Sclose(msid) < 0)
+        TEST_ERROR
+    if(H5Sclose(fsid) < 0)
+        TEST_ERROR
+    if(H5Dclose(did) < 0)
+        TEST_ERROR
+    if(H5Fclose(fid) < 0)
+        TEST_ERROR
+    free(buffer);
+
+    return EXIT_SUCCESS;
+
+error:
+
+    H5E_BEGIN_TRY {
+        if(fid >= 0)
+            (void)H5Fclose(fid);
+        if(did >= 0)
+            (void)H5Dclose(did);
+        if(msid >= 0)
+            (void)H5Sclose(msid);
+        if(fsid >= 0)
+            (void)H5Sclose(fsid);
+        if(buffer != NULL)
+            free(buffer);
+    } H5E_END_TRY
+
+    return EXIT_FAILURE;
+
+
+} /* end main */
+