diff options
Diffstat (limited to 'test/objcopy.c')
| -rw-r--r-- | test/objcopy.c | 16090 |
1 files changed, 10700 insertions, 5390 deletions
diff --git a/test/objcopy.c b/test/objcopy.c index ce0f3d3..012c81d 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -1,239 +1,263 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 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. * + * the COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Programmer: Peter X. Cao - * May 01, 2005 + * Programmer: Peter X. Cao + * May 01, 2005 * - * Purpose: Test H5Ocopy(). + * Purpose: Test H5Ocopy(). */ -#include <time.h> -#include "h5test.h" +#include "testhdf5.h" #include "H5srcdir.h" +#include "H5Iprivate.h" +#include "H5Pprivate.h" +#include "H5VLprivate.h" /* Virtual Object Layer */ + +#define H5F_FRIEND /*suppress error about including H5Fpkg */ +#define H5F_TESTING +#include "H5Fpkg.h" /* File access */ + /* * This file needs to access private information from the H5S package. * This file also needs to access the dataspace testing code. */ -#define H5S_PACKAGE +#define H5S_FRIEND /*suppress error about including H5Spkg */ #define H5S_TESTING -#include "H5Spkg.h" /* Dataspaces */ +#include "H5Spkg.h" /* Dataspaces */ /* * This file needs to access private information from the H5P package. * This file also needs to access the property list testing code. */ -#define H5P_PACKAGE +#define H5P_FRIEND /*suppress error about including H5Ppkg */ #define H5P_TESTING -#include "H5Ppkg.h" /* Property Lists */ +#include "H5Ppkg.h" /* Property Lists */ -#include "H5Dprivate.h" /* Datasets (for EFL property name) */ +/* + * This file needs to access private information from the H5D package. + * This file also needs to access the dataset testing code. + */ +#define H5D_FRIEND /*suppress error about including H5Dpkg */ +#define H5D_TESTING +#include "H5Dpkg.h" /* Datasets */ +/* + * This file needs to access private information from the H5O package. + * This file also needs to access the dataspace testing code. + */ +#define H5O_FRIEND /*suppress error about including H5Opkg */ +#define H5O_TESTING +#include "H5Opkg.h" /* Object header */ -const char *FILENAME[] = { - "objcopy_src", - "objcopy_dst", - "objcopy_ext", - "objcopy_src2", - NULL -}; +const char *FILENAME[] = {"objcopy_src", "objcopy_dst", "objcopy_ext", "objcopy_src2", + "verbound_src", "verbound_dst", NULL}; /* Configuration, really a series of bit flags. Maximum value is all three * bit flags enabled. */ -#define CONFIG_SHARE_SRC 1 -#define CONFIG_SHARE_DST 2 +#define CONFIG_SHARE_SRC 1 +#define CONFIG_SHARE_DST 2 #define CONFIG_SRC_NEW_FORMAT 4 #define CONFIG_DST_NEW_FORMAT 8 -#define CONFIG_DENSE 16 -#define MAX_CONFIGURATION 31 +#define CONFIG_DENSE 16 +#define MAX_CONFIGURATION 31 -#define FILE_EXT "objcopy_ext.dat" +#define FILE_EXT "objcopy_ext.dat" /* The fill_old.h5 is generated from gen_old_fill.c in HDF5 'test' directory * for version 1.4(after 1.4.3). To get this data file, simply compile * gen_old_fill.c with HDF5 library (before v1.5) and run it. */ -#define FILE_OLD_LAYOUT "fill_old.h5" - - -#define NAME_DATATYPE_SIMPLE "H5T_NATIVE_INT" -#define NAME_DATATYPE_SIMPLE2 "H5T_NATIVE_INT-2" -#define NAME_DATATYPE_VL "vlen of int" -#define NAME_DATATYPE_VL_VL "vlen of vlen of int" -#define NAME_DATASET_SIMPLE "dataset_simple" -#define NAME_DATASET_SIMPLE2 "dataset_simple_copy" -#define NAME_DATASET_SIMPLE3 "dataset_simple_another_copy" -#define NAME_DATASET_COMPOUND "dataset_compound" -#define NAME_DATASET_CHUNKED "dataset_chunked" -#define NAME_DATASET_CHUNKED2 "dataset_chunked2" -#define NAME_DATASET_COMPACT "dataset_compact" -#define NAME_DATASET_EXTERNAL "dataset_ext" -#define NAME_DATASET_NAMED_DTYPE "dataset_named_dtype" -#define NAME_DATASET_NAMED_DTYPE2 "dataset_named_dtype2" -#define NAME_DATASET_MULTI_OHDR "dataset_multi_ohdr" -#define NAME_DATASET_MULTI_OHDR2 "dataset_multi_ohdr2" -#define NAME_DATASET_VL "dataset_vl" -#define NAME_DATASET_VL_VL "dataset_vl_vl" -#define NAME_DATASET_CMPD_VL "dataset_cmpd_vl" -#define NAME_DATASET_SUB_SUB "/g0/g00/g000/dataset_simple" -#define NAME_GROUP_UNCOPIED "/uncopied" -#define NAME_GROUP_EMPTY "/empty" -#define NAME_GROUP_TOP "/g0" -#define NAME_GROUP_TOP2 "/g1" -#define NAME_GROUP_TOP3 "/g2" -#define NAME_GROUP_TOP4 "/g3" -#define NAME_GROUP_SUB "/g0/g00" -#define NAME_GROUP_SUB_2 "/g0/g01" -#define NAME_GROUP_SUB_SUB "/g0/g00/g000" -#define NAME_GROUP_SUB_SUB2 "g000" -#define NAME_GROUP_DATASET "/g0/dataset_simple" -#define NAME_GROUP_LINK "/g_links" -#define NAME_GROUP_LINK2 "/g_links2" -#define NAME_GROUP_LOOP "g_loop" -#define NAME_GROUP_LOOP2 "g_loop2" -#define NAME_GROUP_LOOP3 "g_loop3" -#define NAME_GROUP_REF "ref_grp" -#define NAME_LINK_DATASET "/g_links/dataset_simple" -#define NAME_LINK_HARD "/g_links/hard_link_to_dataset_simple" -#define NAME_LINK_SOFT "/g_links/soft_link_to_dataset_simple" -#define NAME_LINK_SOFT2 "/g_links2/soft_link_to_dataset_simple" -#define NAME_LINK_EXTERN "/g_links/external_link_to_dataset_simple" -#define NAME_LINK_EXTERN2 "/g_links2/external_link_to_dataset_simple" -#define NAME_LINK_SOFT_DANGLE "/g_links/soft_link_to_nowhere" -#define NAME_LINK_SOFT_DANGLE2 "/g_links2/soft_link_to_nowhere" -#define NAME_LINK_EXTERN_DANGLE "/g_links/external_link_to_nowhere" -#define NAME_LINK_EXTERN_DANGLE2 "/g_links2/external_link_to_nowhere" -#define NAME_OLD_FORMAT "/dset1" - -#define NAME_BUF_SIZE 1024 -#define ATTR_NAME_LEN 80 -#define DIM_SIZE_1 12 -#define DIM_SIZE_2 6 -#define CHUNK_SIZE_1 5 /* Not an even fraction of dimension sizes, so we test copying partial chunks */ -#define CHUNK_SIZE_2 5 -#define NUM_SUB_GROUPS 20 -#define NUM_WIDE_LOOP_GROUPS 10 -#define NUM_DATASETS 10 - -char src_obj_full_name[215]; /* the full path + name of the object to be copied */ - -unsigned num_attributes_g; /* Number of attributes created */ +#define FILE_OLD_LAYOUT "fill_old.h5" + +#define NAME_DATATYPE_SIMPLE "H5T_NATIVE_INT" +#define NAME_DATATYPE_SIMPLE2 "H5T_NATIVE_INT-2" +#define NAME_DATATYPE_VL "vlen of int" +#define NAME_DATATYPE_VL_VL "vlen of vlen of int" +#define NAME_DATASET_SIMPLE "dataset_simple" +#define NAME_DATASET_SIMPLE2 "dataset_simple_copy" +#define NAME_DATASET_SIMPLE3 "dataset_simple_another_copy" +#define NAME_DATASET_COMPOUND "dataset_compound" +#define NAME_DATASET_CHUNKED "dataset_chunked" +#define NAME_DATASET_CHUNKED_SINGLE "dataset_chunked_single" +#define NAME_DATASET_CHUNKED2 "dataset_chunked2" +#define NAME_DATASET_CHUNKED2_SINGLE "dataset_chunked2_single" +#define NAME_DATASET_CHUNKED3 "dataset_chunked3" +#define NAME_DATASET_CHUNKED3_SINGLE "dataset_chunked3_single" +#define NAME_DATASET_CHUNKED4 "dataset_chunked4" +#define NAME_DATASET_CHUNKED4_SINGLE "dataset_chunked4_single" +#define NAME_DATASET_COMPACT "dataset_compact" +#define NAME_DATASET_EXTERNAL "dataset_ext" +#define NAME_DATASET_NAMED_DTYPE "dataset_named_dtype" +#define NAME_DATASET_NAMED_DTYPE2 "dataset_named_dtype2" +#define NAME_DATASET_MULTI_OHDR "dataset_multi_ohdr" +#define NAME_DATASET_MULTI_OHDR2 "dataset_multi_ohdr2" +#define NAME_DATASET_VL "dataset_vl" +#define NAME_DATASET_VL2 "dataset_vl2" +#define NAME_DATASET_VL_VL "dataset_vl_vl" +#define NAME_DATASET_VL_VL2 "dataset_vl_vl2" +#define NAME_DATASET_CMPD_VL "dataset_cmpd_vl" +#define NAME_DATASET_SUB_SUB "/g0/g00/g000/dataset_simple" +#define NAME_GROUP_UNCOPIED "/uncopied" +#define NAME_GROUP_EMPTY "/empty" +#define NAME_GROUP_TOP "/g0" +#define NAME_GROUP_TOP2 "/g1" +#define NAME_GROUP_TOP3 "/g2" +#define NAME_GROUP_TOP4 "/g3" +#define NAME_GROUP_SUB "/g0/g00" +#define NAME_GROUP_SUB_2 "/g0/g01" +#define NAME_GROUP_SUB_SUB "/g0/g00/g000" +#define NAME_GROUP_SUB_SUB2 "g000" +#define NAME_GROUP_DATASET "/g0/dataset_simple" +#define NAME_GROUP_LINK "/g_links" +#define NAME_GROUP_LINK2 "/g_links2" +#define NAME_GROUP_LOOP "g_loop" +#define NAME_GROUP_LOOP2 "g_loop2" +#define NAME_GROUP_LOOP3 "g_loop3" +#define NAME_GROUP_REF "ref_grp" +#define NAME_LINK_DATASET "/g_links/dataset_simple" +#define NAME_LINK_HARD "/g_links/hard_link_to_dataset_simple" +#define NAME_LINK_SOFT "/g_links/soft_link_to_dataset_simple" +#define NAME_LINK_SOFT2 "/g_links2/soft_link_to_dataset_simple" +#define NAME_LINK_EXTERN "/g_links/external_link_to_dataset_simple" +#define NAME_LINK_EXTERN2 "/g_links2/external_link_to_dataset_simple" +#define NAME_LINK_SOFT_DANGLE "/g_links/soft_link_to_nowhere" +#define NAME_LINK_SOFT_DANGLE2 "/g_links2/soft_link_to_nowhere" +#define NAME_LINK_EXTERN_DANGLE "/g_links/external_link_to_nowhere" +#define NAME_LINK_EXTERN_DANGLE2 "/g_links2/external_link_to_nowhere" +#define NAME_OLD_FORMAT "/dset1" + +#define NAME_BUF_SIZE 1024 +#define ATTR_NAME_LEN 80 +#define DIM_SIZE_1 12 +#define DIM_SIZE_2 6 +#define MAX_DIM_SIZE_1 100 +#define MAX_DIM_SIZE_2 80 +#define CHUNK_SIZE_1 5 /* Not an even fraction of dimension sizes, so we test copying partial chunks */ +#define CHUNK_SIZE_2 5 +#define NUM_SUB_GROUPS 20 +#define NUM_WIDE_LOOP_GROUPS 10 +#define NUM_DATASETS 10 +#define ATTR_CMPD_STRING "ThisIsAString" + +char src_obj_full_name[215]; /* the full path + name of the object to be copied */ + +unsigned num_attributes_g; /* Number of attributes created */ /* Table containing object id and object name */ /* (Used for detecting duplicate objects when comparing groups */ static struct { - size_t nalloc; /* number of slots allocated */ - size_t nobjs; /* number of objects */ - haddr_t *obj; /* Addresses of objects seen */ + size_t nalloc; /* number of slots allocated */ + size_t nobjs; /* number of objects */ + H5O_token_t *obj; /* Tokens of objects seen */ } idtab_g; /* Local function prototypes */ -static int -compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, - const void *buf1, const void *buf2, hid_t obj_owner); -static int -compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf); -static int -compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags); +static int compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, const void *buf1, + const void *buf2, hid_t obj_owner); +static int compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf); +static int compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags); +static int compare_idx_type(hid_t fapl, hid_t did, H5D_chunk_index_t new_type, H5D_chunk_index_t old_type); + +static int test_copy_attribute_compound_vlstr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl); +static int attach_attribute_compound_vlstr(hid_t loc_id); +static int compare_attribute_compound_vlstr(hid_t loc, hid_t loc2); - /*------------------------------------------------------------------------- - * Function: addr_insert + * Function: token_insert * - * Purpose: Add an address to the table. + * Purpose: Add a token to the table. * - * Return: void + * Return: void * - * Programmer: Quincey Koziol + * Programmer: Quincey Koziol * Saturday, November 5, 2005 * *------------------------------------------------------------------------- */ static void -addr_insert(H5O_info_t *oi) +token_insert(H5O_info2_t *oi) { - size_t n; + size_t n; /* Don't add it if the link count is 1 because such an object can only * be encountered once. */ - if(oi->rc < 2) + if (oi->rc < 2) return; /* Extend the table */ - if(idtab_g.nobjs >= idtab_g.nalloc) { - idtab_g.nalloc = MAX(256, 2*idtab_g.nalloc); - idtab_g.obj = (haddr_t *)HDrealloc(idtab_g.obj, idtab_g.nalloc * sizeof(idtab_g.obj[0])); + if (idtab_g.nobjs >= idtab_g.nalloc) { + idtab_g.nalloc = MAX(256, 2 * idtab_g.nalloc); + idtab_g.obj = (H5O_token_t *)HDrealloc(idtab_g.obj, idtab_g.nalloc * sizeof(idtab_g.obj[0])); } /* end if */ /* Insert the entry */ - n = idtab_g.nobjs++; - idtab_g.obj[n] = oi->addr; -} /* end addr_insert() */ + n = idtab_g.nobjs++; + idtab_g.obj[n] = oi->token; +} /* end token_insert() */ - /*------------------------------------------------------------------------- - * Function: addr_lookup + * Function: token_lookup * - * Purpose: Check if address has already been encountered + * Purpose: Check if a token has already been encountered * - * Return: Success: TRUE/FALSE + * Return: Success: TRUE/FALSE + * Failure: (can't fail) * - * Failure: (can't fail) - * - * Programmer: Quincey Koziol + * Programmer: Quincey Koziol * Saturday, November 5, 2005 * *------------------------------------------------------------------------- */ -static hbool_t -addr_lookup(H5O_info_t *oi) +static H5_ATTR_PURE hbool_t +token_lookup(hid_t loc_id, H5O_info2_t *oi) { - size_t n; + size_t n; + int token_cmp; - if(oi->rc < 2) return FALSE; /*only one link possible*/ + if (oi->rc < 2) + return FALSE; /*only one link possible*/ - for(n = 0; n < idtab_g.nobjs; n++) - if(H5F_addr_eq(idtab_g.obj[n], oi->addr)) + for (n = 0; n < idtab_g.nobjs; n++) { + if (H5Otoken_cmp(loc_id, &idtab_g.obj[n], &oi->token, &token_cmp) < 0) + return FALSE; + if (!token_cmp) return TRUE; + } return FALSE; -} /* end addr_lookup() */ +} /* end token_lookup() */ - /*------------------------------------------------------------------------- - * Function: addr_reset + * Function: token_reset * - * Purpose: Reset the address tracking data structures + * Purpose: Reset the token tracking data structures * - * Return: void + * Return: void * - * Programmer: Quincey Koziol + * Programmer: Quincey Koziol * Saturday, November 5, 2005 * *------------------------------------------------------------------------- */ static void -addr_reset(void) +token_reset(void) { - if(idtab_g.obj) + if (idtab_g.obj) HDfree(idtab_g.obj); - idtab_g.obj = NULL; + idtab_g.obj = NULL; idtab_g.nalloc = idtab_g.nobjs = 0; -} /* end addr_reset() */ +} /* end token_reset() */ - /*------------------------------------------------------------------------- * Function: attach_ref_attr * @@ -244,57 +268,73 @@ addr_reset(void) * Programmer: Peter Cao * Friday, August 4, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t attach_ref_attr(hid_t file_id, hid_t loc_id) { - char dsetname1[] = "dataset1_pointed_by_ref_attr"; - char dsetname2[] = "dataset2_pointed_by_ref_attr"; - hid_t did1 = (-1), did2 = (-1), aid = (-1), sid = (-1), sid_ref = (-1); - hsize_t dims[2] = {2,9}; - hsize_t dims_ref[1] = {2}; + char dsetname1[] = "dataset1_pointed_by_ref_attr"; + char dsetname2[] = "dataset2_pointed_by_ref_attr"; + hid_t did1 = (-1), did2 = (-1), aid = (-1), sid = (-1), sid_ref = (-1); + hsize_t dims[2] = {2, 9}; + hsize_t dims_ref[1] = {2}; hobj_ref_t ref[2]; - int data1[2][9] = {{1,1,1,1,1,1,1,1,1},{1,1,1,1,1,1,1,1,18}}; - int data2[2][9] = {{2,2,2,2,2,2,2,2,2},{2,2,2,2,2,2,2,2,18}}; + int data1[2][9] = {{1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 1, 1, 1, 1, 1, 18}}; + int data2[2][9] = {{2, 2, 2, 2, 2, 2, 2, 2, 2}, {2, 2, 2, 2, 2, 2, 2, 2, 18}}; /* creates two simple datasets */ - if((sid = H5Screate_simple(2, dims, NULL)) < 0) TEST_ERROR - if((sid_ref = H5Screate_simple(1, dims_ref, NULL)) < 0) TEST_ERROR - if((did1 = H5Dcreate2(file_id, dsetname1, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL , H5S_ALL, H5P_DEFAULT,data1) < 0) TEST_ERROR - if((did2 = H5Dcreate2(file_id, dsetname2, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL , H5S_ALL, H5P_DEFAULT,data2) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dims, NULL)) < 0) + TEST_ERROR; + if ((sid_ref = H5Screate_simple(1, dims_ref, NULL)) < 0) + TEST_ERROR; + if ((did1 = H5Dcreate2(file_id, dsetname1, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; + if (H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1) < 0) + TEST_ERROR; + if ((did2 = H5Dcreate2(file_id, dsetname2, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; + if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data2) < 0) + TEST_ERROR; /* create an attribute with two object references */ - if(H5Rcreate(&ref[0], file_id, dsetname1, H5R_OBJECT, -1) < 0) TEST_ERROR - if(H5Rcreate(&ref[1], file_id, dsetname2, H5R_OBJECT, -1) < 0) TEST_ERROR - if((aid = H5Acreate2(loc_id, "obj_ref_attr", H5T_STD_REF_OBJ, sid_ref, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Awrite(aid, H5T_STD_REF_OBJ, ref) < 0) TEST_ERROR - - if(H5Sclose(sid) < 0) TEST_ERROR - if(H5Sclose(sid_ref) < 0) TEST_ERROR - if(H5Dclose(did1) < 0) TEST_ERROR - if(H5Dclose(did2) < 0) TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR + if (H5Rcreate(&ref[0], file_id, dsetname1, H5R_OBJECT, (hid_t)-1) < 0) + TEST_ERROR; + if (H5Rcreate(&ref[1], file_id, dsetname2, H5R_OBJECT, (hid_t)-1) < 0) + TEST_ERROR; + if ((aid = H5Acreate2(loc_id, "obj_ref_attr", H5T_STD_REF_OBJ, sid_ref, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Awrite(aid, H5T_STD_REF_OBJ, ref) < 0) + TEST_ERROR; + + if (H5Sclose(sid) < 0) + TEST_ERROR; + if (H5Sclose(sid_ref) < 0) + TEST_ERROR; + if (H5Dclose(did1) < 0) + TEST_ERROR; + if (H5Dclose(did2) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(sid); H5Sclose(sid_ref); H5Dclose(did1); H5Dclose(did2); H5Aclose(aid); - } H5E_END_TRY; + } + H5E_END_TRY; - return(-1); + return (-1); } - /*------------------------------------------------------------------------- * Function: attach_reg_ref_attr * @@ -305,73 +345,92 @@ error: * Programmer: Peter Cao * Monday, March 5, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t attach_reg_ref_attr(hid_t file_id, hid_t loc_id) { - const char dsetnamev[] = "dataset_pointed_by_reg_ref_attr"; - hid_t aid = (-1); - hid_t space_id = (-1); /* dataspace identifiers */ - hid_t spacer_id = (-1); /* dataspace identifiers */ - hid_t dsetv_id = (-1); /*dataset identifiers*/ - hsize_t dims[2] = {2,9}; - hsize_t dimsr[1] = {2}; - int rank = 2; - int rankr =1; + const char dsetnamev[] = "dataset_pointed_by_reg_ref_attr"; + hid_t aid = (-1); + hid_t space_id = (-1); /* dataspace identifiers */ + hid_t spacer_id = (-1); /* dataspace identifiers */ + hid_t dsetv_id = (-1); /*dataset identifiers*/ + hsize_t dims[2] = {2, 9}; + hsize_t dimsr[1] = {2}; + int rank = 2; + int rankr = 1; hdset_reg_ref_t ref[2]; - int data[2][9] = {{1,1,2,3,3,4,5,5,999},{1,2,2,3,4,4,5,6,999}}; - hsize_t start[2] = {0, 3}; - hsize_t count[2] = {2, 3}; - hsize_t coord[3][2] = {{0, 0}, {1, 6}, {0, 8}}; - size_t num_points = 3; + int data[2][9] = {{1, 1, 2, 3, 3, 4, 5, 5, 999}, {1, 2, 2, 3, 4, 4, 5, 6, 999}}; + hsize_t start[2] = {0, 3}; + hsize_t count[2] = {2, 3}; + hsize_t coord[3][2] = {{0, 0}, {1, 6}, {0, 8}}; + size_t num_points = 3; /* create a 2D dataset */ - if((space_id = H5Screate_simple(rank, dims, NULL)) < 0) TEST_ERROR - if((spacer_id = H5Screate_simple(rankr, dimsr, NULL)) < 0) TEST_ERROR - if((dsetv_id = H5Dcreate2(file_id, dsetnamev, H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(dsetv_id, H5T_NATIVE_INT, H5S_ALL , H5S_ALL, H5P_DEFAULT,data) < 0) TEST_ERROR + if ((space_id = H5Screate_simple(rank, dims, NULL)) < 0) + TEST_ERROR; + if ((spacer_id = H5Screate_simple(rankr, dimsr, NULL)) < 0) + TEST_ERROR; + if ((dsetv_id = H5Dcreate2(file_id, dsetnamev, H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(dsetv_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + TEST_ERROR; /* create reg_ref of block selection */ - if(H5Sselect_hyperslab(space_id,H5S_SELECT_SET,start,NULL,count,NULL) < 0) TEST_ERROR - if(H5Rcreate(&ref[0], file_id, dsetnamev, H5R_DATASET_REGION, space_id) < 0) TEST_ERROR + if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) + TEST_ERROR; + if (H5Rcreate(&ref[0], file_id, dsetnamev, H5R_DATASET_REGION, space_id) < 0) + TEST_ERROR; /* create reg_ref of point selection */ - if(H5Sselect_none(space_id) < 0) TEST_ERROR - if(H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, (const hsize_t *)coord) < 0) TEST_ERROR - if(H5Rcreate(&ref[1], file_id, dsetnamev, H5R_DATASET_REGION, space_id) < 0) TEST_ERROR + if (H5Sselect_none(space_id) < 0) + TEST_ERROR; + if (H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, (const hsize_t *)coord) < 0) + TEST_ERROR; + if (H5Rcreate(&ref[1], file_id, dsetnamev, H5R_DATASET_REGION, space_id) < 0) + TEST_ERROR; /* create reg_ref attribute */ - if((aid = H5Acreate2(loc_id, "reg_ref_attr", H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Awrite(aid, H5T_STD_REF_DSETREG, ref) < 0) TEST_ERROR + if ((aid = H5Acreate2(loc_id, "reg_ref_attr", H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; + if (H5Awrite(aid, H5T_STD_REF_DSETREG, ref) < 0) + TEST_ERROR; /* attach the reg_ref attribute to the dataset itself */ - if(H5Aclose(aid) < 0) TEST_ERROR - if((aid = H5Acreate2(dsetv_id, "reg_ref_attr", H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Awrite(aid, H5T_STD_REF_DSETREG, ref) < 0) TEST_ERROR - - if(H5Sclose(spacer_id) < 0) TEST_ERROR - if(H5Sclose(space_id) < 0) TEST_ERROR - if(H5Dclose(dsetv_id) < 0) TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR - + if (H5Aclose(aid) < 0) + TEST_ERROR; + if ((aid = H5Acreate2(dsetv_id, "reg_ref_attr", H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Awrite(aid, H5T_STD_REF_DSETREG, ref) < 0) + TEST_ERROR; + + if (H5Sclose(spacer_id) < 0) + TEST_ERROR; + if (H5Sclose(space_id) < 0) + TEST_ERROR; + if (H5Dclose(dsetv_id) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(spacer_id); H5Sclose(space_id); H5Dclose(dsetv_id); H5Aclose(aid); - } H5E_END_TRY; + } + H5E_END_TRY; - return(-1); + return (-1); } - /*------------------------------------------------------------------------- * Function: create_reg_ref_dataset * @@ -382,91 +441,121 @@ error: * Programmer: Peter Cao * Friday, August 4, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t create_reg_ref_dataset(hid_t file_id, hid_t loc_id) { - const char dsetnamev[] = "dataset_pointed_by_ref_dset"; - const char dsetnamer[] = "dataset_with_reg_ref"; - const char dsetnamer1[] = "compact_dataset_with_reg_ref"; - const char dsetnamer2[] = "compressed_dataset_with_reg_ref"; - hid_t space_id = (-1); /* dataspace identifiers */ - hid_t spacer_id = (-1); - hid_t dsetv_id = (-1); /*dataset identifiers*/ - hid_t dsetr_id = (-1); - hsize_t dims[2] = {2,9}; - hsize_t dimsr[1] = {2}; - int rank = 2; - int rankr =1; - hsize_t chunk_size=1; + const char dsetnamev[] = "dataset_pointed_by_ref_dset"; + const char dsetnamer[] = "dataset_with_reg_ref"; + const char dsetnamer1[] = "compact_dataset_with_reg_ref"; + const char dsetnamer2[] = "compressed_dataset_with_reg_ref"; + hid_t space_id = (-1); /* dataspace identifiers */ + hid_t spacer_id = (-1); + hid_t dsetv_id = (-1); /*dataset identifiers*/ + hid_t dsetr_id = (-1); + hsize_t dims[2] = {2, 9}; + hsize_t dimsr[1] = {2}; + int rank = 2; + int rankr = 1; + hsize_t chunk_size = 1; hdset_reg_ref_t ref[2]; - int data[2][9] = {{1,1,2,3,3,4,5,5,6},{1,2,2,3,4,4,5,6,6}}; - hsize_t start[2]; - hsize_t count[2]; - hsize_t coord[3][2] = {{0, 0}, {1, 6}, {0, 8}}; - size_t num_points = 3; - hid_t pid = (-1); - - if((space_id = H5Screate_simple(rank, dims, NULL)) < 0) TEST_ERROR - if((spacer_id = H5Screate_simple(rankr, dimsr, NULL)) < 0) TEST_ERROR - if((dsetv_id = H5Dcreate2(file_id, dsetnamev, H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(dsetv_id, H5T_NATIVE_INT, H5S_ALL , H5S_ALL, H5P_DEFAULT,data) < 0) TEST_ERROR - if((dsetr_id = H5Dcreate2(loc_id, dsetnamer, H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + int data[2][9] = {{1, 1, 2, 3, 3, 4, 5, 5, 6}, {1, 2, 2, 3, 4, 4, 5, 6, 6}}; + hsize_t start[2]; + hsize_t count[2]; + hsize_t coord[3][2] = {{0, 0}, {1, 6}, {0, 8}}; + size_t num_points = 3; + hid_t pid = (-1); + + if ((space_id = H5Screate_simple(rank, dims, NULL)) < 0) + TEST_ERROR; + if ((spacer_id = H5Screate_simple(rankr, dimsr, NULL)) < 0) + TEST_ERROR; + if ((dsetv_id = H5Dcreate2(file_id, dsetnamev, H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(dsetv_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + TEST_ERROR; + if ((dsetr_id = H5Dcreate2(loc_id, dsetnamer, H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; start[0] = 0; start[1] = 3; count[0] = 2; count[1] = 3; - if(H5Sselect_hyperslab(space_id,H5S_SELECT_SET,start,NULL,count,NULL) < 0) TEST_ERROR - if(H5Rcreate(&ref[0], file_id, dsetnamev, H5R_DATASET_REGION, space_id) < 0) TEST_ERROR - if(H5Sselect_none(space_id) < 0) TEST_ERROR - if(H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, (const hsize_t *)coord) < 0) TEST_ERROR - if(H5Rcreate(&ref[1], file_id, dsetnamev, H5R_DATASET_REGION, space_id) < 0) TEST_ERROR - if(H5Dwrite(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT,ref) < 0) TEST_ERROR - if(H5Dclose(dsetr_id) < 0) TEST_ERROR + if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) + TEST_ERROR; + if (H5Rcreate(&ref[0], file_id, dsetnamev, H5R_DATASET_REGION, space_id) < 0) + TEST_ERROR; + if (H5Sselect_none(space_id) < 0) + TEST_ERROR; + if (H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, (const hsize_t *)coord) < 0) + TEST_ERROR; + if (H5Rcreate(&ref[1], file_id, dsetnamev, H5R_DATASET_REGION, space_id) < 0) + TEST_ERROR; + if (H5Dwrite(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, ref) < 0) + TEST_ERROR; + if (H5Dclose(dsetr_id) < 0) + TEST_ERROR; /* create and set compact plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_layout(pid, H5D_COMPACT) < 0) TEST_ERROR - - if((dsetr_id = H5Dcreate2(loc_id, dsetnamer1, H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Pclose(pid) < 0) TEST_ERROR - if(H5Dwrite(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, ref) < 0) TEST_ERROR - if(H5Dclose(dsetr_id) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_layout(pid, H5D_COMPACT) < 0) + TEST_ERROR; + + if ((dsetr_id = H5Dcreate2(loc_id, dsetnamer1, H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Pclose(pid) < 0) + TEST_ERROR; + if (H5Dwrite(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, ref) < 0) + TEST_ERROR; + if (H5Dclose(dsetr_id) < 0) + TEST_ERROR; /* create and set comp & chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 1, &chunk_size) < 0) TEST_ERROR - if(H5Pset_deflate(pid, 9) < 0) TEST_ERROR - - if((dsetr_id = H5Dcreate2(loc_id, dsetnamer2, H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Pclose(pid) < 0) TEST_ERROR - if(H5Dwrite(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT,ref) < 0) TEST_ERROR - if(H5Dclose(dsetr_id) < 0) TEST_ERROR - - if(H5Sclose(space_id) < 0) TEST_ERROR - if(H5Sclose(spacer_id) < 0) TEST_ERROR - if(H5Dclose(dsetv_id) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 1, &chunk_size) < 0) + TEST_ERROR; + if (H5Pset_deflate(pid, 9) < 0) + TEST_ERROR; + + if ((dsetr_id = H5Dcreate2(loc_id, dsetnamer2, H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Pclose(pid) < 0) + TEST_ERROR; + if (H5Dwrite(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, ref) < 0) + TEST_ERROR; + if (H5Dclose(dsetr_id) < 0) + TEST_ERROR; + + if (H5Sclose(space_id) < 0) + TEST_ERROR; + if (H5Sclose(spacer_id) < 0) + TEST_ERROR; + if (H5Dclose(dsetv_id) < 0) + TEST_ERROR; return 0; - error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(space_id); H5Sclose(spacer_id); H5Dclose(dsetr_id); H5Dclose(dsetv_id); H5Pclose(pid); - } H5E_END_TRY; + } + H5E_END_TRY; - return(-1); + return (-1); } - /*------------------------------------------------------------------------- * Function: attach_attribute_vl * @@ -477,133 +566,130 @@ error: * Programmer: Peter Cao * Saturday, December 17, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_attach_attribute_vl(hid_t loc_id) { - hid_t aid = -1, sid = -1, tid=-1; - hvl_t buf[4]; - hsize_t dim1=4; + hid_t aid = -1, sid = -1, tid = -1; + hvl_t buf[4]; + hsize_t dim1 = 4; unsigned int i, j; - int ret_value = -1; + int ret_value = -1; - if((sid = H5Screate_simple(1, &dim1, NULL)) < 0 ) + if ((sid = H5Screate_simple(1, &dim1, NULL)) < 0) goto done; - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) goto done; - for(i = 0; i < 4; i++) { - buf[i].len = i*3+1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); - for(j = 0; j < buf[i].len; j++) + for (i = 0; i < 4; i++) { + buf[i].len = i * 3 + 1; + buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(j + 1); } /* end for */ - if((aid = H5Acreate2(loc_id, "vlen attribute", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((aid = H5Acreate2(loc_id, "vlen attribute", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto done; - if(H5Awrite(aid, tid, buf) < 0) + if (H5Awrite(aid, tid, buf) < 0) goto done; ret_value = 0; done: - if(tid >0 && sid > 0) - H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf); - if(sid > 0) + if (tid > 0 && sid > 0) { + hid_t dxpl_id = H5Pcreate(H5P_DATASET_XFER); + H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL); + H5Treclaim(tid, sid, dxpl_id, buf); + H5Pclose(dxpl_id); + } + if (sid > 0) H5Sclose(sid); - if(tid > 0) + if (tid > 0) H5Tclose(tid); - if(aid > 0) + if (aid > 0) H5Aclose(aid); return ret_value; } /* end of attach_attribute_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_attach_attributes * * Purpose: Attach NUM_ATTRIBUTES attributes to the object to be copied * - * Return: Non-negative on success/Negative on failure + * Return: Non-negative on success/Negative on failure * * Programmer: Peter Cao * Friday, September 30, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_attach_attributes(hid_t loc_id, hid_t type_id) { - hid_t aid = -1, sid = -1; - char attr_name[ATTR_NAME_LEN]; - int attr_data[2]; - hsize_t dim1 = 2; - hid_t acpl = -1; - unsigned u; - int ret_value = -1; - - if((sid = H5Screate_simple(1, &dim1, NULL)) < 0 ) + hid_t aid = -1, sid = -1; + char attr_name[ATTR_NAME_LEN]; + int attr_data[2]; + hsize_t dim1 = 2; + hid_t acpl = -1; + unsigned u; + int ret_value = -1; + + if ((sid = H5Screate_simple(1, &dim1, NULL)) < 0) goto done; /* Create attribute creation plist */ - if((acpl = H5Pcreate(H5P_ATTRIBUTE_CREATE)) < 0) + if ((acpl = H5Pcreate(H5P_ATTRIBUTE_CREATE)) < 0) goto done; - for(u = 0; u < num_attributes_g; u++) { - sprintf(attr_name, "%u attr", u); + for (u = 0; u < num_attributes_g; u++) { + HDsnprintf(attr_name, sizeof(attr_name), "%u attr", u); /* Set attribute data */ attr_data[0] = (int)(100 * u); attr_data[1] = (int)(200 * u); /* Set attribute character set (alternate) */ - if(u % 2) { - if(H5Pset_char_encoding(acpl, H5T_CSET_ASCII) < 0) + if (u % 2) { + if (H5Pset_char_encoding(acpl, H5T_CSET_ASCII) < 0) goto done; } /* end if */ - else - if(H5Pset_char_encoding(acpl, H5T_CSET_UTF8) < 0) - goto done; + else if (H5Pset_char_encoding(acpl, H5T_CSET_UTF8) < 0) + goto done; - if((aid = H5Acreate2(loc_id, attr_name, type_id, sid, acpl, H5P_DEFAULT)) < 0) + if ((aid = H5Acreate2(loc_id, attr_name, type_id, sid, acpl, H5P_DEFAULT)) < 0) goto done; - if(H5Awrite(aid, H5T_NATIVE_INT, attr_data) < 0) + if (H5Awrite(aid, H5T_NATIVE_INT, attr_data) < 0) goto done; - if(aid > 0) + if (aid > 0) H5Aclose(aid); - aid = -1; + aid = -1; } ret_value = 0; done: - if(sid > 0) + if (sid > 0) H5Sclose(sid); - if(aid > 0) + if (aid > 0) H5Aclose(aid); - if(acpl > 0) + if (acpl > 0) H5Pclose(acpl); return ret_value; } - /*------------------------------------------------------------------------- * Function: test_copy_attach_paired_attributes * * Purpose: Attach NUM_ATTRIBUTES attributes to a pair of objects to be copied * - * Return: Non-negative on success/Negative on failure + * Return: Non-negative on success/Negative on failure * * Programmer: Quincey Koziol * Tuesday, November 1, 2005 @@ -613,60 +699,70 @@ done: static int test_copy_attach_paired_attributes(hid_t loc_id, hid_t loc_id2, hid_t type_id) { - hid_t aid = -1, sid = -1; - char attr_name[ATTR_NAME_LEN]; - int attr_data[2]; - hid_t acpl = -1; - unsigned u; - hsize_t dim1 = 2; - - if((sid = H5Screate_simple(1, &dim1, NULL)) < 0 ) goto done; + hid_t aid = -1, sid = -1; + char attr_name[ATTR_NAME_LEN]; + int attr_data[2]; + hid_t acpl = -1; + unsigned u; + hsize_t dim1 = 2; + + if ((sid = H5Screate_simple(1, &dim1, NULL)) < 0) + goto done; /* Create attribute creation plist */ - if((acpl = H5Pcreate(H5P_ATTRIBUTE_CREATE)) < 0) goto done; + if ((acpl = H5Pcreate(H5P_ATTRIBUTE_CREATE)) < 0) + goto done; - for(u = 0; u < num_attributes_g; u++) { - sprintf(attr_name, "%u attr", u); + for (u = 0; u < num_attributes_g; u++) { + HDsnprintf(attr_name, sizeof(attr_name), "%u attr", u); /* Set attribute data */ attr_data[0] = (int)(100 * u); attr_data[1] = (int)(200 * u); /* Set attribute character set (alternate) */ - if(u % 2) { - if(H5Pset_char_encoding(acpl, H5T_CSET_ASCII) < 0) goto done; + if (u % 2) { + if (H5Pset_char_encoding(acpl, H5T_CSET_ASCII) < 0) + goto done; } /* end if */ - else - if(H5Pset_char_encoding(acpl, H5T_CSET_UTF8) < 0) goto done; + else if (H5Pset_char_encoding(acpl, H5T_CSET_UTF8) < 0) + goto done; /* Add attribute to first object */ - if((aid = H5Acreate2(loc_id, attr_name, type_id, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto done; - if(H5Awrite(aid, H5T_NATIVE_INT, attr_data) < 0) goto done; - if(H5Aclose(aid) < 0) goto done; + if ((aid = H5Acreate2(loc_id, attr_name, type_id, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + goto done; + if (H5Awrite(aid, H5T_NATIVE_INT, attr_data) < 0) + goto done; + if (H5Aclose(aid) < 0) + goto done; /* Add attribute to second object */ - if((aid = H5Acreate2(loc_id2, attr_name, type_id, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto done; - if(H5Awrite(aid, H5T_NATIVE_INT, attr_data) < 0) goto done; - if(H5Aclose(aid) < 0) goto done; + if ((aid = H5Acreate2(loc_id2, attr_name, type_id, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + goto done; + if (H5Awrite(aid, H5T_NATIVE_INT, attr_data) < 0) + goto done; + if (H5Aclose(aid) < 0) + goto done; } - if(H5Sclose(sid) < 0) goto done; - if(H5Pclose(acpl) < 0) goto done; + if (H5Sclose(sid) < 0) + goto done; + if (H5Pclose(acpl) < 0) + goto done; return 0; done: - if(sid > 0) + if (sid > 0) H5Sclose(sid); - if(aid > 0) + if (aid > 0) H5Aclose(aid); - if(acpl > 0) + if (acpl > 0) H5Pclose(acpl); return -1; } /* end test_copy_attach_paired_attributes() */ - /*------------------------------------------------------------------------- * Function: compare_attribute * @@ -682,86 +778,110 @@ done: static int compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_owner) { - hid_t sid = -1, sid2 = -1; /* Dataspace IDs */ - hid_t tid = -1, tid2 = -1; /* Datatype IDs */ - size_t elmt_size; /* Size of datatype */ - htri_t is_committed; /* If the datatype is committed */ - htri_t is_committed2; /* If the datatype is committed */ - H5A_info_t ainfo; /* Attribute info */ - H5A_info_t ainfo2; /* Attribute info */ - hssize_t nelmts; /* # of elements in dataspace */ - void *rbuf = NULL; /* Buffer for reading raw data */ - void *rbuf2 = NULL; /* Buffer for reading raw data */ + hid_t sid = -1, sid2 = -1; /* Dataspace IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype IDs */ + size_t elmt_size; /* Size of datatype */ + htri_t is_committed; /* If the datatype is committed */ + htri_t is_committed2; /* If the datatype is committed */ + H5A_info_t ainfo; /* Attribute info */ + H5A_info_t ainfo2; /* Attribute info */ + hssize_t nelmts; /* # of elements in dataspace */ + void *rbuf = NULL; /* Buffer for reading raw data */ + void *rbuf2 = NULL; /* Buffer for reading raw data */ /* Check the character sets are equal */ - if(H5Aget_info(aid, &ainfo) < 0) TEST_ERROR - if(H5Aget_info(aid2, &ainfo2) < 0) TEST_ERROR - if(ainfo.cset != ainfo2.cset) TEST_ERROR + if (H5Aget_info(aid, &ainfo) < 0) + TEST_ERROR; + if (H5Aget_info(aid2, &ainfo2) < 0) + TEST_ERROR; + if (ainfo.cset != ainfo2.cset) + TEST_ERROR; /* Check the creation orders are equal (if appropriate) */ - if(ainfo.corder_valid != ainfo2.corder_valid) TEST_ERROR - if(ainfo.corder_valid) - if(ainfo.corder != ainfo2.corder) TEST_ERROR + if (ainfo.corder_valid != ainfo2.corder_valid) + TEST_ERROR; + if (ainfo.corder_valid) + if (ainfo.corder != ainfo2.corder) + TEST_ERROR; /* Check the datatypes are equal */ /* Open the datatype for the source attribute */ - if((tid = H5Aget_type(aid)) < 0) TEST_ERROR + if ((tid = H5Aget_type(aid)) < 0) + TEST_ERROR; /* Open the datatype for the destination attribute */ - if((tid2 = H5Aget_type(aid2)) < 0) TEST_ERROR + if ((tid2 = H5Aget_type(aid2)) < 0) + TEST_ERROR; /* Check that both datatypes are committed/not committed */ - if((is_committed = H5Tcommitted(tid)) < 0) TEST_ERROR - if((is_committed2 = H5Tcommitted(tid2)) < 0) TEST_ERROR - if(is_committed != is_committed2) TEST_ERROR + if ((is_committed = H5Tcommitted(tid)) < 0) + TEST_ERROR; + if ((is_committed2 = H5Tcommitted(tid2)) < 0) + TEST_ERROR; + if (is_committed != is_committed2) + TEST_ERROR; /* Compare the datatypes */ - if(H5Tequal(tid, tid2) != TRUE) TEST_ERROR + if (H5Tequal(tid, tid2) != TRUE) + TEST_ERROR; /* Determine the size of datatype (for later) */ - if((elmt_size = H5Tget_size(tid)) == 0) TEST_ERROR + if ((elmt_size = H5Tget_size(tid)) == 0) + TEST_ERROR; /* Check the dataspaces are equal */ /* Open the dataspace for the source attribute */ - if((sid = H5Aget_space(aid)) < 0) TEST_ERROR + if ((sid = H5Aget_space(aid)) < 0) + TEST_ERROR; /* Open the dataspace for the destination attribute */ - if((sid2 = H5Aget_space(aid2)) < 0) TEST_ERROR + if ((sid2 = H5Aget_space(aid2)) < 0) + TEST_ERROR; /* Compare the dataspaces */ - if(H5Sextent_equal(sid, sid2) != TRUE) TEST_ERROR + if (H5Sextent_equal(sid, sid2) != TRUE) + TEST_ERROR; /* Determine the number of elements in dataspace (for later) */ - if((nelmts = H5Sget_simple_extent_npoints(sid2)) < 0) TEST_ERROR + if ((nelmts = H5Sget_simple_extent_npoints(sid2)) < 0) + TEST_ERROR; /* Check the raw data is equal */ /* Allocate & initialize space for the raw data buffers */ - if((rbuf = HDcalloc( elmt_size, (size_t)nelmts)) == NULL) TEST_ERROR - if((rbuf2 = HDcalloc( elmt_size, (size_t)nelmts)) == NULL) TEST_ERROR + if ((rbuf = HDcalloc(elmt_size, (size_t)nelmts)) == NULL) + TEST_ERROR; + if ((rbuf2 = HDcalloc(elmt_size, (size_t)nelmts)) == NULL) + TEST_ERROR; /* Read data from the source attribute */ - if(H5Aread(aid, tid, rbuf) < 0) TEST_ERROR + if (H5Aread(aid, tid, rbuf) < 0) + TEST_ERROR; /* Read data from the destination attribute */ - if(H5Aread(aid2, tid2, rbuf2) < 0) TEST_ERROR + if (H5Aread(aid2, tid2, rbuf2) < 0) + TEST_ERROR; /* Check raw data read in against data written out */ - if(wbuf) { - if(!compare_data(aid, 0, pid, tid, (size_t)nelmts, wbuf, rbuf, obj_owner)) TEST_ERROR - if(!compare_data(aid2, 0, pid, tid2, (size_t)nelmts, wbuf, rbuf2, obj_owner)) TEST_ERROR + if (wbuf) { + if (!compare_data(aid, (hid_t)0, pid, tid, (size_t)nelmts, wbuf, rbuf, obj_owner)) + TEST_ERROR; + if (!compare_data(aid2, (hid_t)0, pid, tid2, (size_t)nelmts, wbuf, rbuf2, obj_owner)) + TEST_ERROR; } /* end if */ /* Don't have written data, just compare data between the two attributes */ - else - if(!compare_data(aid, aid2, pid, tid, (size_t)nelmts, rbuf, rbuf2, obj_owner)) TEST_ERROR + else if (!compare_data(aid, aid2, pid, tid, (size_t)nelmts, rbuf, rbuf2, obj_owner)) + TEST_ERROR; /* Reclaim vlen data, if necessary */ - if(H5Tdetect_class(tid, H5T_VLEN) == TRUE) - if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, rbuf) < 0) TEST_ERROR - if(H5Tdetect_class(tid2, H5T_VLEN) == TRUE) - if(H5Dvlen_reclaim(tid2, sid2, H5P_DEFAULT, rbuf2) < 0) TEST_ERROR + if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) + if (H5Treclaim(tid, sid, H5P_DEFAULT, rbuf) < 0) + TEST_ERROR; + if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE) + if (H5Treclaim(tid2, sid2, H5P_DEFAULT, rbuf2) < 0) + TEST_ERROR; /* Release raw data buffers */ HDfree(rbuf); @@ -770,118 +890,132 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ rbuf2 = NULL; /* close the source dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the destination dataspace */ - if(H5Sclose(sid2) < 0) TEST_ERROR + if (H5Sclose(sid2) < 0) + TEST_ERROR; /* close the source datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the destination datatype */ - if(H5Tclose(tid2) < 0) TEST_ERROR + if (H5Tclose(tid2) < 0) + TEST_ERROR; return TRUE; error: - if(rbuf) + if (rbuf) HDfree(rbuf); - if(rbuf2) + if (rbuf2) HDfree(rbuf2); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(sid2); H5Sclose(sid); H5Tclose(tid2); H5Tclose(tid); - } H5E_END_TRY; + } + H5E_END_TRY; return FALSE; } /* end compare_attribute() */ - /*------------------------------------------------------------------------- * Function: compare_std_attributes * * Purpose: Compare "standard" attributes on two objects to check that they are equal * - * Return: TRUE if objects have same attributes/FALSE if they are different + * Return: TRUE if objects have same attributes/FALSE if they are different * * Programmer: Quincey Koziol * Monday, October 31, 2005 * - * Note: This isn't very general, the attributes are assumed to be + * Note: This isn't very general, the attributes are assumed to be * those written in test_copy_attach_attributes(). * - * Modifier: Peter Cao - * Wednesday, March 21, 2007 - * Change to compare any attributes of two objects - * *------------------------------------------------------------------------- */ static int compare_std_attributes(hid_t oid, hid_t oid2, hid_t pid) { - hid_t aid = -1, aid2 = -1; /* Attribute IDs */ - H5O_info_t oinfo1, oinfo2; /* Object info */ - unsigned cpy_flags; /* Object copy flags */ + hid_t aid = -1, aid2 = -1; /* Attribute IDs */ + H5O_info2_t oinfo1, oinfo2; /* Object info */ + unsigned cpy_flags; /* Object copy flags */ /* Retrieve the object copy flags from the property list, if it's non-DEFAULT */ - if(pid != H5P_DEFAULT) { - if(H5Pget_copy_object(pid, &cpy_flags) < 0) TEST_ERROR + if (pid != H5P_DEFAULT) { + if (H5Pget_copy_object(pid, &cpy_flags) < 0) + TEST_ERROR; } /* end if */ else cpy_flags = 0; /* Check the number of attributes on source dataset */ - if(H5Oget_info(oid, &oinfo1) < 0) TEST_ERROR + if (H5Oget_info3(oid, &oinfo1, H5O_INFO_NUM_ATTRS) < 0) + TEST_ERROR; /* Check the number of attributes on destination dataset */ - if(H5Oget_info(oid2, &oinfo2) < 0) TEST_ERROR + if (H5Oget_info3(oid2, &oinfo2, H5O_INFO_NUM_ATTRS) < 0) + TEST_ERROR; - if(cpy_flags & H5O_COPY_WITHOUT_ATTR_FLAG) { + if (cpy_flags & H5O_COPY_WITHOUT_ATTR_FLAG) { /* Check that the destination has no attributes */ - if(oinfo2.num_attrs != 0) TEST_ERROR + if (oinfo2.num_attrs != 0) + TEST_ERROR; } /* end if */ else { - char attr_name[ATTR_NAME_LEN]; /* Attribute name */ - unsigned i; /* Local index variable */ + char attr_name[ATTR_NAME_LEN]; /* Attribute name */ + unsigned i; /* Local index variable */ /* Compare the number of attributes */ - if(oinfo1.num_attrs != oinfo2.num_attrs) TEST_ERROR + if (oinfo1.num_attrs != oinfo2.num_attrs) + TEST_ERROR; /* Check the attributes are equal */ - for(i = 0; i < (unsigned)oinfo1.num_attrs; i++) { - if((aid = H5Aopen_by_idx(oid, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)i, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Aget_name(aid, (size_t)ATTR_NAME_LEN, attr_name) < 0) TEST_ERROR + for (i = 0; i < (unsigned)oinfo1.num_attrs; i++) { + if ((aid = H5Aopen_by_idx(oid, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)i, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Aget_name(aid, (size_t)ATTR_NAME_LEN, attr_name) < 0) + TEST_ERROR; - if((aid2 = H5Aopen(oid2, attr_name, H5P_DEFAULT)) < 0) TEST_ERROR + if ((aid2 = H5Aopen(oid2, attr_name, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check the attributes are equal */ - if(!compare_attribute(aid, aid2, pid, NULL, oid)) TEST_ERROR + if (!compare_attribute(aid, aid2, pid, NULL, oid)) + TEST_ERROR; /* Close the attributes */ - if(H5Aclose(aid) < 0) TEST_ERROR - if(H5Aclose(aid2) < 0) TEST_ERROR + if (H5Aclose(aid) < 0) + TEST_ERROR; + if (H5Aclose(aid2) < 0) + TEST_ERROR; } /* end for */ - } /* end if */ + } /* end if */ /* Objects should be the same. :-) */ return TRUE; error: - H5E_BEGIN_TRY { - H5Aclose(aid2); - H5Aclose(aid); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Aclose(aid2); + H5Aclose(aid); + } + H5E_END_TRY; return FALSE; } /* end compare_std_attributes() */ - /*------------------------------------------------------------------------- * Function: compare_data * * Purpose: Compare two buffers of data to check that they are equal * - * Return: TRUE if buffer are equal/FALSE if they are different + * Return: TRUE if buffer are equal/FALSE if they are different * * Programmer: Quincey Koziol * Monday, November 21, 2005 @@ -889,251 +1023,309 @@ error: *------------------------------------------------------------------------- */ static int -compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, - const void *buf1, const void *buf2, hid_t obj_owner) +compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, const void *buf1, + const void *buf2, hid_t obj_owner) { - size_t elmt_size; /* Size of an element */ + size_t elmt_size; /* Size of an element */ /* Check size of each element */ - if((elmt_size = H5Tget_size(tid)) == 0) TEST_ERROR + if ((elmt_size = H5Tget_size(tid)) == 0) + TEST_ERROR; /* If the type is a compound containing a vlen, loop over all elements for * each compound member. Compounds containing reference are not supported * yet. */ - if((H5Tget_class(tid) == H5T_COMPOUND) - && (H5Tdetect_class(tid, H5T_VLEN) == TRUE)) { - hid_t memb_id; /* Member id */ - const uint8_t *memb1; /* Pointer to current member */ - const uint8_t *memb2; /* Pointer to current member */ - int nmembs; /* Number of members */ - size_t memb_off; /* Member offset */ - size_t memb_size; /* Member size */ - unsigned memb_idx; /* Member index */ - size_t elmt; /* Current element */ + if ((H5Tget_class(tid) == H5T_COMPOUND) && (H5Tdetect_class(tid, H5T_VLEN) == TRUE)) { + hid_t memb_id; /* Member id */ + const uint8_t *memb1; /* Pointer to current member */ + const uint8_t *memb2; /* Pointer to current member */ + int nmembs; /* Number of members */ + size_t memb_off; /* Member offset */ + size_t memb_size; /* Member size */ + unsigned memb_idx; /* Member index */ + size_t elmt; /* Current element */ /* Get number of members in compound */ - if((nmembs = H5Tget_nmembers(tid)) < 0) TEST_ERROR + if ((nmembs = H5Tget_nmembers(tid)) < 0) + TEST_ERROR; /* Loop over members */ - for(memb_idx=0; memb_idx<(unsigned)nmembs; memb_idx++) { + for (memb_idx = 0; memb_idx < (unsigned)nmembs; memb_idx++) { /* Get member offset. Note that we cannot check for an error here. */ memb_off = H5Tget_member_offset(tid, memb_idx); /* Get member id */ - if((memb_id = H5Tget_member_type(tid, memb_idx)) < 0) TEST_ERROR + if ((memb_id = H5Tget_member_type(tid, memb_idx)) < 0) + TEST_ERROR; /* Get member size */ - if((memb_size = H5Tget_size(memb_id)) == 0) TEST_ERROR + if ((memb_size = H5Tget_size(memb_id)) == 0) + TEST_ERROR; /* Set up pointers to member in the first element */ memb1 = (const uint8_t *)buf1 + memb_off; memb2 = (const uint8_t *)buf2 + memb_off; /* Check if this member contains (or is) a vlen */ - if(H5Tget_class(memb_id) == H5T_VLEN) { - hid_t base_id; /* vlen base type id */ + if (H5Tget_class(memb_id) == H5T_VLEN) { + hid_t base_id; /* vlen base type id */ /* Get base type of vlen datatype */ - if((base_id = H5Tget_super(memb_id)) < 0) TEST_ERROR + if ((base_id = H5Tget_super(memb_id)) < 0) + TEST_ERROR; /* Iterate over all elements, recursively calling this function * for each */ - for(elmt=0; elmt<nelmts; elmt++) { + for (elmt = 0; elmt < nelmts; elmt++) { /* Check vlen lengths */ - if(((const hvl_t *)memb1)->len - != ((const hvl_t *)memb2)->len) - TEST_ERROR + if (((const hvl_t *)((const void *)memb1))->len != + ((const hvl_t *)((const void *)memb2))->len) + TEST_ERROR; /* Check vlen data */ - if(!compare_data(parent1, parent2, pid, base_id, - ((const hvl_t *)memb1)->len, - ((const hvl_t *)memb1)->p, - ((const hvl_t *)memb2)->p, obj_owner)) - TEST_ERROR + if (!compare_data(parent1, parent2, pid, base_id, + ((const hvl_t *)((const void *)memb1))->len, + ((const hvl_t *)((const void *)memb1))->p, + ((const hvl_t *)((const void *)memb2))->p, obj_owner)) + TEST_ERROR; /* Update member pointers */ memb1 += elmt_size; memb2 += elmt_size; } /* end for */ - } else { + } + else { /* vlens cannot currently be nested below the top layer of a * compound */ HDassert(H5Tdetect_class(memb_id, H5T_VLEN) == FALSE); /* Iterate over all elements, calling memcmp() for each */ - for(elmt=0; elmt<nelmts; elmt++) { - if(HDmemcmp(memb1, memb2, memb_size)) - TEST_ERROR + for (elmt = 0; elmt < nelmts; elmt++) { + if (HDmemcmp(memb1, memb2, memb_size) != 0) + TEST_ERROR; /* Update member pointers */ memb1 += elmt_size; memb2 += elmt_size; } /* end for */ - } /* end else */ - } /* end for */ - } else if(H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + } /* end else */ + } /* end for */ + } + else if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { const hvl_t *vl_buf1, *vl_buf2; /* Aliases for buffers to compare */ - hid_t base_tid; /* Base type of vlen datatype */ - size_t u; /* Local index variable */ + hid_t base_tid; /* Base type of vlen datatype */ + size_t u; /* Local index variable */ /* Check for "simple" vlen datatype */ - if(H5Tget_class(tid) != H5T_VLEN) TEST_ERROR + if (H5Tget_class(tid) != H5T_VLEN) + TEST_ERROR; /* Get base type of vlen datatype */ - if((base_tid = H5Tget_super(tid)) < 0) TEST_ERROR + if ((base_tid = H5Tget_super(tid)) < 0) + TEST_ERROR; /* Loop over elements in buffers */ vl_buf1 = (const hvl_t *)buf1; vl_buf2 = (const hvl_t *)buf2; - for(u = 0; u < nelmts; u++, vl_buf1++, vl_buf2++) { + for (u = 0; u < nelmts; u++, vl_buf1++, vl_buf2++) { /* Check vlen lengths */ - if(vl_buf1->len != vl_buf2->len) TEST_ERROR + if (vl_buf1->len != vl_buf2->len) + TEST_ERROR; /* Check vlen data */ - if(!compare_data(parent1, parent2, pid, base_tid, vl_buf1->len, vl_buf1->p, vl_buf2->p, obj_owner)) TEST_ERROR + if (!compare_data(parent1, parent2, pid, base_tid, vl_buf1->len, vl_buf1->p, vl_buf2->p, + obj_owner)) + TEST_ERROR; } /* end for */ - if(H5Tclose(base_tid) < 0) TEST_ERROR + if (H5Tclose(base_tid) < 0) + TEST_ERROR; } /* end if */ - else if(H5Tdetect_class(tid, H5T_REFERENCE) == TRUE) { - size_t u; /* Local index variable */ + else if (H5Tdetect_class(tid, H5T_REFERENCE) == TRUE) { + size_t u; /* Local index variable */ /* Check for "simple" reference datatype */ - if(H5Tget_class(tid) != H5T_REFERENCE) TEST_ERROR + if (H5Tget_class(tid) != H5T_REFERENCE) + TEST_ERROR; /* Check for object or region reference */ - if(H5Tequal(tid, H5T_STD_REF_OBJ) > 0) { - const hobj_ref_t *ref_buf1, *ref_buf2; /* Aliases for buffers to compare */ + if (H5Tequal(tid, H5T_STD_REF_OBJ) > 0) { + const hobj_ref_t *ref_buf1, *ref_buf2; /* Aliases for buffers to compare */ /* Loop over elements in buffers */ ref_buf1 = (const hobj_ref_t *)buf1; ref_buf2 = (const hobj_ref_t *)buf2; - for(u = 0; u < nelmts; u++, ref_buf1++, ref_buf2++) { - hid_t obj1_id, obj2_id; /* IDs for objects referenced */ + for (u = 0; u < nelmts; u++, ref_buf1++, ref_buf2++) { + hid_t obj1_id, obj2_id; /* IDs for objects referenced */ H5O_type_t obj1_type, obj2_type; /* Types of objects referenced */ /* Check for types of objects handled */ - if(H5Rget_obj_type2(parent1, H5R_OBJECT, ref_buf1, &obj1_type) < 0) TEST_ERROR - if(H5Rget_obj_type2(parent2, H5R_OBJECT, ref_buf2, &obj2_type) < 0) TEST_ERROR - if(obj1_type != obj2_type) TEST_ERROR + if (H5Rget_obj_type2(parent1, H5R_OBJECT, ref_buf1, &obj1_type) < 0) + TEST_ERROR; + if (H5Rget_obj_type2(parent2, H5R_OBJECT, ref_buf2, &obj2_type) < 0) + TEST_ERROR; + if (obj1_type != obj2_type) + TEST_ERROR; /* Open referenced objects */ - if((obj1_id = H5Rdereference2(parent1, H5P_DEFAULT, H5R_OBJECT, ref_buf1)) < 0) TEST_ERROR - if((obj2_id = H5Rdereference2(parent2, H5P_DEFAULT, H5R_OBJECT, ref_buf2)) < 0) TEST_ERROR + if ((obj1_id = H5Rdereference2(parent1, H5P_DEFAULT, H5R_OBJECT, ref_buf1)) < 0) + TEST_ERROR; + if ((obj2_id = H5Rdereference2(parent2, H5P_DEFAULT, H5R_OBJECT, ref_buf2)) < 0) + TEST_ERROR; /* break the infinite loop when the ref_object points to itself */ - if(obj_owner > 0) { - H5O_info_t oinfo1, oinfo2; - - if(H5Oget_info(obj_owner, &oinfo1) < 0) TEST_ERROR - if(H5Oget_info(obj1_id, &oinfo2) < 0) TEST_ERROR - if(H5F_addr_eq(oinfo1.addr, oinfo2.addr)) { - if(H5Oclose(obj1_id) < 0) TEST_ERROR - if(H5Oclose(obj2_id) < 0) TEST_ERROR + if (obj_owner > 0) { + H5O_info2_t oinfo1, oinfo2; + int token_cmp; + + if (H5Oget_info3(obj_owner, &oinfo1, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Oget_info3(obj1_id, &oinfo2, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(obj1_id, &oinfo1.token, &oinfo2.token, &token_cmp) < 0) + TEST_ERROR; + if (!token_cmp) { + if (H5Oclose(obj1_id) < 0) + TEST_ERROR; + if (H5Oclose(obj2_id) < 0) + TEST_ERROR; return TRUE; } } /* Check for types of objects handled */ - switch(obj1_type) { + switch (obj1_type) { case H5O_TYPE_DATASET: - if(compare_datasets(obj1_id, obj2_id, pid, NULL) != TRUE) TEST_ERROR + if (compare_datasets(obj1_id, obj2_id, pid, NULL) != TRUE) + TEST_ERROR; break; case H5O_TYPE_GROUP: - if(compare_groups(obj1_id, obj2_id, pid, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(obj1_id, obj2_id, pid, -1, 0) != TRUE) + TEST_ERROR; break; case H5O_TYPE_NAMED_DATATYPE: - if(H5Tequal(obj1_id, obj2_id) != TRUE) TEST_ERROR + if (H5Tequal(obj1_id, obj2_id) != TRUE) + TEST_ERROR; break; + case H5O_TYPE_MAP: + /* Maps not supported in native VOL connector */ + case H5O_TYPE_UNKNOWN: case H5O_TYPE_NTYPES: default: - TEST_ERROR + TEST_ERROR; } /* end switch */ /* Close objects */ - if(H5Oclose(obj1_id) < 0) TEST_ERROR - if(H5Oclose(obj2_id) < 0) TEST_ERROR + if (H5Oclose(obj1_id) < 0) + TEST_ERROR; + if (H5Oclose(obj2_id) < 0) + TEST_ERROR; } /* end for */ - } /* end if */ - else if(H5Tequal(tid, H5T_STD_REF_DSETREG) > 0) { - const hdset_reg_ref_t *ref_buf1, *ref_buf2; /* Aliases for buffers to compare */ + } /* end if */ + else if (H5Tequal(tid, H5T_STD_REF_DSETREG) > 0) { + const hdset_reg_ref_t *ref_buf1, *ref_buf2; /* Aliases for buffers to compare */ /* Loop over elements in buffers */ ref_buf1 = (const hdset_reg_ref_t *)buf1; ref_buf2 = (const hdset_reg_ref_t *)buf2; - for(u = 0; u < nelmts; u++, ref_buf1++, ref_buf2++) { - hid_t obj1_id, obj2_id; /* IDs for objects referenced */ - hid_t obj1_sid, obj2_sid; /* Dataspace IDs for objects referenced */ + for (u = 0; u < nelmts; u++, ref_buf1++, ref_buf2++) { + hid_t obj1_id, obj2_id; /* IDs for objects referenced */ + hid_t obj1_sid, obj2_sid; /* Dataspace IDs for objects referenced */ H5O_type_t obj1_type, obj2_type; /* Types of objects referenced */ /* Check for types of objects handled */ - if(H5Rget_obj_type2(parent1, H5R_DATASET_REGION, ref_buf1, &obj1_type) < 0) TEST_ERROR - if(H5Rget_obj_type2(parent2, H5R_DATASET_REGION, ref_buf2, &obj2_type) < 0) TEST_ERROR - if(obj1_type != obj2_type) TEST_ERROR + if (H5Rget_obj_type2(parent1, H5R_DATASET_REGION, ref_buf1, &obj1_type) < 0) + TEST_ERROR; + if (H5Rget_obj_type2(parent2, H5R_DATASET_REGION, ref_buf2, &obj2_type) < 0) + TEST_ERROR; + if (obj1_type != obj2_type) + TEST_ERROR; /* Open referenced objects */ - if((obj1_id = H5Rdereference2(parent1, H5P_DEFAULT, H5R_DATASET_REGION, ref_buf1)) < 0) TEST_ERROR - if((obj2_id = H5Rdereference2(parent2, H5P_DEFAULT, H5R_DATASET_REGION, ref_buf2)) < 0) TEST_ERROR + if ((obj1_id = H5Rdereference2(parent1, H5P_DEFAULT, H5R_DATASET_REGION, ref_buf1)) < 0) + TEST_ERROR; + if ((obj2_id = H5Rdereference2(parent2, H5P_DEFAULT, H5R_DATASET_REGION, ref_buf2)) < 0) + TEST_ERROR; /* break the infinite loop when the ref_object points to itself */ - if(obj_owner > 0) { - H5O_info_t oinfo1, oinfo2; - - if(H5Oget_info(obj_owner, &oinfo1) < 0) TEST_ERROR - if(H5Oget_info(obj1_id, &oinfo2) < 0) TEST_ERROR - if(H5F_addr_eq(oinfo1.addr, oinfo2.addr)) { - if(H5Oclose(obj1_id) < 0) TEST_ERROR - if(H5Oclose(obj2_id) < 0) TEST_ERROR + if (obj_owner > 0) { + H5O_info2_t oinfo1, oinfo2; + int token_cmp; + + if (H5Oget_info3(obj_owner, &oinfo1, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Oget_info3(obj1_id, &oinfo2, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(obj1_id, &oinfo1.token, &oinfo2.token, &token_cmp) < 0) + TEST_ERROR; + if (!token_cmp) { + if (H5Oclose(obj1_id) < 0) + TEST_ERROR; + if (H5Oclose(obj2_id) < 0) + TEST_ERROR; return TRUE; } } /* Check for types of objects handled */ - switch(obj1_type) { + switch (obj1_type) { case H5O_TYPE_DATASET: - if(compare_datasets(obj1_id, obj2_id, pid, NULL) != TRUE) TEST_ERROR + if (compare_datasets(obj1_id, obj2_id, pid, NULL) != TRUE) + TEST_ERROR; break; case H5O_TYPE_GROUP: - if(compare_groups(obj1_id, obj2_id, pid, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(obj1_id, obj2_id, pid, -1, 0) != TRUE) + TEST_ERROR; break; case H5O_TYPE_NAMED_DATATYPE: - if(H5Tequal(obj1_id, obj2_id) != TRUE) TEST_ERROR + if (H5Tequal(obj1_id, obj2_id) != TRUE) + TEST_ERROR; break; + case H5O_TYPE_MAP: + /* Maps not supported in native VOL connector */ + case H5O_TYPE_UNKNOWN: case H5O_TYPE_NTYPES: default: - TEST_ERROR + TEST_ERROR; } /* end switch */ /* Close objects */ - if(H5Oclose(obj1_id) < 0) TEST_ERROR - if(H5Oclose(obj2_id) < 0) TEST_ERROR + if (H5Oclose(obj1_id) < 0) + TEST_ERROR; + if (H5Oclose(obj2_id) < 0) + TEST_ERROR; /* Get regions for referenced datasets */ - if((obj1_sid = H5Rget_region(parent1, H5R_DATASET_REGION, ref_buf1)) < 0) TEST_ERROR - if((obj2_sid = H5Rget_region(parent2, H5R_DATASET_REGION, ref_buf2)) < 0) TEST_ERROR + if ((obj1_sid = H5Rget_region(parent1, H5R_DATASET_REGION, ref_buf1)) < 0) + TEST_ERROR; + if ((obj2_sid = H5Rget_region(parent2, H5R_DATASET_REGION, ref_buf2)) < 0) + TEST_ERROR; /* Check if dataspaces are the same shape */ - if(H5S_select_shape_same_test(obj1_sid, obj2_sid) < 0) TEST_ERROR + if (H5Sselect_shape_same(obj1_sid, obj2_sid) < 0) + TEST_ERROR; /* Close dataspaces */ - if(H5Sclose(obj1_sid) < 0) TEST_ERROR - if(H5Sclose(obj2_sid) < 0) TEST_ERROR + if (H5Sclose(obj1_sid) < 0) + TEST_ERROR; + if (H5Sclose(obj2_sid) < 0) + TEST_ERROR; } /* end for */ - } /* end if */ + } /* end if */ else - TEST_ERROR + TEST_ERROR; } /* end else */ - else - if(HDmemcmp(buf1, buf2, (elmt_size * nelmts))) TEST_ERROR + else if (HDmemcmp(buf1, buf2, (elmt_size * nelmts)) != 0) + TEST_ERROR; /* Data should be the same. :-) */ return TRUE; @@ -1142,13 +1334,12 @@ error: return FALSE; } /* end compare_data() */ - /*------------------------------------------------------------------------- * Function: compare_datasets * * Purpose: Compare two datasets to check that they are equal * - * Return: TRUE if datasets are equal/FALSE if they are different + * Return: TRUE if datasets are equal/FALSE if they are different * * Programmer: Quincey Koziol * Tuesday, October 25, 2005 @@ -1158,163 +1349,146 @@ error: static int compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) { - hid_t sid = -1, sid2 = -1; /* Dataspace IDs */ - hid_t tid = -1, tid2 = -1; /* Datatype IDs */ - hid_t dcpl = -1, dcpl2 = -1; /* Dataset creation property list IDs */ - size_t elmt_size; /* Size of datatype */ - htri_t is_committed; /* If the datatype is committed */ - htri_t is_committed2; /* If the datatype is committed */ - int ext_count; /* Number of external files in plist */ - int nfilters; /* Number of filters applied to dataset */ - hssize_t nelmts; /* # of elements in dataspace */ - void *rbuf = NULL; /* Buffer for reading raw data */ - void *rbuf2 = NULL; /* Buffer for reading raw data */ - H5D_space_status_t space_status; /* Dataset's raw data space status */ - H5D_space_status_t space_status2; /* Dataset's raw data space status */ + hid_t sid = -1, sid2 = -1; /* Dataspace IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype IDs */ + hid_t dcpl = -1, dcpl2 = -1; /* Dataset creation property list IDs */ + size_t elmt_size; /* Size of datatype */ + htri_t is_committed; /* If the datatype is committed */ + htri_t is_committed2; /* If the datatype is committed */ + int nfilters; /* Number of filters applied to dataset */ + hssize_t nelmts; /* # of elements in dataspace */ + void *rbuf = NULL; /* Buffer for reading raw data */ + void *rbuf2 = NULL; /* Buffer for reading raw data */ + H5D_space_status_t space_status; /* Dataset's raw dataspace status */ + H5D_space_status_t space_status2; /* Dataset's raw dataspace status */ /* Check the datatypes are equal */ /* Open the datatype for the source dataset */ - if((tid = H5Dget_type(did)) < 0) TEST_ERROR + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; /* Open the datatype for the destination dataset */ - if((tid2 = H5Dget_type(did2)) < 0) TEST_ERROR + if ((tid2 = H5Dget_type(did2)) < 0) + TEST_ERROR; /* Check that both datatypes are committed/not committed */ - if((is_committed = H5Tcommitted(tid)) < 0) TEST_ERROR - if((is_committed2 = H5Tcommitted(tid2)) < 0) TEST_ERROR - if(is_committed != is_committed2) TEST_ERROR + if ((is_committed = H5Tcommitted(tid)) < 0) + TEST_ERROR; + if ((is_committed2 = H5Tcommitted(tid2)) < 0) + TEST_ERROR; + if (is_committed != is_committed2) + TEST_ERROR; /* Compare the datatypes */ - if(H5Tequal(tid, tid2) != TRUE) TEST_ERROR + if (H5Tequal(tid, tid2) != TRUE) + TEST_ERROR; /* Determine the size of datatype (for later) */ - if((elmt_size = H5Tget_size(tid)) == 0) TEST_ERROR - + if ((elmt_size = H5Tget_size(tid)) == 0) + TEST_ERROR; /* Check the dataspaces are equal */ /* Open the dataspace for the source dataset */ - if((sid = H5Dget_space(did)) < 0) TEST_ERROR + if ((sid = H5Dget_space(did)) < 0) + TEST_ERROR; /* Open the dataspace for the destination dataset */ - if((sid2 = H5Dget_space(did2)) < 0) TEST_ERROR + if ((sid2 = H5Dget_space(did2)) < 0) + TEST_ERROR; /* Compare the dataspaces */ - if(H5Sextent_equal(sid, sid2) != TRUE) TEST_ERROR + if (H5Sextent_equal(sid, sid2) != TRUE) + TEST_ERROR; /* Determine the number of elements in dataspace (for later) */ - if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0) TEST_ERROR - + if ((nelmts = H5Sget_simple_extent_npoints(sid)) < 0) + TEST_ERROR; /* Check the dataset creation property lists are equal */ /* Open the dataset creation property list for the source dataset */ - if((dcpl = H5Dget_create_plist(did)) < 0) TEST_ERROR + if ((dcpl = H5Dget_create_plist(did)) < 0) + TEST_ERROR; /* Open the dataset creation property list for the destination dataset */ - if((dcpl2 = H5Dget_create_plist(did2)) < 0) TEST_ERROR - - /* If external file storage is being used, the value stored in the - * dcpl will be a heap ID, which is not guaranteed to be the same in - * source and destination files. - * Instead, compare the actual external file values and then - * delete this property from the dcpls before comparing them. - */ - if((ext_count = H5Pget_external_count(dcpl)) < 0) TEST_ERROR - - if(ext_count > 0) - { - unsigned x; /* Counter varaible */ - char name1[NAME_BUF_SIZE]; - char name2[NAME_BUF_SIZE]; - off_t offset1=0; - off_t offset2=0; - hsize_t size1=0; - hsize_t size2=0; - - if(H5Pget_external_count(dcpl2) != ext_count) TEST_ERROR - - /* Ensure that all external file information is the same */ - for(x=0; x < (unsigned) ext_count; ++x) - { - if(H5Pget_external(dcpl, x, (size_t)NAME_BUF_SIZE, name1, &offset1, &size1) < 0) TEST_ERROR - if(H5Pget_external(dcpl2, x, (size_t)NAME_BUF_SIZE, name2, &offset2, &size2) < 0) TEST_ERROR - - if(offset1 != offset2) TEST_ERROR - if(size1 != size2) TEST_ERROR - if(strcmp(name1, name2) != 0) TEST_ERROR - } - - /* Remove external file information from the dcpls */ - /* Remove default property causes memory leak - if(H5Premove(dcpl, H5D_CRT_EXT_FILE_LIST_NAME) < 0) TEST_ERROR - if(H5Premove(dcpl2, H5D_CRT_EXT_FILE_LIST_NAME) < 0) TEST_ERROR - */ - - /* reset external file information from the dcpls */ - if (H5P_reset_external_file_test(dcpl) < 0) TEST_ERROR - if (H5P_reset_external_file_test(dcpl2) < 0) TEST_ERROR - } + if ((dcpl2 = H5Dget_create_plist(did2)) < 0) + TEST_ERROR; /* Compare the rest of the dataset creation property lists */ - if(H5Pequal(dcpl, dcpl2) != TRUE) TEST_ERROR + if (H5Pequal(dcpl, dcpl2) != TRUE) + TEST_ERROR; - /* Get the number of filters on dataset */ - if((nfilters = H5Pget_nfilters(dcpl)) < 0) TEST_ERROR + /* Get the number of filters on dataset (for later) */ + if ((nfilters = H5Pget_nfilters(dcpl)) < 0) + TEST_ERROR; /* close the source dataset creation property list */ - if(H5Pclose(dcpl) < 0) TEST_ERROR + if (H5Pclose(dcpl) < 0) + TEST_ERROR; /* close the destination dataset creation property list */ - if(H5Pclose(dcpl2) < 0) TEST_ERROR - + if (H5Pclose(dcpl2) < 0) + TEST_ERROR; /* Check the allocated storage is the same */ /* Check that the space allocation status is the same */ - if(H5Dget_space_status(did, &space_status) < 0) TEST_ERROR - if(H5Dget_space_status(did2, &space_status2) < 0) TEST_ERROR - if(space_status != space_status2) TEST_ERROR + if (H5Dget_space_status(did, &space_status) < 0) + TEST_ERROR; + if (H5Dget_space_status(did2, &space_status2) < 0) + TEST_ERROR; + if (space_status != space_status2) + TEST_ERROR; /* Check that the space used is the same */ /* (Don't check if the dataset is filtered (i.e. compressed, etc.) and - * the datatype is VLEN, since the addresses for the vlen + * the datatype is VLEN, since the tokens for the vlen * data in each dataset will (probably) be different and the storage * size will thus vary) */ - if(!(nfilters > 0 && (H5Tdetect_class(tid, H5T_VLEN) || - (H5Tdetect_class(tid, H5T_REFERENCE) && H5Tequal(tid, H5T_STD_REF_DSETREG))))) { - hsize_t storage_size = H5Dget_storage_size(did); /* Dataset's raw data storage size */ - hsize_t storage_size2 = H5Dget_storage_size(did2); /* 2nd Dataset's raw data storage size */ + if (!(nfilters > 0 && (H5Tdetect_class(tid, H5T_VLEN) || + (H5Tdetect_class(tid, H5T_REFERENCE) && H5Tequal(tid, H5T_STD_REF_DSETREG))))) { + hsize_t storage_size = H5Dget_storage_size(did); /* Dataset's raw data storage size */ + hsize_t storage_size2 = H5Dget_storage_size(did2); /* 2nd Dataset's raw data storage size */ - if(storage_size != storage_size2) TEST_ERROR + if (storage_size != storage_size2) + TEST_ERROR; } /* end if */ /* Check the raw data is equal */ /* Allocate & initialize space for the raw data buffers */ - if((rbuf = HDcalloc( elmt_size, (size_t)nelmts)) == NULL) TEST_ERROR - if((rbuf2 = HDcalloc( elmt_size, (size_t)nelmts)) == NULL) TEST_ERROR + if ((rbuf = HDcalloc(elmt_size, (size_t)nelmts)) == NULL) + TEST_ERROR; + if ((rbuf2 = HDcalloc(elmt_size, (size_t)nelmts)) == NULL) + TEST_ERROR; /* Read data from datasets */ - if(H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) TEST_ERROR - if(H5Dread(did2, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf2) < 0) TEST_ERROR + if (H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) + TEST_ERROR; + if (H5Dread(did2, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf2) < 0) + TEST_ERROR; /* Check raw data read in against data written out */ - if(wbuf) { - if(!compare_data(did, 0, pid, tid, (size_t)nelmts, wbuf, rbuf, did)) TEST_ERROR - if(!compare_data(did2, 0, pid, tid2, (size_t)nelmts, wbuf, rbuf2, did2)) TEST_ERROR + if (wbuf) { + if (!compare_data(did, (hid_t)0, pid, tid, (size_t)nelmts, wbuf, rbuf, did)) + TEST_ERROR; + if (!compare_data(did2, (hid_t)0, pid, tid2, (size_t)nelmts, wbuf, rbuf2, did2)) + TEST_ERROR; } /* end if */ /* Don't have written data, just compare data between the two datasets */ - else - if(!compare_data(did, did2, pid, tid, (size_t)nelmts, rbuf, rbuf2, did)) TEST_ERROR + else if (!compare_data(did, did2, pid, tid, (size_t)nelmts, rbuf, rbuf2, did)) + TEST_ERROR; /* Reclaim vlen data, if necessary */ - if(H5Tdetect_class(tid, H5T_VLEN) == TRUE) - if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, rbuf) < 0) TEST_ERROR - if(H5Tdetect_class(tid2, H5T_VLEN) == TRUE) - if(H5Dvlen_reclaim(tid2, sid2, H5P_DEFAULT, rbuf2) < 0) TEST_ERROR + if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) + if (H5Treclaim(tid, sid, H5P_DEFAULT, rbuf) < 0) + TEST_ERROR; + if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE) + if (H5Treclaim(tid2, sid2, H5P_DEFAULT, rbuf2) < 0) + TEST_ERROR; /* Release raw data buffers */ HDfree(rbuf); @@ -1323,48 +1497,52 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) rbuf2 = NULL; /* close the source dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the destination dataspace */ - if(H5Sclose(sid2) < 0) TEST_ERROR + if (H5Sclose(sid2) < 0) + TEST_ERROR; /* close the source datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the destination datatype */ - if(H5Tclose(tid2) < 0) TEST_ERROR - + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* Check if the attributes are equal */ - if(compare_std_attributes(did, did2, pid) != TRUE) TEST_ERROR - + if (compare_std_attributes(did, did2, pid) != TRUE) + TEST_ERROR; /* Datasets should be the same. :-) */ return TRUE; error: - H5E_BEGIN_TRY { - if(rbuf) + H5E_BEGIN_TRY + { + if (rbuf) HDfree(rbuf); - if(rbuf2) + if (rbuf2) HDfree(rbuf2); - H5Pclose(dcpl2); - H5Pclose(dcpl); - H5Sclose(sid2); - H5Sclose(sid); - H5Tclose(tid2); - H5Tclose(tid); - } H5E_END_TRY; + H5Pclose(dcpl2); + H5Pclose(dcpl); + H5Sclose(sid2); + H5Sclose(sid); + H5Tclose(tid2); + H5Tclose(tid); + } + H5E_END_TRY; return FALSE; } /* end compare_datasets() */ - /*------------------------------------------------------------------------- * Function: compare_groups * * Purpose: Compare two groups to check that they are "equal" * - * Return: TRUE if group are equal/FALSE if they are different + * Return: TRUE if group are equal/FALSE if they are different * * Programmer: Quincey Koziol * Monday, October 31, 2005 @@ -1374,147 +1552,235 @@ error: static int compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags) { - H5G_info_t ginfo; /* Group info struct */ - H5G_info_t ginfo2; /* Group info struct */ - hsize_t idx; /* Index over the objects in group */ - unsigned cpy_flags; /* Object copy flags */ + H5G_info_t ginfo; /* Group info struct */ + H5G_info_t ginfo2; /* Group info struct */ + hsize_t idx; /* Index over the objects in group */ + unsigned cpy_flags; /* Object copy flags */ /* Retrieve the object copy flags from the property list, if it's non-DEFAULT */ - if(pid != H5P_DEFAULT) { - if(H5Pget_copy_object(pid, &cpy_flags) < 0) TEST_ERROR + if (pid != H5P_DEFAULT) { + if (H5Pget_copy_object(pid, &cpy_flags) < 0) + TEST_ERROR; } /* end if */ else cpy_flags = 0; /* Check if both groups have the same # of objects */ - if(H5Gget_info(gid, &ginfo) < 0) TEST_ERROR - if(H5Gget_info(gid2, &ginfo2) < 0) TEST_ERROR - if((cpy_flags & H5O_COPY_SHALLOW_HIERARCHY_FLAG) && depth == 0) { - if(ginfo2.nlinks != 0) TEST_ERROR + if (H5Gget_info(gid, &ginfo) < 0) + TEST_ERROR; + if (H5Gget_info(gid2, &ginfo2) < 0) + TEST_ERROR; + if ((cpy_flags & H5O_COPY_SHALLOW_HIERARCHY_FLAG) && depth == 0) { + if (ginfo2.nlinks != 0) + TEST_ERROR; } /* end if */ else { - if(ginfo.nlinks != ginfo2.nlinks) TEST_ERROR + if (ginfo.nlinks != ginfo2.nlinks) + TEST_ERROR; } /* end if */ /* Check contents of groups */ - if(ginfo2.nlinks > 0) { - char objname[NAME_BUF_SIZE]; /* Name of object in group */ - char objname2[NAME_BUF_SIZE]; /* Name of object in group */ - H5L_info_t linfo; /* Link information */ - H5L_info_t linfo2; /* Link information */ + if (ginfo2.nlinks > 0) { + char objname[NAME_BUF_SIZE]; /* Name of object in group */ + char objname2[NAME_BUF_SIZE]; /* Name of object in group */ + H5L_info2_t linfo; /* Link information */ + H5L_info2_t linfo2; /* Link information */ /* Loop over contents of groups */ - for(idx = 0; idx < ginfo.nlinks; idx++) { + for (idx = 0; idx < ginfo.nlinks; idx++) { /* Check name of objects */ - if(H5Lget_name_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, idx, objname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Lget_name_by_idx(gid2, ".", H5_INDEX_NAME, H5_ITER_INC, idx, objname2, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR - if(HDstrcmp(objname, objname2)) TEST_ERROR + if (H5Lget_name_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, idx, objname, (size_t)NAME_BUF_SIZE, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Lget_name_by_idx(gid2, ".", H5_INDEX_NAME, H5_ITER_INC, idx, objname2, + (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) + TEST_ERROR; + if (HDstrcmp(objname, objname2) != 0) + TEST_ERROR; /* Get link info */ - if(H5Lget_info(gid, objname, &linfo, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Lget_info(gid2, objname2, &linfo2, H5P_DEFAULT) < 0) TEST_ERROR - if(linfo.type != linfo2.type) TEST_ERROR + if (H5Lget_info2(gid, objname, &linfo, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Lget_info2(gid2, objname2, &linfo2, H5P_DEFAULT) < 0) + TEST_ERROR; + if (linfo.type != linfo2.type) + TEST_ERROR; /* Extra checks for "real" objects */ - if(linfo.type == H5L_TYPE_HARD) { - hid_t oid, oid2; /* IDs of objects within group */ - H5O_info_t oinfo, oinfo2; /* Object info */ + if (linfo.type == H5L_TYPE_HARD) { + hid_t oid, oid2; /* IDs of objects within group */ + H5O_info2_t oinfo, oinfo2; /* Data model object info */ + H5O_native_info_t ninfo, ninfo2; /* Native file format object info */ /* Compare some pieces of the object info */ - if(H5Oget_info_by_name(gid, objname, &oinfo, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Oget_info_by_name(gid2, objname2, &oinfo2, H5P_DEFAULT) < 0) TEST_ERROR - - if(oinfo.type != oinfo2.type) TEST_ERROR - if(oinfo.rc != oinfo2.rc) TEST_ERROR + /* Get data model object info */ + if (H5Oget_info_by_name3(gid, objname, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Oget_info_by_name3(gid2, objname2, &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT) < 0) + TEST_ERROR; + + /* Get native object info */ + if (H5Oget_native_info_by_name(gid, objname, &ninfo, H5O_NATIVE_INFO_HDR, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Oget_native_info_by_name(gid2, objname2, &ninfo2, H5O_NATIVE_INFO_HDR, H5P_DEFAULT) < 0) + TEST_ERROR; + + if (oinfo.type != oinfo2.type) + TEST_ERROR; + if (oinfo.rc != oinfo2.rc) + TEST_ERROR; /* If NULL messages are preserved, the number of messages * should be the same in the destination. * Otherwise, it should simply be true that the number * of messages hasn't increased. */ - if(H5O_COPY_PRESERVE_NULL_FLAG & copy_flags) { - if(oinfo.hdr.nmesgs != oinfo2.hdr.nmesgs) + if (H5O_COPY_PRESERVE_NULL_FLAG & copy_flags) { + if (ninfo.hdr.nmesgs != ninfo2.hdr.nmesgs) ; - else - if(oinfo.hdr.nmesgs < oinfo2.hdr.nmesgs) TEST_ERROR - } + else if (ninfo.hdr.nmesgs < ninfo2.hdr.nmesgs) + TEST_ERROR; + } /* Check for object already having been compared */ - if(addr_lookup(&oinfo)) + if (token_lookup(gid, &oinfo)) continue; else - addr_insert(&oinfo); + token_insert(&oinfo); /* Open objects */ - if((oid = H5Oopen(gid, objname, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((oid2 = H5Oopen(gid2, objname2, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((oid = H5Oopen(gid, objname, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + if ((oid2 = H5Oopen(gid2, objname2, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Compare objects within group */ - switch(oinfo.type) { + switch (oinfo.type) { case H5O_TYPE_GROUP: /* Compare groups */ - if(compare_groups(oid, oid2, pid, depth - 1, copy_flags) != TRUE) TEST_ERROR + if (compare_groups(oid, oid2, pid, depth - 1, copy_flags) != TRUE) + TEST_ERROR; break; case H5O_TYPE_DATASET: /* Compare datasets */ - if(compare_datasets(oid, oid2, pid, NULL) != TRUE) TEST_ERROR + if (compare_datasets(oid, oid2, pid, NULL) != TRUE) + TEST_ERROR; break; case H5O_TYPE_NAMED_DATATYPE: /* Compare datatypes */ - if(H5Tequal(oid, oid2) != TRUE) TEST_ERROR + if (H5Tequal(oid, oid2) != TRUE) + TEST_ERROR; break; + case H5O_TYPE_MAP: + HDassert(0 && "maps not supported in native VOL connector"); + + /* clang complains about implicit fallthrough here and + * our usual attributes and fall-through comments don't + * quiet the compiler. + */ + H5_CLANG_DIAG_OFF("implicit-fallthrough") case H5O_TYPE_UNKNOWN: case H5O_TYPE_NTYPES: default: -HDassert(0 && "Unknown type of object"); + HDassert(0 && "Unknown type of object"); break; + H5_CLANG_DIAG_ON("implicit-fallthrough") } /* end switch */ /* Close objects */ - if(H5Oclose(oid) < 0) TEST_ERROR - if(H5Oclose(oid2) < 0) TEST_ERROR + if (H5Oclose(oid) < 0) + TEST_ERROR; + if (H5Oclose(oid2) < 0) + TEST_ERROR; } /* end if */ else { /* Check that both links are the same size */ - if(linfo.u.val_size != linfo2.u.val_size) TEST_ERROR + if (linfo.u.val_size != linfo2.u.val_size) + TEST_ERROR; /* Compare link values */ - if(linfo.type == H5L_TYPE_SOFT || - (linfo.type >= H5L_TYPE_UD_MIN && linfo.type <= H5L_TYPE_MAX)) { - char linkval[NAME_BUF_SIZE]; /* Link value */ - char linkval2[NAME_BUF_SIZE]; /* Link value */ + if (linfo.type == H5L_TYPE_SOFT || + (linfo.type >= H5L_TYPE_UD_MIN && linfo.type <= H5L_TYPE_MAX)) { + char linkval[NAME_BUF_SIZE]; /* Link value */ + char linkval2[NAME_BUF_SIZE]; /* Link value */ /* Get link values */ HDassert(linfo.u.val_size <= NAME_BUF_SIZE); - if(H5Lget_val(gid, objname, linkval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Lget_val(gid2, objname2, linkval2, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Lget_val(gid, objname, linkval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Lget_val(gid2, objname2, linkval2, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) + TEST_ERROR; /* Compare link data */ - if(HDmemcmp(linkval, linkval2, linfo.u.val_size)) TEST_ERROR + if (HDmemcmp(linkval, linkval2, linfo.u.val_size) != 0) + TEST_ERROR; } /* end else-if */ else { -HDassert(0 && "Unknown type of link"); + HDassert(0 && "Unknown type of link"); } /* end else */ - } /* end else */ - } /* end for */ - } /* end if */ + } /* end else */ + } /* end for */ + } /* end if */ /* Check if the attributes are equal */ - if(compare_std_attributes(gid, gid2, pid) != TRUE) TEST_ERROR + if (compare_std_attributes(gid, gid2, pid) != TRUE) + TEST_ERROR; /* Groups should be the same. :-) */ return TRUE; error: - H5E_BEGIN_TRY { - } H5E_END_TRY; + H5E_BEGIN_TRY + { + } + H5E_END_TRY; return FALSE; } /* end compare_groups() */ - +/*------------------------------------------------------------------------- + * Function: compare_idx_type + * + * Purpose: If using new format, the index array type should be NEW_TYPE + * If not, the index array type should be OLD_TYPE + * + * Return: TRUE if the index type retrieved for the dataset DID is + * as expected + * FALSE if not + * + * Programmer: Vailin Choi; August 2009 + * + *------------------------------------------------------------------------- + */ +static int +compare_idx_type(hid_t fapl, hid_t did, H5D_chunk_index_t new_type, H5D_chunk_index_t old_type) +{ + H5D_chunk_index_t idx_type; /* Dataset chunk index type */ + H5F_libver_t low; /* File format low bound */ + + /* Get the chunk index type */ + if (H5D__layout_idx_type_test(did, &idx_type) < 0) + FAIL_STACK_ERROR; + + /* Check if we are using the latest version of the format */ + if (H5Pget_libver_bounds(fapl, &low, NULL) < 0) + FAIL_STACK_ERROR; + + /* Verify index type */ + if (low == H5F_LIBVER_LATEST) { + if (idx_type != new_type) + TEST_ERROR; + } + else if (idx_type != old_type) + TEST_ERROR; + + return TRUE; +error: + return FALSE; +} /* compare_idx_type() */ + /*------------------------------------------------------------------------- * Function: test_copy_named_datatype * @@ -1526,17 +1792,15 @@ error: * Programmer: Peter Cao * Friday, September 30, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_named_datatype(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1, tid2 = -1; /* Datatype IDs */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype IDs */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): named datatype"); @@ -1544,72 +1808,89 @@ test_copy_named_datatype(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create named datatype */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the datatype from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATATYPE_SIMPLE, fid_dst, NAME_DATATYPE_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATATYPE_SIMPLE, fid_dst, NAME_DATATYPE_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the datatype for copy */ - if((tid = H5Topen2(fid_src, NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((tid = H5Topen2(fid_src, NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the copied datatype */ - if((tid2 = H5Topen2(fid_dst, NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((tid2 = H5Topen2(fid_dst, NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Compare the datatypes */ - if(H5Tequal(tid, tid2) != TRUE) TEST_ERROR + if (H5Tequal(tid, tid2) != TRUE) + TEST_ERROR; /* close the destination datatype */ - if(H5Tclose(tid2) < 0) TEST_ERROR + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* close the source datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Tclose(tid2); - H5Tclose(tid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Tclose(tid2); + H5Tclose(tid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_named_datatype */ - /*------------------------------------------------------------------------- * Function: test_copy_named_datatype_vl * @@ -1626,10 +1907,10 @@ error: static int test_copy_named_datatype_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1, tid2 = -1; /* Datatype IDs */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype IDs */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): named vlen datatype"); @@ -1637,72 +1918,89 @@ test_copy_named_datatype_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create named datatype */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the datatype from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATATYPE_VL, fid_dst, NAME_DATATYPE_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATATYPE_VL, fid_dst, NAME_DATATYPE_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the datatype for copy */ - if((tid = H5Topen2(fid_src, NAME_DATATYPE_VL, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((tid = H5Topen2(fid_src, NAME_DATATYPE_VL, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the copied datatype */ - if((tid2 = H5Topen2(fid_dst, NAME_DATATYPE_VL, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((tid2 = H5Topen2(fid_dst, NAME_DATATYPE_VL, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Compare the datatypes */ - if(H5Tequal(tid, tid2) != TRUE) TEST_ERROR + if (H5Tequal(tid, tid2) != TRUE) + TEST_ERROR; /* close the destination datatype */ - if(H5Tclose(tid2) < 0) TEST_ERROR + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* close the source datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Tclose(tid2); - H5Tclose(tid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Tclose(tid2); + H5Tclose(tid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_named_datatype_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_named_datatype_vl_vl * @@ -1719,10 +2017,10 @@ error: static int test_copy_named_datatype_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1, tid2 = -1; /* Datatype IDs */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype IDs */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): named nested vlen datatype"); @@ -1730,78 +2028,97 @@ test_copy_named_datatype_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create first vlen datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create second (nested) vlen datatype */ - if((tid2 = H5Tvlen_create(tid)) < 0) TEST_ERROR + if ((tid2 = H5Tvlen_create(tid)) < 0) + TEST_ERROR; /* create named datatype */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_VL_VL, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((H5Tcommit2(fid_src, NAME_DATATYPE_VL_VL, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the first datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the second datatype */ - if(H5Tclose(tid2) < 0) TEST_ERROR + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the datatype from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATATYPE_VL_VL, fid_dst, NAME_DATATYPE_VL_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATATYPE_VL_VL, fid_dst, NAME_DATATYPE_VL_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the datatype for copy */ - if((tid = H5Topen2(fid_src, NAME_DATATYPE_VL_VL, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((tid = H5Topen2(fid_src, NAME_DATATYPE_VL_VL, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the copied datatype */ - if((tid2 = H5Topen2(fid_dst, NAME_DATATYPE_VL_VL, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((tid2 = H5Topen2(fid_dst, NAME_DATATYPE_VL_VL, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Compare the datatypes */ - if(H5Tequal(tid, tid2) != TRUE) TEST_ERROR + if (H5Tequal(tid, tid2) != TRUE) + TEST_ERROR; /* close the destination datatype */ - if(H5Tclose(tid2) < 0) TEST_ERROR + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* close the source datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Tclose(tid2); - H5Tclose(tid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Tclose(tid2); + H5Tclose(tid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_named_datatype_vl_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_named_datatype_attr_self * @@ -1815,22 +2132,21 @@ error: * Programmer: Neil * Friday, March 11, 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_named_datatype_attr_self(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1, tid2 = -1; /* Datatype IDs */ - hid_t aid = -1; /* Attribute ID */ - hid_t sid = -1; /* Dataspace ID */ - hsize_t dims[2] = {3, 4}; /* Dataspace dimensions */ - H5O_info_t oinfo, oinfo2; /* Object info */ - H5G_info_t ginfo; /* Group info */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype IDs */ + hid_t aid = -1; /* Attribute ID */ + hid_t sid = -1; /* Dataspace ID */ + hsize_t dims[2] = {3, 4}; /* Dataspace dimensions */ + H5O_info2_t oinfo, oinfo2; /* Object info */ + H5G_info_t ginfo; /* Group info */ + hbool_t same_type; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): named datatype with self-referential attribute"); @@ -1838,113 +2154,154 @@ test_copy_named_datatype_attr_self(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create named datatype */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create dataspace */ - if((sid = H5Screate_simple(2, dims, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dims, NULL)) < 0) + TEST_ERROR; /* create attribute */ - if((aid = H5Acreate2(tid, "attr_self", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((aid = H5Acreate2(tid, "attr_self", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* attach other attributes to the dataset */ - if(test_copy_attach_attributes(tid, tid) < 0) TEST_ERROR + if (test_copy_attach_attributes(tid, tid) < 0) + TEST_ERROR; /* close the attribute */ - if(H5Aclose(aid) < 0) TEST_ERROR + if (H5Aclose(aid) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the datatype from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATATYPE_SIMPLE, fid_dst, NAME_DATATYPE_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATATYPE_SIMPLE, fid_dst, NAME_DATATYPE_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the source datatype */ - if((tid = H5Topen2(fid_src, NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((tid = H5Topen2(fid_src, NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the copied datatype */ - if((tid2 = H5Topen2(fid_dst, NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((tid2 = H5Topen2(fid_dst, NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Compare the datatypes */ - if(H5Tequal(tid, tid2) != TRUE) TEST_ERROR + if (H5Tequal(tid, tid2) != TRUE) + TEST_ERROR; /* close the source datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* open the destination attribute */ - if((aid = H5Aopen(tid2, "attr_self", H5P_DEFAULT)) < 0) TEST_ERROR + if ((aid = H5Aopen(tid2, "attr_self", H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination attribute's datatype */ - if((tid = H5Aget_type(aid)) < 0) TEST_ERROR + if ((tid = H5Aget_type(aid)) < 0) + TEST_ERROR; /* verify that the attribute's datatype is committed */ - if(H5Tcommitted(tid) != TRUE) TEST_ERROR + if (H5Tcommitted(tid) != TRUE) + TEST_ERROR; + + /* verify that the tokens of the datatypes are the same */ + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Oget_info3(tid2, &oinfo2, H5O_INFO_BASIC) < 0) + TEST_ERROR; + + same_type = TRUE; + if (oinfo.fileno == oinfo2.fileno) { + int token_cmp; + if (H5Otoken_cmp(tid2, &oinfo.token, &oinfo2.token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + same_type = FALSE; + } + else + same_type = FALSE; - /* verify that the addresses of the datatypes are the same */ - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(H5Oget_info(tid2, &oinfo2) < 0) TEST_ERROR - if(oinfo.fileno != oinfo2.fileno || oinfo.addr != oinfo2.addr) - FAIL_PUTS_ERROR("destination attribute does not use the same committed datatype") + if (!same_type) + FAIL_PUTS_ERROR("destination attribute does not use the same committed datatype"); /* Verify that there are only 2 links int he destination root group */ - if(H5Gget_info(fid_dst, &ginfo) < 0) - if(ginfo.nlinks != 2) - FAIL_PUTS_ERROR("unexpected number of links in destination root group") + if (H5Gget_info(fid_dst, &ginfo) < 0) + if (ginfo.nlinks != 2) + FAIL_PUTS_ERROR("unexpected number of links in destination root group"); /* close the attribute */ - if(H5Aclose(aid) < 0) TEST_ERROR + if (H5Aclose(aid) < 0) + TEST_ERROR; /* close the datatypes */ - if(H5Tclose(tid2) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid2) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(tid2); H5Tclose(tid); H5Sclose(sid); H5Aclose(aid); H5Fclose(fid_dst); H5Fclose(fid_src); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_named_datatype_attr_self */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_simple * @@ -1956,113 +2313,337 @@ error: * Programmer: Peter Cao * Friday, September 30, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_dataset_simple(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - int buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ - hsize_t dim2d[2]; /* Dataset dimensions */ - int i, j; /* local index variables */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + int buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + hsize_t dim2d[2]; /* Dataset dimensions */ + int i, j; /* local index variables */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): simple dataset"); /* Initialize write buffer */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = 10000 + 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ dim2d[0] = DIM_SIZE_1; dim2d[1] = DIM_SIZE_2; /* create 2D dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create 2D int dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_simple */ - +/*------------------------------------------------------------------------- + * Function: test_copy_dataset_versionbounds + * + * Purpose: Verify copying dataset works as expected in various version + * bound combination. + * + * Description: + * Create a simple dataset in SRC file using default versions. + * For each valid version bound combination, create a DST file, + * and attempt to copy the SRC dataset to the DST file. + * When copying fails, verify that the failure is a result of + * the invalid bounds, that is, DST has lower bounds than SRC. + * + * Return: Success: 0 + * Failure: 1 + * + *------------------------------------------------------------------------- + */ +static int +test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src) +{ + hid_t fid_src = -1, fid_dst = -1; /* Source and destination file IDs */ + hid_t fapl_dst = -1; /* File access plist for dest file */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did_src = -1, did_dst = -1; /* Source and destination dataset IDs */ + int buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + hsize_t dim2d[2]; /* Dataset dimensions */ + char src_fname[NAME_BUF_SIZE]; /* Name of source file */ + char dst_fname[NAME_BUF_SIZE]; /* Name of destination file */ + H5F_libver_t low, high; /* File format bounds */ + unsigned srcdset_layoutversion; /* Layout version of source dataset */ + int i, j; /* Local index variables */ + H5D_t *dsetp = NULL; /* Pointer to internal dset structure */ + herr_t ret; /* Generic return value */ + + TESTING("H5Ocopy(): simple dataset with version bounds"); + + /* Initialize write buffer */ + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; + + /* Create a file access property list for destination file */ + if ((fapl_dst = h5_fileaccess()) < 0) + TEST_ERROR; + + /* Initialize the filenames */ + h5_fixname(FILENAME[4], fapl_src, src_fname, sizeof src_fname); + h5_fixname(FILENAME[5], fapl_dst, dst_fname, sizeof dst_fname); + + /* Reset file token checking info */ + token_reset(); + + /* Create source file */ + fid_src = H5Fcreate(src_fname, H5F_ACC_TRUNC, fcpl_src, fapl_src); + if (fid_src < 0) + TEST_ERROR; + + /* Set dataspace dimensions */ + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; + + /* Create 2D dataspace */ + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; + + /* Create 2D int dataset in SRC file */ + did_src = + H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + if (did_src < 0) + TEST_ERROR; + + /* Write data into SRC file */ + ret = H5Dwrite(did_src, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf); + if (ret < 0) + TEST_ERROR; + + /* Get the internal dset ptr to get the fill version for verifying later */ + if ((dsetp = (H5D_t *)H5VL_object(did_src)) == NULL) + TEST_ERROR; + + srcdset_layoutversion = dsetp->shared->layout.version; + + /* Close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; + + /* Close the dataset */ + if (H5Dclose(did_src) < 0) + TEST_ERROR; + + /* Close the SRC file */ + if (H5Fclose(fid_src) < 0) + TEST_ERROR; + + /* Open the source file with read-only */ + fid_src = H5Fopen(src_fname, H5F_ACC_RDONLY, fapl_src); + if (fid_src < 0) + TEST_ERROR; + + /* Loop through all the combinations of low/high library format bounds, + skipping invalid combinations. Create a destination file and copy the + source dataset to it, then verify */ + for (low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) { + for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) { + + /* Set version bounds */ + H5E_BEGIN_TRY + { + ret = H5Pset_libver_bounds(fapl_dst, low, high); + } + H5E_END_TRY; + + if (ret < 0) /* Invalid low/high combinations */ + continue; + + /* Create destination file */ + fid_dst = H5Fcreate(dst_fname, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_dst); + if (fid_dst < 0) + TEST_ERROR; + + /* Create an uncopied object in destination file so that tokens + in source and destination files aren't the same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Try to copy the dataset */ + H5E_BEGIN_TRY + { + ret = H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, + H5P_DEFAULT); + } + H5E_END_TRY; + + /* If copy failed, check if the failure is expected */ + if (ret < 0) { + /* Failure is valid if layout version of source dataset is + greater than destination */ + if (srcdset_layoutversion <= H5O_layout_ver_bounds[high]) + TEST_ERROR; + + /* Close the DST file before continue */ + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + continue; + } + + /* Close the DST file */ + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + + /* Open destination file */ + fid_dst = H5Fopen(dst_fname, H5F_ACC_RDWR, fapl_dst); + if (fid_dst < 0) + TEST_ERROR; + + /* Open the datasets to compare */ + did_src = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT); + if (did_src < 0) + TEST_ERROR; + did_dst = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT); + if (did_dst < 0) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did_src, did_dst, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; + + /* Close the datasets */ + if (H5Dclose(did_dst) < 0) + TEST_ERROR; + if (H5Dclose(did_src) < 0) + TEST_ERROR; + + /* Close the DST file */ + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + + } /* for high */ + } /* for low */ + + /* Close property list and source file */ + if (H5Pclose(fapl_dst) < 0) + TEST_ERROR; + if (H5Fclose(fid_src) < 0) + TEST_ERROR; + + PASSED(); + return 0; + +error: + H5E_BEGIN_TRY + { + H5Dclose(did_dst); + H5Dclose(did_src); + H5Sclose(sid); + H5Pclose(fapl_dst); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; + + return 1; +} /* end test_copy_dataset_versionbounds */ + /*------------------------------------------------------------------------- * Function: test_copy_dataset_simple_samefile * @@ -2074,107 +2655,125 @@ error: * Programmer: Neil Fortner * Thursday, January 15, 2009 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_dataset_simple_samefile(hid_t fcpl, hid_t fapl) { - hid_t fid = -1; /* File ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - int buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ - hsize_t dim2d[2]; /* Dataset dimensions */ - int i, j; /* local index variables */ - char filename[NAME_BUF_SIZE]; + hid_t fid = -1; /* File ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + int buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + hsize_t dim2d[2]; /* Dataset dimensions */ + int i, j; /* local index variables */ + char filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): simple dataset within the same file"); /* Initialize write buffer */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = 10000 + 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; /* Initialize the filenames */ h5_fixname(FILENAME[0], fapl, filename, sizeof filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) TEST_ERROR + if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ dim2d[0] = DIM_SIZE_1; dim2d[1] = DIM_SIZE_2; /* create 2D dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create 2D int dataset at SRC file */ - if((did = H5Dcreate2(fid, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid) < 0) TEST_ERROR - + if (H5Fclose(fid) < 0) + TEST_ERROR; /* open the source file with read-write */ - if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) TEST_ERROR + if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid, NAME_DATASET_SIMPLE, fid, NAME_DATASET_SIMPLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid, NAME_DATASET_SIMPLE, fid, NAME_DATASET_SIMPLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid, NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid, NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid) < 0) TEST_ERROR + if (H5Fclose(fid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Sclose(sid); - H5Fclose(fid); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Sclose(sid); + H5Fclose(fid); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_simple_samefile */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_simple_empty * * Purpose: Create a simple dataset in SRC file and copy it to DST file * (Note: dataset has no data) * + * Note: The parameter "test_open" is added to test for H5Ocopy when + * the dataset is open in the file (HDFFV-7853). + * * Return: Success: 0 * Failure: number of errors * @@ -2184,98 +2783,129 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_dataset_simple_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) +test_copy_dataset_simple_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, + hbool_t test_open) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hsize_t dim2d[2]; /* Dataset dimensions */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - - TESTING("H5Ocopy(): empty contiguous dataset"); + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hsize_t dim2d[2]; /* Dataset dimensions */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + + if (test_open) { + TESTING("H5Ocopy(): empty and opened contiguous dataset"); + } + else { + TESTING("H5Ocopy(): empty contiguous dataset"); + } /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ dim2d[0] = DIM_SIZE_1; dim2d[1] = DIM_SIZE_2; /* create 2D dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create 2D int dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; - /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (!test_open) { - /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + TEST_ERROR; - /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + /* open the source file with read-only */ + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; + } /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; - /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if (!test_open) { + /* open the dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + } /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_simple_empty */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_compound * @@ -2287,129 +2917,150 @@ error: * Programmer: Peter Cao * Friday, September 30, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_dataset_compound(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t tid = -1; /* Datatype ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hsize_t dim1d[1]; /* Dataset dimensions */ + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t tid = -1; /* Datatype ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hsize_t dim1d[1]; /* Dataset dimensions */ typedef struct comp_t { - int a; + int a; double d; } comp_t; - comp_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - int i; /* Local index variable */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + comp_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + int i; /* Local index variable */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): compound dataset"); -#ifdef H5_CLEAR_MEMORY HDmemset(buf, 0, sizeof(buf)); -#endif /* H5_CLEAR_MEMORY */ - for(i = 0; i < DIM_SIZE_1; i++) { + for (i = 0; i < DIM_SIZE_1; i++) { buf[i].a = i; - buf[i].d = 1. / (i + 1); + buf[i].d = 1.0 / (double)(i + 1); } /* end for */ /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tcreate(H5T_COMPOUND, sizeof(comp_t))) < 0) TEST_ERROR - if(H5Tinsert(tid, "int_name", HOFFSET(comp_t, a), H5T_NATIVE_INT) < 0) TEST_ERROR - if(H5Tinsert(tid, "double_name", HOFFSET(comp_t, d), H5T_NATIVE_DOUBLE) < 0) TEST_ERROR + if ((tid = H5Tcreate(H5T_COMPOUND, sizeof(comp_t))) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "int_name", HOFFSET(comp_t, a), H5T_NATIVE_INT) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "double_name", HOFFSET(comp_t, d), H5T_NATIVE_DOUBLE) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_COMPOUND, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_COMPOUND, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_COMPOUND, fid_dst, NAME_DATASET_COMPOUND, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_COMPOUND, fid_dst, NAME_DATASET_COMPOUND, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_COMPOUND, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_COMPOUND, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_COMPOUND, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_COMPOUND, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Tclose(tid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Tclose(tid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_compound */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_chunked * @@ -2421,174 +3072,521 @@ error: * Programmer: Peter Cao * Friday, September 30, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_dataset_chunked(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hsize_t max_dim1d[1]; /* Dataset max. dimensions */ - hsize_t dim2d[2]; /* Dataset dimensions */ - hsize_t chunk_dim1d[1] ={CHUNK_SIZE_1}; /* Chunk dimensions */ - hsize_t chunk_dim2d[2] ={CHUNK_SIZE_1, CHUNK_SIZE_2}; /* Chunk dimensions */ - float buf1d[DIM_SIZE_1]; /* Buffer for writing data */ - float buf2d[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ - int i, j; /* Local index variables */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hsize_t max_dim1d[1]; /* Dataset max. dimensions */ + hsize_t dim2d[2]; /* Dataset dimensions */ + hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ + hsize_t chunk_dim2d[2] = {CHUNK_SIZE_1, CHUNK_SIZE_2}; /* Chunk dimensions */ + float buf1d[DIM_SIZE_1]; /* Buffer for writing data */ + float buf2d[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + int i, j; /* Local index variables */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): chunked dataset"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) { - buf1d[i] = (float)(i / 2.0); - for(j = 0; j < DIM_SIZE_2; j++) - buf2d[i][j] = (float)(i + (j / 100.0)); + for (i = 0; i < DIM_SIZE_1; i++) { + buf1d[i] = (float)i / 2.0F; + for (j = 0; j < DIM_SIZE_2; j++) + buf2d[i][j] = (float)i + ((float)j / 100.0F); } /* end for */ /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set 1-D dataspace dimensions */ - dim1d[0] = DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; max_dim1d[0] = H5S_UNLIMITED; /* create 1-D dataspace */ - if((sid = H5Screate_simple(1, dim1d, max_dim1d)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, max_dim1d)) < 0) + TEST_ERROR; /* create and set chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 1, chunk_dim1d) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* close chunk plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1d) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1d) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* + * Create 1-D dataset: chunked, non-filterd, with data + * dims=max dims=chunk dims + * H5D_ALLOC_TIME_INC (default) + */ + /* create 1-D dataspace */ + if ((sid = H5Screate_simple(1, dim1d, dim1d)) < 0) + TEST_ERROR; + + /* create and set chunk plist */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 1, dim1d) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED_SINGLE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* close chunk plist */ + if (H5Pclose(pid) < 0) + TEST_ERROR; + + /* write data into file */ + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1d) < 0) + TEST_ERROR; + + /* close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; /* Set 2-D dataspace dimensions */ dim2d[0] = DIM_SIZE_1; dim2d[1] = DIM_SIZE_2; /* create 2-D dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create and set chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 2, chunk_dim2d) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, chunk_dim2d) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED2, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED2, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* write data into file */ + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2d) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Set allocation time to early */ + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_EARLY) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED3, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* close chunk plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2d) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2d) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; - /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + /* + * Create 2-D dataset: chunked, non-filterd, with data, dims=chunk dims, + * H5D_ALLOC_TIME_INC (default) + */ + + /* create 2-D dataspace */ + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; + + /* create and set chunk plist to be the same as dims2d */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, dim2d) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED2_SINGLE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* write data into file */ + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2d) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* + * Create 2-D dataset: chunked, non-filterd, with data, dims=chunk dims, + * H5D_ALLOC_TIME_EARLY + */ + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_EARLY) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED3_SINGLE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + /* write data into file */ + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2d) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; + + /* close chunk plist */ + if (H5Pclose(pid) < 0) + TEST_ERROR; + + /* + * Create 2-D dataset: chunked, non-filterd, with data, dims=max dims=chunk dims, + * H5D_ALLOC_TIME_LATE + */ + /* create 2-D dataspace */ + if ((sid = H5Screate_simple(2, dim2d, dim2d)) < 0) + TEST_ERROR; + + /* create and set chunk plist to be the same as dims2d */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, dim2d) < 0) + TEST_ERROR; + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_LATE) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED4_SINGLE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* write data into file */ + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2d) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; + + /* close chunk plist */ + if (H5Pclose(pid) < 0) + TEST_ERROR; + + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the datasets from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Ocopy(fid_src, NAME_DATASET_CHUNKED2, fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED2, fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED3, fid_dst, NAME_DATASET_CHUNKED3, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED_SINGLE, fid_dst, NAME_DATASET_CHUNKED_SINGLE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED2_SINGLE, fid_dst, NAME_DATASET_CHUNKED2_SINGLE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED3_SINGLE, fid_dst, NAME_DATASET_CHUNKED3_SINGLE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED4_SINGLE, fid_dst, NAME_DATASET_CHUNKED4_SINGLE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + + /* open the dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the 1-D destination dataset */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_EARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, buf1d) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the 1-D destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, buf1d) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the 2-D dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the destination dataset */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf1d) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* open the 2-D dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED3, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED3, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf2d) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the 2-D dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED2_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the destination dataset */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED2_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the 2-D dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED3_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the destination dataset */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED3_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the 2-D dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED4_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the destination dataset */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED4_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Pclose(pid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Pclose(pid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_chunked */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_chunked_empty * @@ -2606,17 +3604,17 @@ error: static int test_copy_dataset_chunked_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hsize_t max_dim1d[1]; /* Dataset max. dimensions */ - hsize_t dim2d[2]; /* Dataset dimensions */ - hsize_t chunk_dim1d[1] ={CHUNK_SIZE_1}; /* Chunk dimensions */ - hsize_t chunk_dim2d[2] ={CHUNK_SIZE_1, CHUNK_SIZE_2}; /* Chunk dimensions */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hsize_t max_dim1d[1]; /* Dataset max. dimensions */ + hsize_t dim2d[2]; /* Dataset dimensions */ + hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ + hsize_t chunk_dim2d[2] = {CHUNK_SIZE_1, CHUNK_SIZE_2}; /* Chunk dimensions */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): empty chunked dataset"); @@ -2624,133 +3622,474 @@ test_copy_dataset_chunked_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set 1-D dataspace dimensions */ - dim1d[0] = DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; max_dim1d[0] = H5S_UNLIMITED; /* create 1-D dataspace */ - if((sid = H5Screate_simple(1, dim1d, max_dim1d)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, max_dim1d)) < 0) + TEST_ERROR; + + /* create and set chunk plist */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 1, chunk_dim1d) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* close chunk plist */ + if (H5Pclose(pid) < 0) + TEST_ERROR; + + /* close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* + * create 1-D dataset: chunked, empty, non-filtered, + * dims=max dims=chunk dims, H5D_ALLOC_TIME_INC(default) + */ + + /* Set 1-D dataspace dimensions */ + dim1d[0] = DIM_SIZE_1; + + /* create 1-D dataspace */ + if ((sid = H5Screate_simple(1, dim1d, dim1d)) < 0) + TEST_ERROR; + + /* create and set chunk plist */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 1, dim1d) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED_SINGLE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* close chunk plist */ + if (H5Pclose(pid) < 0) + TEST_ERROR; + + /* close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Set 2-D dataspace dimensions */ + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; + + /* create 2-D dataspace */ + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create and set chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, chunk_dim2d) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED2, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Set allocation time to early */ + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_EARLY) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED3, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* close chunk plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* + * create 2-D dataset: chunked, empty, non-filtered, + * dims=chunk dims, H5D_ALLOC_TIME_INC (default) + */ /* Set 2-D dataspace dimensions */ dim2d[0] = DIM_SIZE_1; dim2d[1] = DIM_SIZE_2; /* create 2-D dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create and set chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 2, chunk_dim2d) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, dim2d) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED2_SINGLE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* + * create 2-D dataset: chunked, empty, non-filtered, dims=chunk dims + * H5D_ALLOC_TIME_EARLY + */ + /* Set allocation time to early */ + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_EARLY) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED2, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED3_SINGLE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* close chunk plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; - /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + /* + * create 2-D dataset: chunked, empty, non-filtered, + * dims=max dims=chunk dims, H5D_ALLOC_TIME_LATE + */ + + /* Set 2-D dataspace dimensions */ + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; + + /* create 2-D dataspace */ + if ((sid = H5Screate_simple(2, dim2d, dim2d)) < 0) + TEST_ERROR; + + /* create and set chunk plist */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, dim2d) < 0) + TEST_ERROR; + + /* Set allocation time to late */ + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_LATE) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED4_SINGLE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close chunk plist */ + if (H5Pclose(pid) < 0) + TEST_ERROR; + + /* close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the datasets from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Ocopy(fid_src, NAME_DATASET_CHUNKED2, fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED_SINGLE, fid_dst, NAME_DATASET_CHUNKED_SINGLE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED2, fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED2_SINGLE, fid_dst, NAME_DATASET_CHUNKED2_SINGLE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED3, fid_dst, NAME_DATASET_CHUNKED3, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED3_SINGLE, fid_dst, NAME_DATASET_CHUNKED3_SINGLE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED4_SINGLE, fid_dst, NAME_DATASET_CHUNKED4_SINGLE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + + /* open the dataset NAME_DATASET_CHUNKED in SRC file */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the copied dataset NAME_DATASET_CHUNKED at destination */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_EARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; - /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) TEST_ERROR + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; - /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) TEST_ERROR + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the dataset NAME_DATASET_CHUNKED_SINGLE in SRC file */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the copied dataset NAME_DATASET_CHUNKED_SINGLE at destination */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; - /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) TEST_ERROR + /* open the dataset NAME_DATASET_CHUNKED2 in SRC file */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) + TEST_ERROR; - /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) TEST_ERROR + /* open the copied dataset NAME_DATASET_CHUNKED2 at destination */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the dataset "NAME_DATASET_CHUNKED2_SINGLE in SRC file */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED2_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the copied dataset NAME_DATASET_CHUNKED2_SINGLE at destination */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED2_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the dataset NAME_DATASET_CHUNKED3 in SRC file */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED3, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the copied dataset NAME_DATASET_CHUNKED3 at destination */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED3, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the dataset NAME_DATASET_CHUNKED3_SINGLE in SRC file */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED3_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the copied dataset NAME_DATASET_CHUNKED3_SINGLE at destination */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED3_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the dataset NAME_DATASET_CHUNKED4_SINGLE in SRC file */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED4_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the copied dataset NAME_DATASET_CHUNKED4_SINGLE at destination */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED4_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Pclose(pid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Pclose(pid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_chunked_empty */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_chunked_sparse * @@ -2768,185 +4107,370 @@ error: static int test_copy_dataset_chunked_sparse(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hsize_t new_dim1d[1]; /* Dataset dimensions */ - hsize_t max_dim1d[1]; /* Dataset max. dimensions */ - hsize_t dim2d[2]; /* Dataset dimensions */ - hsize_t new_dim2d[2]; /* Dataset dimensions */ - hsize_t max_dim2d[2]; /* Dataset max. dimensions */ - hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ - hsize_t chunk_dim2d[2] = {CHUNK_SIZE_1, CHUNK_SIZE_2}; /* Chunk dimensions */ - float buf1d[DIM_SIZE_1]; /* Buffer for writing data */ - float buf2d[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ - int i, j; /* Local index variables */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hsize_t new_dim1d[1]; /* Dataset dimensions */ + hsize_t max_dim1d[1]; /* Dataset max. dimensions */ + hsize_t dim2d[2]; /* Dataset dimensions */ + hsize_t new_dim2d[2]; /* Dataset dimensions */ + hsize_t max_dim2d[2]; /* Dataset max. dimensions */ + hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ + hsize_t chunk_dim2d[2] = {CHUNK_SIZE_1, CHUNK_SIZE_2}; /* Chunk dimensions */ + float buf1d[DIM_SIZE_1]; /* Buffer for writing data */ + float buf2d[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + int i, j; /* Local index variables */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): sparse dataset"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) { - buf1d[i] = (float)(i / 10.0); - for(j = 0; j < DIM_SIZE_2; j++) - buf2d[i][j] = (float)(i + (j / 100.0)); + for (i = 0; i < DIM_SIZE_1; i++) { + buf1d[i] = (float)i / 10.0F; + for (j = 0; j < DIM_SIZE_2; j++) + buf2d[i][j] = (float)i + ((float)j / 100.0F); } /* end for */ /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set 1-D dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; - max_dim1d[0]=H5S_UNLIMITED; + dim1d[0] = DIM_SIZE_1; + max_dim1d[0] = H5S_UNLIMITED; /* create 1-D dataspace */ - if((sid = H5Screate_simple(1, dim1d, max_dim1d)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, max_dim1d)) < 0) + TEST_ERROR; /* create and set chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 1, chunk_dim1d) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* write data into file */ + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1d) < 0) + TEST_ERROR; + + /* close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; + + /* Set extended dataset dimensions */ + new_dim1d[0] = DIM_SIZE_1 * 2; + + /* Extend dataset's dimensions */ + if (H5Dset_extent(did, new_dim1d) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Change 1-D dataspace dimensions */ + dim1d[0] = DIM_SIZE_1; + max_dim1d[0] = MAX_DIM_SIZE_1; + + /* create 1-D dataspace */ + if ((sid = H5Screate_simple(1, dim1d, max_dim1d)) < 0) + TEST_ERROR; + + /* Set allocation time to early */ + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_EARLY) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED3, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* close chunk plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1d) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1d) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* Set extended dataset dimensions */ new_dim1d[0] = DIM_SIZE_1 * 2; /* Extend dataset's dimensions */ - if(H5Dset_extent(did, new_dim1d) < 0) TEST_ERROR + if (H5Dset_extent(did, new_dim1d) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* Set 2-D dataspace dimensions */ - dim2d[0]=DIM_SIZE_1; - dim2d[1]=DIM_SIZE_2; - max_dim2d[0]=H5S_UNLIMITED; - max_dim2d[1]=H5S_UNLIMITED; + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; + max_dim2d[0] = H5S_UNLIMITED; + max_dim2d[1] = H5S_UNLIMITED; /* create 2-D dataspace */ - if((sid = H5Screate_simple(2, dim2d, max_dim2d)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, max_dim2d)) < 0) + TEST_ERROR; /* create and set chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 2, chunk_dim2d) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, chunk_dim2d) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED2, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* write data into file */ + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2d) < 0) + TEST_ERROR; + + /* close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; + + /* Set extended dataset dimensions */ + new_dim2d[0] = DIM_SIZE_1 * 2; + new_dim2d[1] = DIM_SIZE_2 * 2; + + /* Extend dataset's dimensions */ + if (H5Dset_extent(did, new_dim2d) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Change 2-D dataspace dimensions */ + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; + max_dim2d[0] = MAX_DIM_SIZE_1; + max_dim2d[1] = MAX_DIM_SIZE_2; + + /* create 2-D dataspace */ + if ((sid = H5Screate_simple(2, dim2d, max_dim2d)) < 0) + TEST_ERROR; + + /* Set allocation time to early */ + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_EARLY) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED2, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED4, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* close chunk plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2d) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2d) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* Set extended dataset dimensions */ new_dim2d[0] = DIM_SIZE_1 * 2; new_dim2d[1] = DIM_SIZE_2 * 2; /* Extend dataset's dimensions */ - if(H5Dset_extent(did, new_dim2d) < 0) TEST_ERROR + if (H5Dset_extent(did, new_dim2d) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the datasets from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Ocopy(fid_src, NAME_DATASET_CHUNKED2, fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED2, fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED3, fid_dst, NAME_DATASET_CHUNKED3, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED4, fid_dst, NAME_DATASET_CHUNKED4, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + + /* open the dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the destination dataset */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_EARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the destination dataset */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_BT2, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED3, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED3, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED4, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED4, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Check if the array index type is correct */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Pclose(pid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Pclose(pid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_chunked_sparse */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_compressed * @@ -2964,105 +4488,386 @@ static int test_copy_dataset_compressed(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { #ifdef H5_HAVE_FILTER_DEFLATE - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hsize_t dim2d[2]; /* Dataset dimensions */ - hsize_t chunk_dim2d[2] ={CHUNK_SIZE_1, CHUNK_SIZE_2}; /* Chunk dimensions */ - float buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ - int i, j; /* Local index variables */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hsize_t dim2d[2]; /* Dataset dimensions */ + hsize_t chunk_dim2d[2] = {CHUNK_SIZE_1, CHUNK_SIZE_2}; /* Chunk dimensions */ + float buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + int i, j; /* Local index variables */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; #endif /* H5_HAVE_FILTER_DEFLATE */ TESTING("H5Ocopy(): compressed dataset"); #ifndef H5_HAVE_FILTER_DEFLATE + (void)fcpl_src; + (void)fcpl_dst; + (void)src_fapl; + (void)dst_fapl; /* Silence compiler */ SKIPPED(); - puts(" Deflation filter not available"); -#else /* H5_HAVE_FILTER_DEFLATE */ + HDputs(" Deflation filter not available"); +#else /* H5_HAVE_FILTER_DEFLATE */ /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = (float)(100.0); /* Something easy to compress */ + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 100.0F; /* Something easy to compress */ /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim2d[0]=DIM_SIZE_1; - dim2d[1]=DIM_SIZE_2; + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; /* create dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create and set comp & chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 2, chunk_dim2d) < 0) TEST_ERROR - if(H5Pset_deflate(pid, 9) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, chunk_dim2d) < 0) + TEST_ERROR; + if (H5Pset_deflate(pid, 9) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* write data into file */ + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Set allocation time to early */ + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_EARLY) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED2, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* close chunk plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; - /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + /* + * create 2-D dataset: chunked, filtered, with data + * dims=max dims=chunk dims, H5D_ALLOC_TIME_INC(default) + */ + /* create dataspace */ + if ((sid = H5Screate_simple(2, dim2d, dim2d)) < 0) + TEST_ERROR; + + /* create and set comp & chunk plist */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, dim2d) < 0) + TEST_ERROR; + if (H5Pset_deflate(pid, 9) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED2_SINGLE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* write data into file */ + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* + * create 2-D dataset: chunked, filtered, with data + * dims=chunk dims, H5D_ALLOC_TIME_EARLY + */ + /* create dataspace */ + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; + + /* Set allocation time to early */ + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_EARLY) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED3_SINGLE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* close chunk plist */ + if (H5Pclose(pid) < 0) + TEST_ERROR; + /* write data into file */ + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + + /* close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* + * create 2-D dataset: chunked, filtered, with data + * dims=chunk dims, H5D_ALLOC_TIME_LATE + */ + /* create dataspace */ + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; + + /* create and set comp & chunk plist */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, dim2d) < 0) + TEST_ERROR; + if (H5Pset_deflate(pid, 9) < 0) + TEST_ERROR; + + /* Set allocation time to late */ + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_LATE) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED4_SINGLE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* close chunk plist */ + if (H5Pclose(pid) < 0) + TEST_ERROR; + + /* write data into file */ + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + + /* close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED2, fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED2_SINGLE, fid_dst, NAME_DATASET_CHUNKED2_SINGLE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED3_SINGLE, fid_dst, NAME_DATASET_CHUNKED3_SINGLE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED4_SINGLE, fid_dst, NAME_DATASET_CHUNKED4_SINGLE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if (H5Fclose(fid_src) < 0) + TEST_ERROR; + + /* Re-open the source and destination files for verification */ + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; + + /* open the dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the destination dataset */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; + + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) + TEST_ERROR; + + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the dataset NAME_DATASET_CHUNKED2_SINGLE at source */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED2_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the copied dataset NAME_DATASET_CHUNKED2_SINGLE at destination */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED2_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the dataset NAME_DATASET_CHUNKED3_SINGLE at source */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED3_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the copied dataset NAME_DATASET_CHUNKED3_SINGLE at destination */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED3_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the dataset NAME_DATASET_CHUNKED4_SINGLE at source */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED4_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the copied dataset NAME_DATASET_CHUNKED4_SINGLE at destination */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED4_SINGLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); #endif /* H5_HAVE_FILTER_DEFLATE */ @@ -3070,24 +4875,215 @@ test_copy_dataset_compressed(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid #ifdef H5_HAVE_FILTER_DEFLATE error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Pclose(pid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Pclose(pid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; #endif /* H5_HAVE_FILTER_DEFLATE */ } /* end test_copy_dataset_compressed */ - +/*------------------------------------------------------------------------- + * Function: test_copy_dataset_no_edge_filt + * + * Purpose: Create a compressed, chunked dataset in SRC file and copy it to DST file + * + * Note: The parameter "test_open" is added to test for H5Ocopy when + * the dataset is open in the file (HDFFV-7853). + * + * Return: Success: 0 + * Failure: number of errors + * + * Programmer: Neil Fortner + * Tuesday, May 11, 2010 + * Mostly copied from test_copy_dataset_compressed, by + * Quincey Koziol + * + *------------------------------------------------------------------------- + */ +static int +test_copy_dataset_no_edge_filt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, + hbool_t test_open) +{ +#ifdef H5_HAVE_FILTER_DEFLATE + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hsize_t dim2d[2]; /* Dataset dimensions */ + hsize_t chunk_dim2d[2] = {CHUNK_SIZE_1, CHUNK_SIZE_2}; /* Chunk dimensions */ + float buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + int i, j; /* Local index variables */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; +#endif /* H5_HAVE_FILTER_DEFLATE */ + + if (test_open) { + TESTING("H5Ocopy(): compressed and opened dataset with no edge filters"); + } + else { + TESTING("H5Ocopy(): compressed dataset with no edge filters"); + } + +#ifndef H5_HAVE_FILTER_DEFLATE + (void)fcpl_src; + (void)fcpl_dst; + (void)src_fapl; + (void)dst_fapl; /* Silence compiler */ + SKIPPED(); + HDputs(" Deflation filter not available"); +#else /* H5_HAVE_FILTER_DEFLATE */ + /* set initial data values */ + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 100.0F; /* Something easy to compress */ + + /* Initialize the filenames */ + h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); + h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); + + /* Reset file token checking info */ + token_reset(); + + /* create source file */ + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; + + /* Set dataspace dimensions */ + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; + + /* create dataspace */ + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; + + /* create and set comp & chunk plist, and disable partial chunk filters */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, chunk_dim2d) < 0) + TEST_ERROR; + if (H5Pset_deflate(pid, 9) < 0) + TEST_ERROR; + if (H5Pset_chunk_opts(pid, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0) + TEST_ERROR; + + /* create dataset */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* close chunk plist */ + if (H5Pclose(pid) < 0) + TEST_ERROR; + + /* write data into file */ + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + + /* close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; + + /* attach attributes to the dataset */ + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + + if (!test_open) { + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + TEST_ERROR; + + /* open the source file with read-only */ + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; + } + + /* create destination file */ + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; + + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* copy the dataset from SRC to DST */ + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + + if (!test_open) { + /* open the dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; + } + + /* open the destination dataset */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* H5Pset_chunk_opts() will set layout version to 4 which will use latest indexing available */ + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_FARRAY) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + TEST_ERROR; + + /* close the DST file */ + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + + PASSED(); +#endif /* H5_HAVE_FILTER_DEFLATE */ + return 0; + +#ifdef H5_HAVE_FILTER_DEFLATE +error: + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Pclose(pid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; + return 1; +#endif /* H5_HAVE_FILTER_DEFLATE */ +} /* end test_copy_dataset_no_edge_filt */ + /*------------------------------------------------------------------------- * Function: test_copy_dataset_compact * * Purpose: Create a compact dataset in SRC file and copy it to DST file * + * Note: The parameter "test_open" is added to test for H5Ocopy when + * the dataset is open in the file (HDFFV-7853). + * * Return: Success: 0 * Failure: number of errors * @@ -3097,117 +5093,150 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_dataset_compact(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) +test_copy_dataset_compact(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t test_open) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hsize_t dim2d[2]; /* Dataset dimensions */ - float buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ - int i, j; /* Local index variables */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - - TESTING("H5Ocopy(): compact dataset"); + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hsize_t dim2d[2]; /* Dataset dimensions */ + float buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + int i, j; /* Local index variables */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + + if (test_open) { + TESTING("H5Ocopy(): compact and opened dataset"); + } + else { + TESTING("H5Ocopy(): compact dataset"); + } /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = (float)(i+j/100.0); + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = (float)i + (float)j / 100.0F; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim2d[0]=DIM_SIZE_1; - dim2d[1]=DIM_SIZE_2; + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; /* create dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create and set compact plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_layout(pid, H5D_COMPACT) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_layout(pid, H5D_COMPACT) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_COMPACT, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_COMPACT, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* close chunk plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; - /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (!test_open) { + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; - /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + TEST_ERROR; - - /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + /* open the source file with read-only */ + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; + } /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_COMPACT, fid_dst, NAME_DATASET_COMPACT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_COMPACT, fid_dst, NAME_DATASET_COMPACT, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; - /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_COMPACT, H5P_DEFAULT)) < 0) TEST_ERROR + if (!test_open) { + /* open the dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_COMPACT, H5P_DEFAULT)) < 0) + TEST_ERROR; + } /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_COMPACT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_COMPACT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Pclose(pid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Pclose(pid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_compact */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_external * @@ -3219,122 +5248,143 @@ error: * Programmer: Peter Cao * Friday, September 30, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_dataset_external(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - int i; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + int i; hsize_t size; hsize_t dim1d[1]; - int buf[DIM_SIZE_1]; - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + int buf[DIM_SIZE_1]; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): external dataset"); /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = i; /* create an empty external file */ - HDfclose(HDfopen (FILE_EXT, "w")); + HDfclose(HDfopen(FILE_EXT, "w")); /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* set dataset creation plist */ - size = DIM_SIZE_1 * sizeof (int); - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_external(pid, FILE_EXT, (off_t)0, size) < 0) TEST_ERROR + size = DIM_SIZE_1 * sizeof(int); + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_external(pid, FILE_EXT, (off_t)0, size) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_EXTERNAL, H5T_NATIVE_INT, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_EXTERNAL, H5T_NATIVE_INT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close external plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_EXTERNAL, fid_dst, NAME_DATASET_EXTERNAL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_EXTERNAL, fid_dst, NAME_DATASET_EXTERNAL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_EXTERNAL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_EXTERNAL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_EXTERNAL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_EXTERNAL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Pclose(pid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Pclose(pid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_external */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_named_dtype * @@ -3352,110 +5402,134 @@ error: static int test_copy_dataset_named_dtype(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - int i; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + int i; hsize_t dim1d[1]; - int buf[DIM_SIZE_1]; - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + int buf[DIM_SIZE_1]; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): dataset that uses named datatype"); /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = i; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create named datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_NAMED_DTYPE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_NAMED_DTYPE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_NAMED_DTYPE, fid_dst, NAME_DATASET_NAMED_DTYPE, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_NAMED_DTYPE, fid_dst, NAME_DATASET_NAMED_DTYPE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_NAMED_DTYPE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_NAMED_DTYPE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_NAMED_DTYPE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_NAMED_DTYPE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Tclose(tid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Tclose(tid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_named_dtype */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_named_dtype_hier * @@ -3473,127 +5547,156 @@ error: static int test_copy_dataset_named_dtype_hier(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - int i; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + int i; hsize_t dim1d[1]; - int buf[DIM_SIZE_1]; - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + int buf[DIM_SIZE_1]; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): hier. of datasets using named datatype inside hier."); /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = i; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Create group to place all objects in */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create named datatype _inside_ hierarchy to copy */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((H5Tcommit2(gid, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(gid, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create first dataset at SRC file */ - if((did = H5Dcreate2(gid, NAME_DATASET_NAMED_DTYPE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, NAME_DATASET_NAMED_DTYPE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* create second dataset at SRC file */ - if((did = H5Dcreate2(gid, NAME_DATASET_NAMED_DTYPE2, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, NAME_DATASET_NAMED_DTYPE2, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the destination group */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the source group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did); - H5Tclose(tid); - H5Sclose(sid); - H5Gclose(gid2); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did); + H5Tclose(tid); + H5Sclose(sid); + H5Gclose(gid2); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_named_dtype_hier */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_named_dtype_hier_outside * @@ -3612,127 +5715,156 @@ error: static int test_copy_dataset_named_dtype_hier_outside(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - int i; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + int i; hsize_t dim1d[1]; - int buf[DIM_SIZE_1]; - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + int buf[DIM_SIZE_1]; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): hier. of datasets using named datatype outside hier."); /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = i; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Create group to place all objects in */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create named datatype _outside_ hierarchy to copy */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create first dataset at SRC file */ - if((did = H5Dcreate2(gid, NAME_DATASET_NAMED_DTYPE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, NAME_DATASET_NAMED_DTYPE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* create second dataset at SRC file */ - if((did = H5Dcreate2(gid, NAME_DATASET_NAMED_DTYPE2, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, NAME_DATASET_NAMED_DTYPE2, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the destination group */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the source group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did); - H5Tclose(tid); - H5Sclose(sid); - H5Gclose(gid2); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did); + H5Tclose(tid); + H5Sclose(sid); + H5Gclose(gid2); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_named_dtype_hier_outside */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_multi_ohdr_chunks * @@ -3740,6 +5872,9 @@ error: * creates lots of object header chunks in SRC file and copy * datasets to DST file * + * Note: The parameter "test_open" is added to test for H5Ocopy when + * the dataset is open in the file (HDFFV-7853). + * * Return: Success: 0 * Failure: number of errors * @@ -3749,124 +5884,166 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_dataset_multi_ohdr_chunks(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) +test_copy_dataset_multi_ohdr_chunks(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, + hbool_t test_open) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - int i; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + int i; hsize_t dim1d[1]; - int buf[DIM_SIZE_1]; - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + int buf[DIM_SIZE_1]; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; - TESTING("H5Ocopy(): datasets that have multiple ohdr chunks"); + if (test_open) { + TESTING("H5Ocopy(): opened datasets that have multiple ohdr chunks"); + } + else { + TESTING("H5Ocopy(): datasets that have multiple ohdr chunks"); + } /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = i; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Create group to place all objects in */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create first dataset at SRC file */ - if((did = H5Dcreate2(gid, NAME_DATASET_MULTI_OHDR, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, NAME_DATASET_MULTI_OHDR, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* create second dataset at SRC file */ - if((did2 = H5Dcreate2(gid, NAME_DATASET_MULTI_OHDR2, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dcreate2(gid, NAME_DATASET_MULTI_OHDR2, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* Add attributes to datasets in a way that creates lots of chunks */ - if(test_copy_attach_paired_attributes(did, did2, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_paired_attributes(did, did2, H5T_NATIVE_INT) < 0) + TEST_ERROR; - /* close the first dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + /* close dataspace */ + if (H5Sclose(sid) < 0) + TEST_ERROR; - /* close the second dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + /* close the first dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; - /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (!test_open) { - /* close group */ - if(H5Gclose(gid) < 0) TEST_ERROR + /* close the second dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; - /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + /* close group */ + if (H5Gclose(gid) < 0) + TEST_ERROR; + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + TEST_ERROR; - /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + /* open the source file with read-only */ + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; + } /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; - /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if (test_open) { + /* close the second dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + } + else + /* open the group for copy */ + if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the destination group */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the source group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Sclose(sid); - H5Gclose(gid2); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Sclose(sid); + H5Gclose(gid2); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_multi_ohdr_chunks */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_attr_named_dtype * @@ -3884,131 +6061,160 @@ error: static int test_copy_dataset_attr_named_dtype(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - int i; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + int i; hsize_t dim1d[1]; - int buf[DIM_SIZE_1]; - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + int buf[DIM_SIZE_1]; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): objects with attributes using named datatypes"); /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = i; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Create group to place all objects in */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create named datatype _outside_ hierarchy to copy */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create first dataset at SRC file */ - if((did = H5Dcreate2(gid, NAME_DATASET_MULTI_OHDR, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, NAME_DATASET_MULTI_OHDR, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* create second dataset at SRC file */ - if((did2 = H5Dcreate2(gid, NAME_DATASET_MULTI_OHDR2, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dcreate2(gid, NAME_DATASET_MULTI_OHDR2, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* Add attributes to datasets in a way that creates lots of chunks */ - if(test_copy_attach_paired_attributes(did, did2, tid) < 0) TEST_ERROR + if (test_copy_attach_paired_attributes(did, did2, tid) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the first dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the second dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the destination group */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the source group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Tclose(tid); - H5Sclose(sid); - H5Gclose(gid2); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Tclose(tid); + H5Sclose(sid); + H5Gclose(gid2); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_attr_named_dtype */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_contig_vl * @@ -4026,23 +6232,24 @@ error: static int test_copy_dataset_contig_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): contiguous dataset with VLEN datatype"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) { - buf[i].len = i+1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); - for(j = 0; j < buf[i].len; j++) + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].len = i + 1; + buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -4050,94 +6257,124 @@ test_copy_dataset_contig_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf); - H5Tclose(tid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Tclose(tid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_contig_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_chunked_vl * @@ -4155,25 +6392,26 @@ error: static int test_copy_dataset_chunked_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ - hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ + hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): chunked dataset with VLEN datatype"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) { - buf[i].len = i+1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); - for(j = 0; j < buf[i].len; j++) + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].len = i + 1; + buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -4181,101 +6419,179 @@ test_copy_dataset_chunked_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create and set chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 1, chunk_dim1d) < 0) + TEST_ERROR; + + /* create dataset at SRC file */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* write data into file */ + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Set allocation time to early */ + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_EARLY) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL2, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close chunk plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_VL2, fid_dst, NAME_DATASET_VL2, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; + + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL2, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the destination dataset */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL2, H5P_DEFAULT)) < 0) + TEST_ERROR; + + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf); - H5Tclose(tid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Pclose(pid); + H5Tclose(tid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_chunked_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_compact_vl * @@ -4293,24 +6609,25 @@ error: static int test_copy_dataset_compact_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): compact dataset with VLEN datatype"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) { - buf[i].len = i+1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); - for(j = 0; j < buf[i].len; j++) + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].len = i + 1; + buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -4318,101 +6635,134 @@ test_copy_dataset_compact_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create and set compact plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_layout(pid, H5D_COMPACT) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_layout(pid, H5D_COMPACT) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close compact plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf); - H5Tclose(tid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Tclose(tid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_compact_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_attribute_vl * @@ -4430,13 +6780,13 @@ error: static int test_copy_attribute_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hid_t aid = -1, aid2 = -1; /* Attribute IDs */ - hsize_t dim2d[2]; /* Dataset dimensions */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t aid = -1, aid2 = -1; /* Attribute IDs */ + hsize_t dim2d[2]; /* Dataset dimensions */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): variable length attribute"); @@ -4444,90 +6794,467 @@ test_copy_attribute_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ dim2d[0] = DIM_SIZE_1; dim2d[1] = DIM_SIZE_2; /* create 2D dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create 2D int dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* attach VL attribute to the dataset */ - if(test_copy_attach_attribute_vl(did) < 0) TEST_ERROR + if (test_copy_attach_attribute_vl(did) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the attributes are equal */ - if((aid = H5Aopen_by_idx(did, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if((aid2 = H5Aopen_by_idx(did2, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(compare_attribute(aid, aid2, H5P_DEFAULT, NULL, did) != TRUE) TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR - if(H5Aclose(aid2) < 0) TEST_ERROR + if ((aid = H5Aopen_by_idx(did, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((aid2 = H5Aopen_by_idx(did2, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (compare_attribute(aid, aid2, H5P_DEFAULT, NULL, did) != TRUE) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; + if (H5Aclose(aid2) < 0) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Aclose(aid2); H5Aclose(aid); - H5Dclose(did2); - H5Dclose(did); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5Dclose(did2); + H5Dclose(did); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_simple_empty */ - +/*------------------------------------------------------------------------- + * Function: attach_attribute_compound_vlstr + * + * Purpose: Attach a compound datatype with a variable length string to the object + * + * Return: Non-negative on success/Negative on failure + * + * Programmer: Vailin Choi; Aug 2016 + * + *------------------------------------------------------------------------- + */ +static int +attach_attribute_compound_vlstr(hid_t loc_id) +{ + hid_t aid = -1; /* Attribute ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t tid = -1; /* Datatype ID */ + hid_t vl_str_tid = -1; /* Variable length string datatype ID */ + hid_t cmpd_tid = -1; /* Compound datatype ID */ + hsize_t dim1 = 1; /* Dimension size */ + typedef struct { /* Compound structure for the attribute */ + int i; + char *v; + } s1; + size_t len; + s1 buf = {0, NULL}; /* Buffer */ + int ret_value = -1; /* Return value */ + + /* Create dataspace */ + if ((sid = H5Screate_simple(1, &dim1, NULL)) < 0) + goto done; + + /* Create an integer datatype */ + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + goto done; + + /* Create a variable length string */ + if ((vl_str_tid = H5Tcopy(H5T_C_S1)) < 0) + goto done; + if (H5Tset_size(vl_str_tid, H5T_VARIABLE) < 0) + goto done; + + /* Create a compound datatype with a variable length string and an integer */ + if ((cmpd_tid = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) + goto done; + if (H5Tinsert(cmpd_tid, "i", HOFFSET(s1, i), tid) < 0) + goto done; + if (H5Tinsert(cmpd_tid, "v", HOFFSET(s1, v), vl_str_tid) < 0) + goto done; + + /* Attach an attribute to the object */ + if ((aid = H5Acreate2(loc_id, "attr_cmpd_vlstr", cmpd_tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + goto done; + + /* Write to the attribute */ + len = HDstrlen(ATTR_CMPD_STRING) + 1; + buf.i = 9; + if (NULL == (buf.v = (char *)HDcalloc(len, sizeof(char)))) + goto done; + HDstrncpy(buf.v, ATTR_CMPD_STRING, len); + if (H5Awrite(aid, cmpd_tid, &buf) < 0) + goto done; + + ret_value = 0; + +done: + if (sid > 0) + H5Sclose(sid); + if (tid > 0) + H5Tclose(tid); + if (vl_str_tid > 0) + H5Tclose(vl_str_tid); + if (cmpd_tid > 0) + H5Tclose(cmpd_tid); + if (aid > 0) + H5Aclose(aid); + + HDfree(buf.v); + + return ret_value; +} /* attach_attribute_compound_vlstr */ + +/*------------------------------------------------------------------------- + * Function: compare_attribute_compound_vlstr + * + * Purpose: Compare data of the attributes attached to the two objects. + * The attribute is a compound datatype with a variable length string. + * + * Return: Non-negative on success/Negative on failure + * + * Programmer: Vailin Choi; Aug 2016 + * + *------------------------------------------------------------------------- + */ +static int +compare_attribute_compound_vlstr(hid_t loc, hid_t loc2) +{ + hid_t aid = -1, aid2 = -1; /* Attribute IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype IDs */ + hid_t sid = -1, sid2 = -1; /* Dataspace IDs */ + hid_t dxpl_id = -1; + typedef struct { /* Compound structure for the attribute */ + int i; + char *v; + } s1; + s1 rbuf; /* Buffer for data read */ + s1 rbuf2; /* Buffer for data read */ + + /* Open the attributes attached to the objects */ + if ((aid = H5Aopen_by_idx(loc, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + if ((aid2 = H5Aopen_by_idx(loc2, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + + /* Get the attributes' datatypes */ + if ((tid = H5Aget_type(aid)) < 0) + FAIL_STACK_ERROR; + if ((tid2 = H5Aget_type(aid2)) < 0) + FAIL_STACK_ERROR; + + /* Get the attributes' dataspaces */ + if ((sid = H5Aget_space(aid)) < 0) + FAIL_STACK_ERROR; + if ((sid2 = H5Aget_space(aid2)) < 0) + FAIL_STACK_ERROR; + + /* Read the attributes */ + if (H5Aread(aid, tid, &rbuf) < 0) + FAIL_STACK_ERROR; + if (H5Aread(aid2, tid2, &rbuf2) < 0) + FAIL_STACK_ERROR; + + /* Compare the attributes' data */ + if (rbuf.i != rbuf2.i) + FAIL_STACK_ERROR; + if (HDstrlen(rbuf.v) != HDstrlen(rbuf2.v)) + FAIL_STACK_ERROR; + if (HDmemcmp(rbuf.v, rbuf2.v, HDstrlen(rbuf.v)) != 0) + FAIL_STACK_ERROR; + + /* Reclaim vlen buffer */ + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid, sid, dxpl_id, &rbuf) < 0) + TEST_ERROR; + if (H5Treclaim(tid, sid, dxpl_id, &rbuf2) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + + /* Close the dataspaces */ + if (H5Sclose(sid) < 0) + FAIL_STACK_ERROR; + if (H5Sclose(sid2) < 0) + FAIL_STACK_ERROR; + + /* Close the attributes */ + if (H5Aclose(aid) < 0) + FAIL_STACK_ERROR; + if (H5Aclose(aid2) < 0) + FAIL_STACK_ERROR; + return TRUE; + +error: + H5E_BEGIN_TRY + { + H5Aclose(aid); + H5Aclose(aid2); + H5Treclaim(tid, sid, H5P_DEFAULT, &rbuf); + H5Treclaim(tid, sid, H5P_DEFAULT, &rbuf2); + H5Sclose(sid); + H5Sclose(sid2); + H5Tclose(tid); + H5Tclose(tid2); + H5Pclose(dxpl_id); + } + H5E_END_TRY; + return FALSE; + +} /* compare_attribute_compound_vlstr() */ + +/*------------------------------------------------------------------------- + * Function: test_copy_attribute_compound_vlstr + * + * Purpose: Create a simple dataset and a group in SRC file. + * Both has an attribute with a compound datatype consisting + * of a variable length string + * Copy the dataset and the group to DST file + * This is for HDFFV-7991 + * + * Return: Success: 0 + * Failure: number of errors + * + * Programmer: + * + *------------------------------------------------------------------------- + */ +static int +test_copy_attribute_compound_vlstr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) +{ + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t aid = -1, aid2 = -1; /* Attribute IDs */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + hsize_t dim2d[2]; /* Dataset dimensions */ + char src_filename[NAME_BUF_SIZE]; /* Source file name */ + char dst_filename[NAME_BUF_SIZE]; /* Destination file name */ + + TESTING("H5Ocopy(): attribute with compound datatype consisting of variable length string"); + + /* Initialize the filenames */ + h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); + h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); + + /* Reset file token checking info */ + token_reset(); + + /* create source file */ + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + FAIL_STACK_ERROR; + + /* set dataspace dimensions */ + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; + + /* create 2D dataspace */ + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + FAIL_STACK_ERROR; + + /* create 2D int dataset at SRC file */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + + /* close dataspace */ + if (H5Sclose(sid) < 0) + FAIL_STACK_ERROR; + + /* attach an attribute to the dataset */ + if (attach_attribute_compound_vlstr(did) < 0) + FAIL_STACK_ERROR; + + /* close the dataset */ + if (H5Dclose(did) < 0) + FAIL_STACK_ERROR; + + /* create a group */ + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_EMPTY, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + + /* attach attribute to the group */ + if (attach_attribute_compound_vlstr(gid) < 0) + FAIL_STACK_ERROR; + + /* close the group */ + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR; + + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + FAIL_STACK_ERROR; + + /* open the source file with read-only */ + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + FAIL_STACK_ERROR; + + /* create destination file */ + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + FAIL_STACK_ERROR; + + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + + /* copy the dataset from SRC to DST */ + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; + + /* open the src dataset */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + + /* open the destination dataset */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + + /* compare the data of the attributes attached to the two datasets */ + if (compare_attribute_compound_vlstr(did, did2) < 0) + FAIL_STACK_ERROR; + + /* close the datasets */ + if (H5Dclose(did2) < 0) + FAIL_STACK_ERROR; + if (H5Dclose(did) < 0) + FAIL_STACK_ERROR; + + /* Copy the group */ + if (H5Ocopy(fid_src, NAME_GROUP_EMPTY, fid_dst, NAME_GROUP_EMPTY, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; + + /* Open the src group */ + if ((gid = H5Gopen2(fid_src, NAME_GROUP_EMPTY, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + /* Open the destination group */ + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_EMPTY, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + + /* compare the data of the attributes attached to the two groups */ + if (compare_attribute_compound_vlstr(gid, gid2) < 0) + FAIL_STACK_ERROR; + + /* close the groups */ + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR; + if (H5Gclose(gid2) < 0) + FAIL_STACK_ERROR; + + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + FAIL_STACK_ERROR; + + /* close the DST file */ + if (H5Fclose(fid_dst) < 0) + FAIL_STACK_ERROR; + + PASSED(); + return 0; + +error: + H5E_BEGIN_TRY + { + H5Aclose(aid2); + H5Aclose(aid); + H5Dclose(did2); + H5Dclose(did); + H5Gclose(gid); + H5Gclose(gid2); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; + return 1; +} /* end test_copy_attribute_compound_vlstr() */ + /*------------------------------------------------------------------------- * Function: test_copy_dataset_compressed_vl * @@ -4546,30 +7273,35 @@ static int test_copy_dataset_compressed_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { #ifdef H5_HAVE_FILTER_DEFLATE - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t tid = -1; /* Datatype ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hsize_t dim2d[2]; /* Dataset dimensions */ - hsize_t chunk_dim2d[2] ={CHUNK_SIZE_1, CHUNK_SIZE_2}; /* Chunk dimensions */ - hvl_t buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ - int i, j, k; /* Local index variables */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t tid = -1; /* Datatype ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + hsize_t dim2d[2]; /* Dataset dimensions */ + hsize_t chunk_dim2d[2] = {CHUNK_SIZE_1, CHUNK_SIZE_2}; /* Chunk dimensions */ + hvl_t buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + int i, j, k; /* Local index variables */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; #endif /* H5_HAVE_FILTER_DEFLATE */ TESTING("H5Ocopy(): compressed dataset with VLEN datatype"); #ifndef H5_HAVE_FILTER_DEFLATE + (void)fcpl_src; + (void)fcpl_dst; + (void)src_fapl; + (void)dst_fapl; /* Silence compiler */ SKIPPED(); - puts(" Deflation filter not available"); -#else /* H5_HAVE_FILTER_DEFLATE */ + HDputs(" Deflation filter not available"); +#else /* H5_HAVE_FILTER_DEFLATE */ /* set initial data values */ for (i = 0; i < DIM_SIZE_1; i++) { for (j = 0; j < DIM_SIZE_2; j++) { buf[i][j].len = (size_t)(j + 1); - buf[i][j].p = (int *)HDmalloc(buf[i][j].len * sizeof(int)); + buf[i][j].p = (int *)HDmalloc(buf[i][j].len * sizeof(int)); for (k = 0; k < (int)buf[i][j].len; k++) ((int *)buf[i][j].p)[k] = i * 10000 + j * 100 + k; } @@ -4579,84 +7311,117 @@ test_copy_dataset_compressed_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim2d[0]=DIM_SIZE_1; - dim2d[1]=DIM_SIZE_2; + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; /* create dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create and set comp & chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 2, chunk_dim2d) < 0) TEST_ERROR - if(H5Pset_deflate(pid, 9) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, chunk_dim2d) < 0) + TEST_ERROR; + if (H5Pset_deflate(pid, 9) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close chunk plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); #endif /* H5_HAVE_FILTER_DEFLATE */ @@ -4664,21 +7429,23 @@ test_copy_dataset_compressed_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, #ifdef H5_HAVE_FILTER_DEFLATE error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Pclose(pid); - H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf); - H5Tclose(tid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Pclose(pid); + H5Treclaim(tid, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Tclose(tid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; #endif /* H5_HAVE_FILTER_DEFLATE */ } /* end test_copy_dataset_compressed_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_group_empty * @@ -4690,17 +7457,15 @@ error: * Programmer: Peter Cao * Friday, September 30, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_group_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): empty group"); @@ -4708,72 +7473,89 @@ test_copy_group_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create group at the SRC file */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_EMPTY, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_EMPTY, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* attach attributes to the group */ - if(test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the group from SRC to DST */ - if(H5Ocopy(fid_src, NAME_GROUP_EMPTY, fid_dst, NAME_GROUP_EMPTY, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_EMPTY, fid_dst, NAME_GROUP_EMPTY, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_EMPTY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_EMPTY, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_EMPTY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_EMPTY, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the destination group */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the source group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Gclose(gid2); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Gclose(gid2); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_group_empty */ - /*------------------------------------------------------------------------- * Function: test_copy_root_group * @@ -4785,116 +7567,142 @@ error: * Programmer: Peter Cao * August 8, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_root_group(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - hid_t gid_sub = -1; /* Sub-group ID */ + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + hid_t gid_sub = -1; /* Sub-group ID */ hsize_t dim2d[2]; - int buf[DIM_SIZE_1][DIM_SIZE_2]; - int i, j; - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + int buf[DIM_SIZE_1][DIM_SIZE_2]; + int i, j; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): root group"); /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = 10000 + 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create group at the SRC file */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* attach attributes to the group */ - if(test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* Set dataspace dimensions */ dim2d[0] = DIM_SIZE_1; dim2d[1] = DIM_SIZE_2; /* create dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* add a dataset to the group */ - if((did = H5Dcreate2(fid_src, NAME_GROUP_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_GROUP_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* create a sub-group */ - if((gid_sub = H5Gcreate2(fid_src, NAME_GROUP_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Gclose(gid_sub) < 0) TEST_ERROR + if ((gid_sub = H5Gcreate2(fid_src, NAME_GROUP_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Gclose(gid_sub) < 0) + TEST_ERROR; /* create another sub-group */ - if((gid_sub = H5Gcreate2(fid_src, NAME_GROUP_SUB_2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Gclose(gid_sub) < 0) TEST_ERROR + if ((gid_sub = H5Gcreate2(fid_src, NAME_GROUP_SUB_2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Gclose(gid_sub) < 0) + TEST_ERROR; /* close the group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the group from SRC to DST */ - if(H5Ocopy(fid_src, "/", fid_dst, "/root_from_src", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, "/", fid_dst, "/root_from_src", H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, "/", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, "/root_from_src", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gopen2(fid_dst, "/root_from_src", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the destination group */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the source group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(sid); H5Dclose(did); H5Gclose(gid_sub); @@ -4902,11 +7710,11 @@ error: H5Gclose(gid); H5Fclose(fid_dst); H5Fclose(fid_src); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_root_group */ - /*------------------------------------------------------------------------- * Function: test_copy_group * @@ -4918,129 +7726,154 @@ error: * Programmer: Peter Cao * Friday, September 30, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_group(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - hid_t gid_sub = -1; /* Sub-group ID */ + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + hid_t gid_sub = -1; /* Sub-group ID */ hsize_t dim2d[2]; - int buf[DIM_SIZE_1][DIM_SIZE_2]; - int i, j; - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + int buf[DIM_SIZE_1][DIM_SIZE_2]; + int i, j; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): simple nested groups"); /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = 10000 + 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create group at the SRC file */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* attach attributes to the group */ - if(test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim2d[0]=DIM_SIZE_1; - dim2d[1]=DIM_SIZE_2; + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; /* create dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* add a dataset to the group */ - if((did = H5Dcreate2(fid_src, NAME_GROUP_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_GROUP_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* create a sub-group */ - if((gid_sub = H5Gcreate2(fid_src, NAME_GROUP_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if( H5Gclose(gid_sub) < 0) TEST_ERROR + if ((gid_sub = H5Gcreate2(fid_src, NAME_GROUP_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Gclose(gid_sub) < 0) + TEST_ERROR; /* create another sub-group */ - if((gid_sub = H5Gcreate2(fid_src, NAME_GROUP_SUB_2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if( H5Gclose(gid_sub) < 0) TEST_ERROR + if ((gid_sub = H5Gcreate2(fid_src, NAME_GROUP_SUB_2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Gclose(gid_sub) < 0) + TEST_ERROR; /* close the group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the group from SRC to DST */ - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the destination group */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the source group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Sclose(sid); - H5Dclose(did); - H5Gclose(gid_sub); - H5Gclose(gid2); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Sclose(sid); + H5Dclose(did); + H5Gclose(gid_sub); + H5Gclose(gid2); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_group */ - /*------------------------------------------------------------------------- * Function: test_copy_group_deep * @@ -5057,132 +7890,159 @@ error: static int test_copy_group_deep(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - hid_t gid_sub = -1, gid_sub2; /* Sub-group IDs */ + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + hid_t gid_sub = -1, gid_sub2; /* Sub-group IDs */ hsize_t dim2d[2]; - int buf[DIM_SIZE_1][DIM_SIZE_2]; - int i, j, k; /* Local index variables */ - char objname[NAME_BUF_SIZE]; /* Sub-group & dataset name buffer */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + int buf[DIM_SIZE_1][DIM_SIZE_2]; + int i, j, k; /* Local index variables */ + char objname[NAME_BUF_SIZE]; /* Sub-group & dataset name buffer */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): deep nested groups"); /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = 10000 + 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create group at the SRC file */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* attach attributes to the group */ - if(test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim2d[0]=DIM_SIZE_1; - dim2d[1]=DIM_SIZE_2; + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; /* create dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create nested sub-groups & datasets */ - for(i = 0; i < NUM_SUB_GROUPS; i++) { - sprintf(objname, "Group #%d", i); - if((gid_sub = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + for (i = 0; i < NUM_SUB_GROUPS; i++) { + HDsnprintf(objname, sizeof(objname), "Group #%d", i); + if ((gid_sub = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; - for(j = 0; j < NUM_SUB_GROUPS; j++) { - sprintf(objname, "Group #%d", j); - if((gid_sub2 = H5Gcreate2(gid_sub, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + for (j = 0; j < NUM_SUB_GROUPS; j++) { + HDsnprintf(objname, sizeof(objname), "Group #%d", j); + if ((gid_sub2 = H5Gcreate2(gid_sub, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; - for(k = 0; k < NUM_DATASETS; k++) { - sprintf(objname, "Dataset #%d", k); + for (k = 0; k < NUM_DATASETS; k++) { + HDsnprintf(objname, sizeof(objname), "Dataset #%d", k); /* add a dataset to the group */ - if((did = H5Dcreate2(gid_sub2, objname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid_sub2, objname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; } /* end for */ - if(H5Gclose(gid_sub2) < 0) TEST_ERROR + if (H5Gclose(gid_sub2) < 0) + TEST_ERROR; } /* end for */ - if(H5Gclose(gid_sub) < 0) TEST_ERROR + if (H5Gclose(gid_sub) < 0) + TEST_ERROR; } /* end for */ /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the group from SRC to DST */ - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the destination group */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the source group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Sclose(sid); - H5Dclose(did); - H5Gclose(gid_sub); - H5Gclose(gid2); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Sclose(sid); + H5Dclose(did); + H5Gclose(gid_sub); + H5Gclose(gid2); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_group_deep */ - /*------------------------------------------------------------------------- * Function: test_copy_group_loop * @@ -5199,11 +8059,11 @@ error: static int test_copy_group_loop(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - hid_t gid_sub = -1, gid_sub2=-1; /* Sub-group IDs */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + hid_t gid_sub = -1, gid_sub2 = -1; /* Sub-group IDs */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): nested groups with loop"); @@ -5211,88 +8071,110 @@ test_copy_group_loop(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_f h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create group at the SRC file */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* attach attributes to the group */ - if(test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* create sub-groups */ - if((gid_sub = H5Gcreate2(gid, NAME_GROUP_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid_sub = H5Gcreate2(gid, NAME_GROUP_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; - if((gid_sub2 = H5Gcreate2(gid, NAME_GROUP_SUB_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid_sub2 = H5Gcreate2(gid, NAME_GROUP_SUB_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Create link to top group */ - if(H5Lcreate_hard(gid, ".", gid_sub2, NAME_GROUP_LOOP, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Lcreate_hard(gid, ".", gid_sub2, NAME_GROUP_LOOP, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* close sub sub group */ - if( H5Gclose(gid_sub2) < 0) TEST_ERROR + if (H5Gclose(gid_sub2) < 0) + TEST_ERROR; /* close sub group */ - if( H5Gclose(gid_sub) < 0) TEST_ERROR + if (H5Gclose(gid_sub) < 0) + TEST_ERROR; /* close the group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the group from SRC to DST */ - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the destination group */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the source group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Gclose(gid_sub2); - H5Gclose(gid_sub); - H5Gclose(gid2); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Gclose(gid_sub2); + H5Gclose(gid_sub); + H5Gclose(gid2); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_group_loop */ - /*------------------------------------------------------------------------- * Function: test_copy_group_wide_loop * @@ -5314,13 +8196,13 @@ error: static int test_copy_group_wide_loop(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - hid_t gid_sub = -1, gid_sub2=-1; /* Sub-group IDs */ - unsigned u, v; /* Local index variables */ - char objname[NAME_BUF_SIZE]; /* Object name buffer */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + hid_t gid_sub = -1, gid_sub2 = -1; /* Sub-group IDs */ + unsigned u, v; /* Local index variables */ + char objname[NAME_BUF_SIZE]; /* Object name buffer */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): wide nested groups with loop"); @@ -5328,100 +8210,124 @@ test_copy_group_wide_loop(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create group at the SRC file */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* attach attributes to the group */ - if(test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* create wide sub-group hierarchy, with multiple links to higher groups */ - for(u = 0; u < NUM_WIDE_LOOP_GROUPS; u++) { - sprintf(objname, "%s-%u", NAME_GROUP_SUB, u); - if((gid_sub = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + for (u = 0; u < NUM_WIDE_LOOP_GROUPS; u++) { + HDsnprintf(objname, sizeof(objname), "%s-%u", NAME_GROUP_SUB, u); + if ((gid_sub = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; - for(v = 0; v < NUM_WIDE_LOOP_GROUPS; v++) { - sprintf(objname, "%s-%u", NAME_GROUP_SUB_SUB2, v); - if((gid_sub2 = H5Gcreate2(gid_sub, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + for (v = 0; v < NUM_WIDE_LOOP_GROUPS; v++) { + HDsnprintf(objname, sizeof(objname), "%s-%u", NAME_GROUP_SUB_SUB2, v); + if ((gid_sub2 = H5Gcreate2(gid_sub, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Create link to top group */ - if(H5Lcreate_hard(gid, ".", gid_sub2, NAME_GROUP_LOOP, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_hard(gid, ".", gid_sub2, NAME_GROUP_LOOP, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; /* Create link to sub-group */ - if(H5Lcreate_hard(gid_sub, ".", gid_sub2, NAME_GROUP_LOOP2, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_hard(gid_sub, ".", gid_sub2, NAME_GROUP_LOOP2, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; /* Create link to self :-) */ - if(H5Lcreate_hard(gid_sub2, ".", gid_sub2, NAME_GROUP_LOOP3, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_hard(gid_sub2, ".", gid_sub2, NAME_GROUP_LOOP3, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; /* close sub sub group */ - if(H5Gclose(gid_sub2) < 0) FAIL_STACK_ERROR + if (H5Gclose(gid_sub2) < 0) + FAIL_STACK_ERROR; } /* end for */ /* close sub group */ - if( H5Gclose(gid_sub) < 0) TEST_ERROR + if (H5Gclose(gid_sub) < 0) + TEST_ERROR; } /* end for */ /* close the group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the group from SRC to DST */ - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the destination group */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the source group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Gclose(gid_sub2); - H5Gclose(gid_sub); - H5Gclose(gid2); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Gclose(gid_sub2); + H5Gclose(gid_sub); + H5Gclose(gid2); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_group_wide_loop */ - /*------------------------------------------------------------------------- * Function: test_copy_group_links * @@ -5433,262 +8339,329 @@ error: * Programmer: Peter Cao * Friday, September 30, 2005 * - * Modifications: - * Neil Fortner - * Tuesday, February 16, 2010 - * Modified test to test flags for expanding soft and external - * links. - * *------------------------------------------------------------------------- */ static int test_copy_group_links(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1, fid_ext = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset ID */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - hid_t plid = -1; /* Object copy plist ID */ - hsize_t dim2d[2]; - hsize_t dim1d[1]; - H5L_info_t linfo; - int buf[DIM_SIZE_1][DIM_SIZE_2]; - int i, j; - unsigned expand_soft; - unsigned expand_ext; - unsigned copy_options; - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - char ext_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1, fid_ext = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset ID */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + hid_t plid = -1; /* Object copy plist ID */ + hsize_t dim2d[2]; + hsize_t dim1d[1]; + H5L_info2_t linfo; + int buf[DIM_SIZE_1][DIM_SIZE_2]; + int i, j; + unsigned expand_soft; + unsigned expand_ext; + unsigned copy_options; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + char ext_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): group with links"); /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = 10000 + 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], src_fapl, dst_filename, sizeof dst_filename); h5_fixname(FILENAME[2], dst_fapl, ext_filename, sizeof ext_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create file to hold external dataset */ - if((fid_ext = H5Fcreate(ext_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_ext = H5Fcreate(ext_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create groups at the SRC file. Group 2 will hold dangling links. */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if((gid2 = H5Gcreate2(fid_src, NAME_GROUP_LINK2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((gid2 = H5Gcreate2(fid_src, NAME_GROUP_LINK2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* attach attributes to the groups */ - if(test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) TEST_ERROR - if(test_copy_attach_attributes(gid2, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) + TEST_ERROR; + if (test_copy_attach_attributes(gid2, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim2d[0]=DIM_SIZE_1; - dim2d[1]=DIM_SIZE_2; + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; /* create dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* add a dataset to the group */ - if((did = H5Dcreate2(fid_src, NAME_LINK_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_LINK_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* Now create a 1-D dataset in an external file */ /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_2; + dim1d[0] = DIM_SIZE_2; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* add a dataset to the external file */ - if((did = H5Dcreate2(fid_ext, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_ext, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* make a hard link to the dataset */ - if(H5Lcreate_hard(fid_src, NAME_LINK_DATASET, H5L_SAME_LOC, NAME_LINK_HARD, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_hard(fid_src, NAME_LINK_DATASET, H5L_SAME_LOC, NAME_LINK_HARD, H5P_DEFAULT, H5P_DEFAULT) < + 0) + FAIL_STACK_ERROR; /* make a soft link to the dataset */ - if(H5Lcreate_soft(NAME_LINK_DATASET, fid_src, NAME_LINK_SOFT, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_soft(NAME_LINK_DATASET, fid_src, NAME_LINK_SOFT, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; /* make an external link to the external dataset */ - if(H5Lcreate_external(ext_filename, NAME_DATASET_SIMPLE, fid_src, NAME_LINK_EXTERN, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_external(ext_filename, NAME_DATASET_SIMPLE, fid_src, NAME_LINK_EXTERN, H5P_DEFAULT, + H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; /* make a dangling soft link */ - if(H5Lcreate_soft("nowhere", fid_src, NAME_LINK_SOFT_DANGLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_soft("nowhere", fid_src, NAME_LINK_SOFT_DANGLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; /* make a dangling external link */ - if(H5Lcreate_external("no_file", "no_object", fid_src, NAME_LINK_EXTERN_DANGLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_external("no_file", "no_object", fid_src, NAME_LINK_EXTERN_DANGLE2, H5P_DEFAULT, + H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; /* close the groups */ - if(H5Gclose(gid) < 0) TEST_ERROR - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the SRC and EXT files */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - if(H5Fclose(fid_ext) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; + if (H5Fclose(fid_ext) < 0) + TEST_ERROR; /* Create the object copy plist */ - if((plid = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR + if ((plid = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; /* Loop over all configurations (expand soft/external links) */ - for(expand_soft=0; expand_soft<=1; expand_soft++) { - for(expand_ext=0; expand_ext<=1; expand_ext++) { + for (expand_soft = 0; expand_soft <= 1; expand_soft++) { + for (expand_ext = 0; expand_ext <= 1; expand_ext++) { /* Set the correct copy options on the obj copy plist */ copy_options = 0; - if(expand_soft) + if (expand_soft) copy_options |= H5O_COPY_EXPAND_SOFT_LINK_FLAG; - if(expand_ext) + if (expand_ext) copy_options |= H5O_COPY_EXPAND_EXT_LINK_FLAG; - if(H5Pset_copy_object(plid, copy_options) < 0) TEST_ERROR + if (H5Pset_copy_object(plid, copy_options) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files + * aren't the same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the group from SRC to DST */ - if(H5Ocopy(fid_src, NAME_GROUP_LINK, fid_dst, NAME_GROUP_LINK, plid, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_LINK, fid_dst, NAME_GROUP_LINK, plid, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_LINK, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_LINK, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* If expand_soft is set to true, verify that the soft link is now a * hard link, and compare the expanded dataset, then delete it and * re-add it as a soft link so compare_groups() works */ - if(expand_soft) { + if (expand_soft) { /* Check link type */ - if(H5Lget_info(fid_dst, NAME_LINK_SOFT, &linfo, H5P_DEFAULT) < 0) TEST_ERROR - if(linfo.type != H5L_TYPE_HARD) - FAIL_PUTS_ERROR("Soft link was not expanded to a hard link") + if (H5Lget_info2(fid_dst, NAME_LINK_SOFT, &linfo, H5P_DEFAULT) < 0) + TEST_ERROR; + if (linfo.type != H5L_TYPE_HARD) + FAIL_PUTS_ERROR("Soft link was not expanded to a hard link"); /* Compare datasets */ - if((did = H5Dopen2(fid_src, NAME_LINK_DATASET, H5P_DEFAULT)) < 0) TEST_ERROR - if((did2 = H5Dopen2(fid_dst, NAME_LINK_SOFT, H5P_DEFAULT)) < 0) TEST_ERROR - if(compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_LINK_DATASET, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((did2 = H5Dopen2(fid_dst, NAME_LINK_SOFT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; /* Delete expanded dataset, add soft link */ - if(H5Ldelete(fid_dst, NAME_LINK_SOFT, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Lcreate_soft(NAME_LINK_DATASET, fid_dst, NAME_LINK_SOFT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ldelete(fid_dst, NAME_LINK_SOFT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Lcreate_soft(NAME_LINK_DATASET, fid_dst, NAME_LINK_SOFT, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* Close datasets */ - if(H5Dclose(did) < 0) TEST_ERROR - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + if (H5Dclose(did2) < 0) + TEST_ERROR; } /* end if */ /* If expand_ext is set to true, verify that the external link is * now a hard link, and compare the expanded dataset, then delete it * and re-add it as an external link so compare_groups() works */ - if(expand_ext) { + if (expand_ext) { /* Check link type */ - if(H5Lget_info(fid_dst, NAME_LINK_EXTERN, &linfo, H5P_DEFAULT) < 0) TEST_ERROR - if(linfo.type != H5L_TYPE_HARD) - FAIL_PUTS_ERROR("External link was not expanded to a hard link") + if (H5Lget_info2(fid_dst, NAME_LINK_EXTERN, &linfo, H5P_DEFAULT) < 0) + TEST_ERROR; + if (linfo.type != H5L_TYPE_HARD) + FAIL_PUTS_ERROR("External link was not expanded to a hard link"); /* Compare datasets */ - if((fid_ext = H5Fopen(ext_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR - if((did = H5Dopen2(fid_ext, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((did2 = H5Dopen2(fid_dst, NAME_LINK_EXTERN, H5P_DEFAULT)) < 0) TEST_ERROR - if(compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) TEST_ERROR + if ((fid_ext = H5Fopen(ext_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; + if ((did = H5Dopen2(fid_ext, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((did2 = H5Dopen2(fid_dst, NAME_LINK_EXTERN, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; /* Delete expanded dataset, add external link */ - if(H5Ldelete(fid_dst, NAME_LINK_EXTERN, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Lcreate_external(ext_filename, NAME_DATASET_SIMPLE, fid_dst, NAME_LINK_EXTERN, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ldelete(fid_dst, NAME_LINK_EXTERN, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Lcreate_external(ext_filename, NAME_DATASET_SIMPLE, fid_dst, NAME_LINK_EXTERN, + H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* Close datasets and external file */ - if(H5Dclose(did) < 0) TEST_ERROR - if(H5Dclose(did2) < 0) TEST_ERROR - if(H5Fclose(fid_ext) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + if (H5Dclose(did2) < 0) + TEST_ERROR; + if (H5Fclose(fid_ext) < 0) + TEST_ERROR; } /* end if */ /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the destination group */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the source group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* Now try to copy the group containing the dangling link. They * should always be copied as the same type of link, never expanded * to hard links. */ - if(H5Ocopy(fid_src, NAME_GROUP_LINK2, fid_dst, NAME_GROUP_LINK2, plid, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_LINK2, fid_dst, NAME_GROUP_LINK2, plid, H5P_DEFAULT) < 0) + TEST_ERROR; /* Open the original and copied groups */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_LINK2, H5P_DEFAULT)) < 0) TEST_ERROR - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_LINK2, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_LINK2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_LINK2, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Compare the groups */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* Close groups */ - if(H5Gclose(gid2) < 0) TEST_ERROR - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; } /* end for */ - } /* end for */ + } /* end for */ /* Close the object copy plist */ - if(H5Pclose(plid) < 0) TEST_ERROR + if (H5Pclose(plid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Sclose(sid); - H5Dclose(did2); - H5Dclose(did); - H5Gclose(gid2); - H5Gclose(gid); - H5Fclose(fid_ext); - H5Fclose(fid_dst); - H5Fclose(fid_src); - H5Pclose(plid); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Sclose(sid); + H5Dclose(did2); + H5Dclose(did); + H5Gclose(gid2); + H5Gclose(gid); + H5Fclose(fid_ext); + H5Fclose(fid_dst); + H5Fclose(fid_src); + H5Pclose(plid); + } + H5E_END_TRY; return 1; } /* end test_copy_group_links */ - /*------------------------------------------------------------------------- * Function: test_copy_soft_link * * Purpose: Create a soft link in SRC file and copy it to DST file * copy a datast pointed by a soft link to DST file * + * Note: The parameter "test_open" is added to test for H5Ocopy when + * the dataset is open in the file (HDFFV-7853). + * * Return: Success: 0 * Failure: number of errors * @@ -5698,117 +8671,150 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_soft_link(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) +test_copy_soft_link(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t test_open) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hid_t gid = -1; /* Group ID */ + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t gid = -1; /* Group ID */ hsize_t dim2d[2]; - int buf[DIM_SIZE_1][DIM_SIZE_2]; - int i, j; - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + int buf[DIM_SIZE_1][DIM_SIZE_2]; + int i, j; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; - TESTING("H5Ocopy(): object through soft link"); + if (test_open) { + TESTING("H5Ocopy(): opened object through soft link"); + } + else { + TESTING("H5Ocopy(): object through soft link"); + } /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = 10000 + 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create group at the SRC file */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* attach attributes to the group */ - if(test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim2d[0]=DIM_SIZE_1; - dim2d[1]=DIM_SIZE_2; + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; /* create dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* add a dataset to the group */ - if((did = H5Dcreate2(fid_src, NAME_LINK_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_LINK_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) FAIL_STACK_ERROR + if (H5Sclose(sid) < 0) + FAIL_STACK_ERROR; - /* close the dataset */ - if(H5Dclose(did) < 0) FAIL_STACK_ERROR + /* close the group */ + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR; /* make a soft link to the dataset */ - if(H5Lcreate_soft(NAME_LINK_DATASET, fid_src, NAME_LINK_SOFT, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - - /* close the group */ - if(H5Gclose(gid) < 0) FAIL_STACK_ERROR + if (H5Lcreate_soft(NAME_LINK_DATASET, fid_src, NAME_LINK_SOFT, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; - /* close the SRC file */ - if(H5Fclose(fid_src) < 0) FAIL_STACK_ERROR + if (!test_open) { + /* close the dataset */ + if (H5Dclose(did) < 0) + FAIL_STACK_ERROR; + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + FAIL_STACK_ERROR; - /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + /* open the source file with read-only */ + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; + } /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_LINK_SOFT, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_LINK_SOFT, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; - /* open the dataset through the soft link for copy */ - if((did = H5Dopen2(fid_src, NAME_LINK_SOFT, H5P_DEFAULT)) < 0) TEST_ERROR + if (!test_open) { + /* open the dataset through the soft link for copy */ + if ((did = H5Dopen2(fid_src, NAME_LINK_SOFT, H5P_DEFAULT)) < 0) + TEST_ERROR; + } /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Sclose(sid); - H5Dclose(did2); - H5Dclose(did); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Sclose(sid); + H5Dclose(did2); + H5Dclose(did); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_soft_link */ - /*------------------------------------------------------------------------- * Function: test_copy_ext_link * @@ -5825,124 +8831,154 @@ error: static int test_copy_ext_link(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1, fid_ext = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hid_t gid = -1; /* Group ID */ + hid_t fid_src = -1, fid_dst = -1, fid_ext = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t gid = -1; /* Group ID */ hsize_t dim2d[2]; - int buf[DIM_SIZE_1][DIM_SIZE_2]; - int i, j; - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - char ext_filename[NAME_BUF_SIZE]; + int buf[DIM_SIZE_1][DIM_SIZE_2]; + int i, j; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + char ext_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): object through external link"); /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = 10000 + 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], src_fapl, dst_filename, sizeof dst_filename); h5_fixname(FILENAME[2], dst_fapl, ext_filename, sizeof ext_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create group at the SRC file */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* attach attributes to the group */ - if(test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim2d[0]=DIM_SIZE_1; - dim2d[1]=DIM_SIZE_2; + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; /* create dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* add a dataset to the group */ - if((did = H5Dcreate2(fid_src, NAME_LINK_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_LINK_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* create file to hold external links to the src file */ - if((fid_ext = H5Fcreate(ext_filename, H5F_ACC_TRUNC, H5P_DEFAULT, src_fapl)) < 0) TEST_ERROR + if ((fid_ext = H5Fcreate(ext_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create group in the file that will hold the external link */ - if((gid = H5Gcreate2(fid_ext, NAME_GROUP_LINK, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_ext, NAME_GROUP_LINK, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Create an external link to the dataset in the source file */ - if(H5Lcreate_external(src_filename, NAME_LINK_DATASET, fid_ext, NAME_LINK_EXTERN, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Lcreate_external(src_filename, NAME_LINK_DATASET, fid_ext, NAME_LINK_EXTERN, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; /* close the group and file */ - if(H5Gclose(gid) < 0) TEST_ERROR - if(H5Fclose(fid_ext) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; + if (H5Fclose(fid_ext) < 0) + TEST_ERROR; /* open the "extern" file with read-only */ - if((fid_ext = H5Fopen(ext_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_ext = H5Fopen(ext_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_ext, NAME_LINK_EXTERN, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_ext, NAME_LINK_EXTERN, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset through the external link */ - if((did = H5Dopen2(fid_ext, NAME_LINK_EXTERN, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_ext, NAME_LINK_EXTERN, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the EXT file */ - if(H5Fclose(fid_ext) < 0) TEST_ERROR + if (H5Fclose(fid_ext) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Sclose(sid); - H5Dclose(did2); - H5Dclose(did); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Sclose(sid); + H5Dclose(did2); + H5Dclose(did); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_ext_link */ - /*------------------------------------------------------------------------- * Function: test_copy_exist * @@ -5960,97 +8996,116 @@ error: static int test_copy_exist(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset IDs */ - int buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ - hsize_t dim2d[2]; /* Dataset dimensions */ - int i, j; /* local index variables */ - herr_t ret; /* Generic return value */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset IDs */ + int buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + hsize_t dim2d[2]; /* Dataset dimensions */ + int i, j; /* local index variables */ + herr_t ret; /* Generic return value */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): existing object"); /* Initialize write buffer */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = 10000 + 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ dim2d[0] = DIM_SIZE_1; dim2d[1] = DIM_SIZE_2; /* create 2D dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create 2D int dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE,fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* try to copy the dataset from SRC to DST again (should fail) */ - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { ret = H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if( ret >= 0) TEST_ERROR + } + H5E_END_TRY; + if (ret >= 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_exist */ - /*------------------------------------------------------------------------- * Function: test_copy_path * @@ -6068,125 +9123,155 @@ error: static int test_copy_path(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hid_t gid = -1; /* Group ID */ - int buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ - hsize_t dim2d[2]; /* Dataset dimensions */ - int i, j; /* local index variables */ - herr_t ret; /* Generic return value */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t gid = -1; /* Group ID */ + int buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + hsize_t dim2d[2]; /* Dataset dimensions */ + int i, j; /* local index variables */ + herr_t ret; /* Generic return value */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): full path"); /* Initialize write buffer */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = 10000 + 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ dim2d[0] = DIM_SIZE_1; dim2d[1] = DIM_SIZE_2; /* create 2D dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* create 2D int dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST (should fail - intermediate groups not there) */ - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { ret = H5Ocopy(fid_src, NAME_DATASET_SUB_SUB, fid_dst, NAME_DATASET_SUB_SUB, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if( ret >= 0) TEST_ERROR + } + H5E_END_TRY; + if (ret >= 0) + TEST_ERROR; /* Create the intermediate groups in destination file */ - if((gid = H5Gcreate2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Gclose(gid) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Gclose(gid) < 0) + TEST_ERROR; - if((gid = H5Gcreate2(fid_dst, NAME_GROUP_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Gclose(gid) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_dst, NAME_GROUP_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Gclose(gid) < 0) + TEST_ERROR; - if((gid = H5Gcreate2(fid_dst, NAME_GROUP_SUB_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Gclose(gid) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_dst, NAME_GROUP_SUB_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Gclose(gid) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST, using full path */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SUB_SUB, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SUB_SUB, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_SUB_SUB, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_SUB_SUB, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Sclose(sid); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Sclose(sid); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_path */ - /*------------------------------------------------------------------------- * Function: test_copy_same_file_named_datatype * @@ -6203,66 +9288,75 @@ error: static int test_copy_same_file_named_datatype(hid_t fcpl_src, hid_t fapl) { - hid_t fid = -1; /* File ID */ - hid_t tid = -1, tid2 = -1; /* Datatype IDs */ - char filename[NAME_BUF_SIZE]; + hid_t fid = -1; /* File ID */ + hid_t tid = -1, tid2 = -1; /* Datatype IDs */ + char filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): named datatype in same file"); /* Initialize the filenames */ h5_fixname(FILENAME[0], fapl, filename, sizeof filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_src, fapl)) < 0) TEST_ERROR + if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_src, fapl)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create named datatype */ - if((H5Tcommit2(fid, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - + if ((H5Tcommit2(fid, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the datatype from SRC to DST */ - if(H5Ocopy(fid, NAME_DATATYPE_SIMPLE, fid, NAME_DATATYPE_SIMPLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid, NAME_DATATYPE_SIMPLE, fid, NAME_DATATYPE_SIMPLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the copied datatype */ - if((tid2 = H5Topen2(fid, NAME_DATATYPE_SIMPLE2, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((tid2 = H5Topen2(fid, NAME_DATATYPE_SIMPLE2, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Compare the datatypes */ - if(H5Tequal(tid, tid2) != TRUE) TEST_ERROR + if (H5Tequal(tid, tid2) != TRUE) + TEST_ERROR; /* close the destination datatype */ - if(H5Tclose(tid2) < 0) TEST_ERROR + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* close the source datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the file */ - if(H5Fclose(fid) < 0) TEST_ERROR + if (H5Fclose(fid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Tclose(tid2); - H5Tclose(tid); - H5Fclose(fid); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Tclose(tid2); + H5Tclose(tid); + H5Fclose(fid); + } + H5E_END_TRY; return 1; } /* end test_copy_same_file_named_datatype */ - /*------------------------------------------------------------------------- * Function: test_copy_old_layout * * Purpose: Copy dataset that uses the "old" layout version (pre version 3) * format. * - * Note: This test uses the "fill_old.h5" file for convenience, since it + * Note: This test uses the "fill_old.h5" file for convenience, since it * has a dataset with the old layout format. * * Return: Success: 0 @@ -6274,68 +9368,104 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_old_layout(hid_t fcpl_dst, hid_t fapl) +test_copy_old_layout(hid_t fcpl_dst, hid_t fapl, hbool_t test_open) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t src_fapl = -1; /* Source file FAPL ID */ const char *src_filename = H5_get_srcdir_filename(FILE_OLD_LAYOUT); /* Corrected test file name */ - char dst_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; - TESTING("H5Ocopy(): dataset with old layout format"); + if (test_open) { + TESTING("H5Ocopy(): opened dataset with old layout format"); + } + else { + TESTING("H5Ocopy(): dataset with old layout format"); + } /* Initialize the destination filename */ h5_fixname(FILENAME[1], fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); + + /* Setup */ + if ((src_fapl = h5_fileaccess_flags(H5_FILEACCESS_LIBVER)) < 0) + TEST_ERROR; /* open source file (read-only) */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; - /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, fapl)) < 0) TEST_ERROR + /* Close source FAPL */ + if (H5Pclose(src_fapl) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* create destination file */ + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, fapl)) < 0) + TEST_ERROR; + + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + + if (test_open) { + /* open the source dataset */ + if ((did = H5Dopen2(fid_src, NAME_OLD_FORMAT, H5P_DEFAULT)) < 0) + TEST_ERROR; + } /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_OLD_FORMAT, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_OLD_FORMAT, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; - /* open the source dataset */ - if((did = H5Dopen2(fid_src, NAME_OLD_FORMAT, H5P_DEFAULT)) < 0) TEST_ERROR + if (!test_open) { + /* open the source dataset */ + if ((did = H5Dopen2(fid_src, NAME_OLD_FORMAT, H5P_DEFAULT)) < 0) + TEST_ERROR; + } /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Pclose(src_fapl); + H5Dclose(did2); + H5Dclose(did); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_old_layout */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_compact_named_vl * @@ -6353,24 +9483,25 @@ error: static int test_copy_dataset_compact_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1, tid_copy=-1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid_copy = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): compact dataset with named VLEN datatype"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) { - buf[i].len = i+1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); - for(j = 0; j < buf[i].len; j++) + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].len = i + 1; + buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -6378,112 +9509,148 @@ test_copy_dataset_compact_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* make a copy of the datatype for later use */ - if((tid_copy = H5Tcopy(tid)) < 0)TEST_ERROR + if ((tid_copy = H5Tcopy(tid)) < 0) + TEST_ERROR; - /* named data type */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* named datatype */ + if ((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create and set compact plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_layout(pid, H5D_COMPACT) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_layout(pid, H5D_COMPACT) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close compact plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid_copy, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid_copy, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid_copy) < 0) TEST_ERROR + if (H5Tclose(tid_copy) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Pclose(pid); - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf); - H5Tclose(tid); - H5Tclose(tid_copy); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Pclose(pid); + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid_copy, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Tclose(tid); + H5Tclose(tid_copy); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_compact_named_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_contig_named_vl * @@ -6501,23 +9668,24 @@ error: static int test_copy_dataset_contig_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1, tid_copy=-1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - - TESTING("H5Ocopy(): contigous dataset with named VLEN datatype"); + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid_copy = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + + TESTING("H5Ocopy(): contiguous dataset with named VLEN datatype"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) { - buf[i].len = i+1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); - for(j = 0; j < buf[i].len; j++) + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].len = i + 1; + buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -6525,110 +9693,146 @@ test_copy_dataset_contig_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* make a copy of the datatype for later use */ - if((tid_copy = H5Tcopy(tid)) < 0)TEST_ERROR + if ((tid_copy = H5Tcopy(tid)) < 0) + TEST_ERROR; - /* named data type */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* named datatype */ + if ((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid_copy, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid_copy, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid_copy) < 0) TEST_ERROR + if (H5Tclose(tid_copy) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf); - H5Tclose(tid); - H5Tclose(tid_copy); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid_copy, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Tclose(tid); + H5Tclose(tid_copy); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_contig_named_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_chunked_named_vl * * Purpose: Create a dataset that uses a named variable length datatype * in SRC file and copy it to DST file * + * Note: The parameter "test_open" is added to test for H5Ocopy when + * the dataset is open in the file (HDFFV-7853). + * * Return: Success: 0 * Failure: number of errors * @@ -6638,27 +9842,34 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_dataset_chunked_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) +test_copy_dataset_chunked_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, + hbool_t test_open) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1, tid_copy=-1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - - TESTING("H5Ocopy(): chunked dataset with named VLEN datatype"); + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid_copy = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + + if (test_open) { + TESTING("H5Ocopy(): chunked and opened dataset with named VLEN datatype"); + } + else { + TESTING("H5Ocopy(): chunked dataset with named VLEN datatype"); + } /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) { - buf[i].len = i+1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); - for(j = 0; j < buf[i].len; j++) + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].len = i + 1; + buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -6666,112 +9877,153 @@ test_copy_dataset_chunked_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* make a copy of the datatype for later use */ - if((tid_copy = H5Tcopy(tid)) < 0)TEST_ERROR + if ((tid_copy = H5Tcopy(tid)) < 0) + TEST_ERROR; - /* named data type */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* named datatype */ + if ((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; - /* create and set chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR + /* create and set chunk plist */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 1, chunk_dim1d) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close compact plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; - /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (!test_open) { - /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + TEST_ERROR; - /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + /* open the source file with read-only */ + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; + } /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; - /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if (!test_open) { + /* open the dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; + } /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid_copy, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid_copy, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid_copy) < 0) TEST_ERROR + if (H5Tclose(tid_copy) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Pclose(pid); - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf); - H5Tclose(tid); - H5Tclose(tid_copy); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Pclose(pid); + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid_copy, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Tclose(tid); + H5Tclose(tid_copy); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_chunked_named_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_compressed_named_vl * @@ -6789,25 +10041,26 @@ error: static int test_copy_dataset_compressed_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1, tid_copy=-1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid_copy = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): compressed dataset with named VLEN datatype"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) { - buf[i].len = i+1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); - for(j = 0; j < buf[i].len; j++) + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].len = i + 1; + buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -6815,113 +10068,150 @@ test_copy_dataset_compressed_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* make a copy of the datatype for later use */ - if((tid_copy = H5Tcopy(tid)) < 0)TEST_ERROR + if ((tid_copy = H5Tcopy(tid)) < 0) + TEST_ERROR; - /* named data type */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* named datatype */ + if ((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; - /* create and set chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR - if(H5Pset_deflate(pid, 9) < 0) TEST_ERROR + /* create and set chunk plist */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 1, chunk_dim1d) < 0) + TEST_ERROR; + if (H5Pset_deflate(pid, 9) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close compact plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_VL, fid_dst, NAME_DATASET_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid_copy, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid_copy, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid_copy) < 0) TEST_ERROR + if (H5Tclose(tid_copy) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Pclose(pid); - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf); - H5Tclose(tid); - H5Tclose(tid_copy); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Pclose(pid); + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid_copy, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Tclose(tid); + H5Tclose(tid_copy); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_compressed_named_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_compact_vl_vl * @@ -6939,150 +10229,190 @@ error: static int test_copy_dataset_compact_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid=-1, tid2=-1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j, k; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hvl_t *tvl; /* Temporary pointer to VL information */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j, k; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + hvl_t *tvl; /* Temporary pointer to VL information */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): compact dataset with nested VLEN datatype"); /* set initial data values */ - for(i=0; i<DIM_SIZE_1; i++) { - buf[i].p=HDmalloc((i+1)*sizeof(hvl_t)); - if(buf[i].p==NULL) { - TestErrPrintf("Cannot allocate memory for VL data! i=%u\n",i); + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].p = HDmalloc((i + 1) * sizeof(hvl_t)); + if (buf[i].p == NULL) { + TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); return 1; } /* end if */ - buf[i].len=i+1; - for(tvl = (hvl_t *)buf[i].p,j=0; j<(i+1); j++, tvl++) { - tvl->p=HDmalloc((j+1)*sizeof(unsigned int)); - if(tvl->p==NULL) { - TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n",i,j); + buf[i].len = i + 1; + for (tvl = (hvl_t *)buf[i].p, j = 0; j < (i + 1); j++, tvl++) { + tvl->p = HDmalloc((j + 1) * sizeof(unsigned int)); + if (tvl->p == NULL) { + TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); return 1; } /* end if */ - tvl->len=j+1; - for(k=0; k<(j+1); k++) - ((unsigned int *)tvl->p)[k]=i*100+j*10+k; + tvl->len = j + 1; + for (k = 0; k < (j + 1); k++) + ((unsigned int *)tvl->p)[k] = i * 100 + j * 10 + k; } /* end for */ - } /* end for */ - + } /* end for */ /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create nested VL datatype */ - if((tid2 = H5Tvlen_create(tid)) < 0) TEST_ERROR + if ((tid2 = H5Tvlen_create(tid)) < 0) + TEST_ERROR; /* create and set compact plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_layout(pid, H5D_COMPACT) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_layout(pid, H5D_COMPACT) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_VL_VL, tid2, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL_VL, tid2, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close compact plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_VL_VL, fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_VL_VL, fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid2, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Tclose(tid2) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf); - H5Tclose(tid); - H5Tclose(tid2); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid2, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Pclose(pid); + H5Tclose(tid); + H5Tclose(tid2); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_compact_vl_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_contig_vl_vl * * Purpose: Create a compact dataset w/nested VLEN datatype * in SRC file and copy it to DST file * + * Note: The parameter "test_open" is added to test for H5Ocopy when + * the dataset is open in the file (HDFFV-7853). + * * Return: Success: 0 * Failure: number of errors * @@ -7092,145 +10422,191 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_dataset_contig_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) +test_copy_dataset_contig_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, + hbool_t test_open) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid=-1, tid2=-1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j, k; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hvl_t *tvl; /* Temporary pointer to VL information */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - - TESTING("H5Ocopy(): contigous dataset with nested VLEN datatype"); + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j, k; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + hvl_t *tvl; /* Temporary pointer to VL information */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + + if (test_open) { + TESTING("H5Ocopy(): contiguous and opened dataset with nested VLEN datatype"); + } + else { + TESTING("H5Ocopy(): contiguous dataset with nested VLEN datatype"); + } /* set initial data values */ - for(i=0; i<DIM_SIZE_1; i++) { - buf[i].p=HDmalloc((i+1)*sizeof(hvl_t)); - if(buf[i].p==NULL) { - TestErrPrintf("Cannot allocate memory for VL data! i=%u\n",i); - TEST_ERROR + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].p = HDmalloc((i + 1) * sizeof(hvl_t)); + if (buf[i].p == NULL) { + TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); + TEST_ERROR; } /* end if */ - buf[i].len=i+1; - for(tvl = (hvl_t *)buf[i].p,j=0; j<(i+1); j++, tvl++) { - tvl->p=HDmalloc((j+1)*sizeof(unsigned int)); - if(tvl->p==NULL) { - TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n",i,j); - TEST_ERROR + buf[i].len = i + 1; + for (tvl = (hvl_t *)buf[i].p, j = 0; j < (i + 1); j++, tvl++) { + tvl->p = HDmalloc((j + 1) * sizeof(unsigned int)); + if (tvl->p == NULL) { + TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); + TEST_ERROR; } /* end if */ - tvl->len=j+1; - for(k=0; k<(j+1); k++) - ((unsigned int *)tvl->p)[k]=i*100+j*10+k; + tvl->len = j + 1; + for (k = 0; k < (j + 1); k++) + ((unsigned int *)tvl->p)[k] = i * 100 + j * 10 + k; } /* end for */ - } /* end for */ - + } /* end for */ /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create nested VL datatype */ - if((tid2 = H5Tvlen_create(tid)) < 0) TEST_ERROR + if ((tid2 = H5Tvlen_create(tid)) < 0) + TEST_ERROR; /* create and set compact plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_VL_VL, tid2, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL_VL, tid2, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close compact plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; - /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (!test_open) { + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; - /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + TEST_ERROR; - - /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + /* open the source file with read-only */ + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; + } /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_VL_VL, fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_VL_VL, fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; - /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if (!test_open) { + /* open the dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; + } /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid2, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Tclose(tid2) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf); - H5Tclose(tid); - H5Tclose(tid2); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid2, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Pclose(pid); + H5Tclose(tid); + H5Tclose(tid2); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_contig_vl_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_chunked_vl_vl * @@ -7248,151 +10624,233 @@ error: static int test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1, tid2=-1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j, k; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hvl_t *tvl; /* Temporary pointer to VL information */ - hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j, k; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + hvl_t *tvl; /* Temporary pointer to VL information */ + hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): chunked dataset with nested VLEN datatype"); /* set initial data values */ - for(i=0; i<DIM_SIZE_1; i++) { - buf[i].p=HDmalloc((i+1)*sizeof(hvl_t)); - if(buf[i].p==NULL) { - TestErrPrintf("Cannot allocate memory for VL data! i=%u\n",i); - TEST_ERROR + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].p = HDmalloc((i + 1) * sizeof(hvl_t)); + if (buf[i].p == NULL) { + TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); + TEST_ERROR; } /* end if */ - buf[i].len=i+1; - for(tvl = (hvl_t *)buf[i].p,j=0; j<(i+1); j++, tvl++) { - tvl->p=HDmalloc((j+1)*sizeof(unsigned int)); - if(tvl->p==NULL) { - TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n",i,j); - TEST_ERROR + buf[i].len = i + 1; + for (tvl = (hvl_t *)buf[i].p, j = 0; j < (i + 1); j++, tvl++) { + tvl->p = HDmalloc((j + 1) * sizeof(unsigned int)); + if (tvl->p == NULL) { + TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); + TEST_ERROR; } /* end if */ - tvl->len=j+1; - for(k=0; k<(j+1); k++) - ((unsigned int *)tvl->p)[k]=i*100+j*10+k; + tvl->len = j + 1; + for (k = 0; k < (j + 1); k++) + ((unsigned int *)tvl->p)[k] = i * 100 + j * 10 + k; } /* end for */ - } /* end for */ + } /* end for */ /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create nested VL datatype */ - if((tid2 = H5Tvlen_create(tid)) < 0) TEST_ERROR + if ((tid2 = H5Tvlen_create(tid)) < 0) + TEST_ERROR; - /* create and set chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR + /* create and set chunk plist */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 1, chunk_dim1d) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_VL_VL, tid2, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL_VL, tid2, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; - /* close compact plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Set allocation time to early */ + if (H5Pset_alloc_time(pid, H5D_ALLOC_TIME_EARLY) < 0) + TEST_ERROR; + + /* create dataset at SRC file */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL_VL2, tid2, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* write data into file */ + if (H5Dwrite(did, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + + /* close plist */ + if (H5Pclose(pid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_VL_VL, fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_VL_VL, fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_VL_VL2, fid_dst, NAME_DATASET_VL_VL2, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; + + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* open the dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL_VL2, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* open the destination dataset */ + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL_VL2, H5P_DEFAULT)) < 0) + TEST_ERROR; + + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE) + TEST_ERROR; + + /* Check if the datasets are equal */ + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; + + /* close the destination dataset */ + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* close the source dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid2, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Tclose(tid2) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Pclose(pid); - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf); - H5Tclose(tid); - H5Tclose(tid2); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Pclose(pid); + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid2, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Tclose(tid); + H5Tclose(tid2); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_chunked_vl_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_compressed_vl_vl * * Purpose: Create a dataset that uses a named variable length datatype * in SRC file and copy it to DST file * + * Note: The parameter "test_open" is added to test for H5Ocopy when + * the dataset is open in the file (HDFFV-7853). + * * Return: Success: 0 * Failure: number of errors * @@ -7402,144 +10860,192 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_dataset_compressed_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) +test_copy_dataset_compressed_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, + hbool_t test_open) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1, tid2=-1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j, k; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hvl_t *tvl; /* Temporary pointer to VL information */ - hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - - TESTING("H5Ocopy(): compressed dataset with nested VLEN datatype"); + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j, k; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + hvl_t *tvl; /* Temporary pointer to VL information */ + hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + + if (test_open) { + TESTING("H5Ocopy(): compressed and opened dataset with nested VLEN datatype"); + } + else { + TESTING("H5Ocopy(): compressed dataset with nested VLEN datatype"); + } /* set initial data values */ - for(i=0; i<DIM_SIZE_1; i++) { - buf[i].p=HDmalloc((i+1)*sizeof(hvl_t)); - if(buf[i].p==NULL) { - TestErrPrintf("Cannot allocate memory for VL data! i=%u\n",i); - TEST_ERROR + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].p = HDmalloc((i + 1) * sizeof(hvl_t)); + if (buf[i].p == NULL) { + TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); + TEST_ERROR; } /* end if */ - buf[i].len=i+1; - for(tvl = (hvl_t *)buf[i].p,j=0; j<(i+1); j++, tvl++) { - tvl->p=HDmalloc((j+1)*sizeof(unsigned int)); - if(tvl->p==NULL) { - TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n",i,j); - TEST_ERROR + buf[i].len = i + 1; + for (tvl = (hvl_t *)buf[i].p, j = 0; j < (i + 1); j++, tvl++) { + tvl->p = HDmalloc((j + 1) * sizeof(unsigned int)); + if (tvl->p == NULL) { + TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); + TEST_ERROR; } /* end if */ - tvl->len=j+1; - for(k=0; k<(j+1); k++) - ((unsigned int *)tvl->p)[k]=i*100+j*10+k; + tvl->len = j + 1; + for (k = 0; k < (j + 1); k++) + ((unsigned int *)tvl->p)[k] = i * 100 + j * 10 + k; } /* end for */ - } /* end for */ + } /* end for */ /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* create nested VL datatype */ - if((tid2 = H5Tvlen_create(tid)) < 0) TEST_ERROR + if ((tid2 = H5Tvlen_create(tid)) < 0) + TEST_ERROR; - /* create and set chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR - if(H5Pset_deflate(pid, 9) < 0) TEST_ERROR + /* create and set chunk plist */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 1, chunk_dim1d) < 0) + TEST_ERROR; + if (H5Pset_deflate(pid, 9) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_VL_VL, tid2, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_VL_VL, tid2, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close compact plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; - /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (!test_open) { - /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; + /* close the SRC file */ + if (H5Fclose(fid_src) < 0) + TEST_ERROR; - /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + /* open the source file with read-only */ + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; + } /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_VL_VL, fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_VL_VL, fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; - /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if (!test_open) { + /* open the dataset for copy */ + if ((did = H5Dopen2(fid_src, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; + } /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid2, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Tclose(tid2) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Pclose(pid); - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf); - H5Tclose(tid); - H5Tclose(tid2); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Pclose(pid); + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid2, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Tclose(tid); + H5Tclose(tid2); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_compressed_vl_vl */ @@ -7547,12 +11053,11 @@ error: * Common data structure for the copy_dataset_*_cmpd_vl tests. */ typedef struct cmpd_vl_t { - int a; - hvl_t b; + int a; + hvl_t b; double c; } cmpd_vl_t; - /*------------------------------------------------------------------------- * Function: test_copy_dataset_contig_cmpd_vl * @@ -7563,135 +11068,172 @@ typedef struct cmpd_vl_t { * Failure: number of errors * * Programmer: Neil Fortner - * Tuseday, September 29, 2009 + * Tuesday, September 29, 2009 * *------------------------------------------------------------------------- */ static int test_copy_dataset_contig_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t tid2 = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t did2 = -1; /* Dataset ID */ - unsigned int i, j; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - cmpd_vl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t tid2 = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t did2 = -1; /* Dataset ID */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + cmpd_vl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): contiguous dataset with compound VLEN datatype"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) { - buf[i].a = i * (i - 1); - buf[i].b.len = i+1; - buf[i].b.p = (int *)HDmalloc(buf[i].b.len * sizeof(int)); - for(j = 0; j < buf[i].b.len; j++) + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].a = (int)(i * (i - 1)); + buf[i].b.len = i + 1; + buf[i].b.p = (int *)HDmalloc(buf[i].b.len * sizeof(int)); + for (j = 0; j < buf[i].b.len; j++) ((int *)buf[i].b.p)[j] = (int)(i * 10 + j); - buf[i].c = 1. / (i + 1.); + buf[i].c = 1.0 / ((double)i + 1.0); } /* end for */ /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid2 = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((tid = H5Tcreate(H5T_COMPOUND, sizeof(cmpd_vl_t))) < 0) TEST_ERROR - if(H5Tinsert(tid, "a", HOFFSET(cmpd_vl_t, a), H5T_NATIVE_INT) < 0) TEST_ERROR - if(H5Tinsert(tid, "b", HOFFSET(cmpd_vl_t, b), tid2) < 0) TEST_ERROR - if(H5Tinsert(tid, "c", HOFFSET(cmpd_vl_t, c), H5T_NATIVE_DOUBLE) < 0) TEST_ERROR + if ((tid2 = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((tid = H5Tcreate(H5T_COMPOUND, sizeof(cmpd_vl_t))) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "a", HOFFSET(cmpd_vl_t, a), H5T_NATIVE_INT) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "b", HOFFSET(cmpd_vl_t, b), tid2) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "c", HOFFSET(cmpd_vl_t, c), H5T_NATIVE_DOUBLE) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_CMPD_VL, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CMPD_VL, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_CMPD_VL, fid_dst, NAME_DATASET_CMPD_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_CMPD_VL, fid_dst, NAME_DATASET_CMPD_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_CMPD_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_CMPD_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CMPD_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CMPD_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid2) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid2) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf); + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); H5Tclose(tid2); - H5Tclose(tid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5Tclose(tid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_contig_cmpd_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_chunked_cmpd_vl * @@ -7709,135 +11251,175 @@ error: static int test_copy_dataset_chunked_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1, tid2 = -1; /* Datatype IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ - cmpd_vl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ + cmpd_vl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): chunked dataset with compound VLEN datatype"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) { - buf[i].a = i * (i - 1); - buf[i].b.len = i+1; - buf[i].b.p = (int *)HDmalloc(buf[i].b.len * sizeof(int)); - for(j = 0; j < buf[i].b.len; j++) + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].a = (int)(i * (i - 1)); + buf[i].b.len = i + 1; + buf[i].b.p = (int *)HDmalloc(buf[i].b.len * sizeof(int)); + for (j = 0; j < buf[i].b.len; j++) ((int *)buf[i].b.p)[j] = (int)(i * 10 + j); - buf[i].c = 1. / (i + 1.); + buf[i].c = 1.0 / ((double)i + 1.0); } /* end for */ /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid2 = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((tid = H5Tcreate(H5T_COMPOUND, sizeof(cmpd_vl_t))) < 0) TEST_ERROR - if(H5Tinsert(tid, "a", HOFFSET(cmpd_vl_t, a), H5T_NATIVE_INT) < 0) TEST_ERROR - if(H5Tinsert(tid, "b", HOFFSET(cmpd_vl_t, b), tid2) < 0) TEST_ERROR - if(H5Tinsert(tid, "c", HOFFSET(cmpd_vl_t, c), H5T_NATIVE_DOUBLE) < 0) TEST_ERROR + if ((tid2 = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((tid = H5Tcreate(H5T_COMPOUND, sizeof(cmpd_vl_t))) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "a", HOFFSET(cmpd_vl_t, a), H5T_NATIVE_INT) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "b", HOFFSET(cmpd_vl_t, b), tid2) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "c", HOFFSET(cmpd_vl_t, c), H5T_NATIVE_DOUBLE) < 0) + TEST_ERROR; /* create and set chunk plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 1, chunk_dim1d) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_CMPD_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CMPD_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close chunk plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_CMPD_VL, fid_dst, NAME_DATASET_CMPD_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_CMPD_VL, fid_dst, NAME_DATASET_CMPD_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_CMPD_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_CMPD_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CMPD_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CMPD_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid2) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid2) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf); + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Pclose(pid); H5Tclose(tid2); - H5Tclose(tid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5Tclose(tid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_chunked_cmpd_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_compact_cmpd_vl * @@ -7855,134 +11437,174 @@ error: static int test_copy_dataset_compact_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1, tid2 = -1; /* Datatype IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Dataset creation property list ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - unsigned int i, j; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - cmpd_vl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1, tid2 = -1; /* Datatype IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Dataset creation property list ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t dxpl_id = -1; /* Dataset transfer property list ID */ + unsigned int i, j; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + cmpd_vl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): compact dataset with compound VLEN datatype"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) { - buf[i].a = i * (i - 1); - buf[i].b.len = i+1; - buf[i].b.p = (int *)HDmalloc(buf[i].b.len * sizeof(int)); - for(j = 0; j < buf[i].b.len; j++) + for (i = 0; i < DIM_SIZE_1; i++) { + buf[i].a = (int)(i * (i - 1)); + buf[i].b.len = i + 1; + buf[i].b.p = (int *)HDmalloc(buf[i].b.len * sizeof(int)); + for (j = 0; j < buf[i].b.len; j++) ((int *)buf[i].b.p)[j] = (int)(i * 10 + j); - buf[i].c = 1. / (i + 1.); + buf[i].c = 1.0 / ((double)i + 1.0); } /* end for */ /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create datatype */ - if((tid2 = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((tid = H5Tcreate(H5T_COMPOUND, sizeof(cmpd_vl_t))) < 0) TEST_ERROR - if(H5Tinsert(tid, "a", HOFFSET(cmpd_vl_t, a), H5T_NATIVE_INT) < 0) TEST_ERROR - if(H5Tinsert(tid, "b", HOFFSET(cmpd_vl_t, b), tid2) < 0) TEST_ERROR - if(H5Tinsert(tid, "c", HOFFSET(cmpd_vl_t, c), H5T_NATIVE_DOUBLE) < 0) TEST_ERROR + if ((tid2 = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((tid = H5Tcreate(H5T_COMPOUND, sizeof(cmpd_vl_t))) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "a", HOFFSET(cmpd_vl_t, a), H5T_NATIVE_INT) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "b", HOFFSET(cmpd_vl_t, b), tid2) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "c", HOFFSET(cmpd_vl_t, c), H5T_NATIVE_DOUBLE) < 0) + TEST_ERROR; /* create and set compact plist */ - if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(H5Pset_layout(pid, H5D_COMPACT) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_layout(pid, H5D_COMPACT) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_CMPD_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_CMPD_VL, tid, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close compact plist */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy the dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_CMPD_VL, fid_dst, NAME_DATASET_CMPD_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_CMPD_VL, fid_dst, NAME_DATASET_CMPD_VL, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the dataset for copy */ - if((did = H5Dopen2(fid_src, NAME_DATASET_CMPD_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_CMPD_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open the destination dataset */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CMPD_VL, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CMPD_VL, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the destination dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the source dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* Reclaim vlen buffer */ - if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR; + if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) + TEST_ERROR; + if (H5Treclaim(tid, sid, dxpl_id, buf) < 0) + TEST_ERROR; + if (H5Pclose(dxpl_id) < 0) + TEST_ERROR; + } /* end if */ /* close datatype */ - if(H5Tclose(tid2) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid2) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did2); - H5Dclose(did); - H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf); + H5E_BEGIN_TRY + { + H5Dclose(did2); + H5Dclose(did); + H5Treclaim(tid, sid, H5P_DEFAULT, buf); + H5Pclose(dxpl_id); + H5Pclose(pid); H5Tclose(tid2); - H5Tclose(tid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5Tclose(tid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_compact_cmpd_vl */ - /*------------------------------------------------------------------------- * Function: test_copy_null_ref * @@ -8004,17 +11626,17 @@ error: static int test_copy_null_ref(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid1 = -1, fid2 = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t pid = -1; /* Object copy property list ID */ - hid_t did1 = -1, did2 = -1; /* Dataset IDs */ - hsize_t dim1d[1] = {2}; /* Dataset dimensions */ - hobj_ref_t obj_buf[2]; /* Buffer for object refs */ - hdset_reg_ref_t reg_buf[2]; /* Buffer for region refs */ - char zeros[MAX(sizeof(obj_buf),sizeof(reg_buf))]; /* Array of zeros, for memcmp */ - char src_filename[NAME_BUF_SIZE]; - char mid_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid1 = -1, fid2 = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Object copy property list ID */ + hid_t did1 = -1, did2 = -1; /* Dataset IDs */ + hsize_t dim1d[1] = {2}; /* Dataset dimensions */ + hobj_ref_t obj_buf[2]; /* Buffer for object refs */ + hdset_reg_ref_t reg_buf[2]; /* Buffer for region refs */ + char zeros[MAX(sizeof(obj_buf), sizeof(reg_buf))]; /* Array of zeros, for memcmp */ + char src_filename[NAME_BUF_SIZE]; + char mid_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): NULL references"); @@ -8026,125 +11648,369 @@ test_copy_null_ref(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fap h5_fixname(FILENAME[1], src_fapl, mid_filename, sizeof mid_filename); h5_fixname(FILENAME[2], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* Create source file */ - if((fid1 = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) - TEST_ERROR + if ((fid1 = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* Create object reference dataset at SRC file */ - if((did1 = H5Dcreate2(fid1, "obj_ref_dset", H5T_STD_REF_OBJ, sid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did1 = H5Dcreate2(fid1, "obj_ref_dset", H5T_STD_REF_OBJ, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* Create region reference dataset at SRC file */ - if((did2 = H5Dcreate2(fid1, "reg_ref_dset", H5T_STD_REF_DSETREG, - sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dcreate2(fid1, "reg_ref_dset", H5T_STD_REF_DSETREG, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* Create references */ - if(H5Rcreate(&obj_buf[0], did1, ".", H5R_OBJECT, -1) < 0) TEST_ERROR - if(H5Rcreate(&obj_buf[1], did2, ".", H5R_OBJECT, -1) < 0) TEST_ERROR - if(H5Rcreate(®_buf[0], did1, ".", H5R_DATASET_REGION, sid) < 0) - TEST_ERROR - if(H5Rcreate(®_buf[1], did2, ".", H5R_DATASET_REGION, sid) < 0) - TEST_ERROR + if (H5Rcreate(&obj_buf[0], did1, ".", H5R_OBJECT, (hid_t)-1) < 0) + TEST_ERROR; + if (H5Rcreate(&obj_buf[1], did2, ".", H5R_OBJECT, (hid_t)-1) < 0) + TEST_ERROR; + if (H5Rcreate(®_buf[0], did1, ".", H5R_DATASET_REGION, sid) < 0) + TEST_ERROR; + if (H5Rcreate(®_buf[1], did2, ".", H5R_DATASET_REGION, sid) < 0) + TEST_ERROR; /* Write data into file */ - if(H5Dwrite(did1, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_buf) - < 0) TEST_ERROR - if(H5Dwrite(did2, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, - reg_buf) < 0) TEST_ERROR + if (H5Dwrite(did1, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_buf) < 0) + TEST_ERROR; + if (H5Dwrite(did2, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, reg_buf) < 0) + TEST_ERROR; /* Close datasets */ - if(H5Dclose(did1) < 0) TEST_ERROR - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did1) < 0) + TEST_ERROR; + if (H5Dclose(did2) < 0) + TEST_ERROR; /* Create middle file */ - if((fid2 = H5Fcreate(mid_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) - TEST_ERROR + if ((fid2 = H5Fcreate(mid_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Copy the source file to the middle file. Note the expand references * flag is not set. */ - if(H5Ocopy(fid1, "/", fid2, "/A", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid1, "/", fid2, "/A", H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* Close source file */ - if(H5Fclose(fid1) < 0) TEST_ERROR + if (H5Fclose(fid1) < 0) + TEST_ERROR; /* Open copied datasets */ - if((did1 = H5Dopen2(fid2, "/A/obj_ref_dset", H5P_DEFAULT)) < 0) TEST_ERROR - if((did2 = H5Dopen2(fid2, "/A/reg_ref_dset", H5P_DEFAULT)) < 0) TEST_ERROR + if ((did1 = H5Dopen2(fid2, "/A/obj_ref_dset", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((did2 = H5Dopen2(fid2, "/A/reg_ref_dset", H5P_DEFAULT)) < 0) + TEST_ERROR; /* Read copied datasets */ - if(H5Dread(did1, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_buf) - < 0) TEST_ERROR - if(H5Dread(did2, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, - reg_buf) < 0) TEST_ERROR + if (H5Dread(did1, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_buf) < 0) + TEST_ERROR; + if (H5Dread(did2, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, reg_buf) < 0) + TEST_ERROR; /* Verify that the references contain only "0" bytes */ - if(HDmemcmp(obj_buf, zeros, sizeof(obj_buf))) TEST_ERROR - if(HDmemcmp(reg_buf, zeros, sizeof(reg_buf))) TEST_ERROR + if (HDmemcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) + TEST_ERROR; + if (HDmemcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) + TEST_ERROR; /* Close datasets */ - if(H5Dclose(did1) < 0) TEST_ERROR - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did1) < 0) + TEST_ERROR; + if (H5Dclose(did2) < 0) + TEST_ERROR; /* Create destination file */ - if((fid1 = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) - TEST_ERROR + if ((fid1 = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; /* Create object copy property list */ - if((pid = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; /* Set the "expand references" flag */ - if(H5Pset_copy_object(pid, H5O_COPY_EXPAND_REFERENCE_FLAG) < 0) TEST_ERROR + if (H5Pset_copy_object(pid, H5O_COPY_EXPAND_REFERENCE_FLAG) < 0) + TEST_ERROR; /* Copy the middle file to the destination file. Note the expand references * flag *is* set, even though the references are now NULL. */ - if(H5Ocopy(fid2, "/", fid1, "/AA", pid, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid2, "/", fid1, "/AA", pid, H5P_DEFAULT) < 0) + TEST_ERROR; /* Close source file */ - if(H5Fclose(fid2) < 0) TEST_ERROR + if (H5Fclose(fid2) < 0) + TEST_ERROR; /* Open copied datasets */ - if((did1 = H5Dopen2(fid1, "/AA/A/obj_ref_dset", H5P_DEFAULT)) < 0) TEST_ERROR - if((did2 = H5Dopen2(fid1, "/AA/A/reg_ref_dset", H5P_DEFAULT)) < 0) TEST_ERROR + if ((did1 = H5Dopen2(fid1, "/AA/A/obj_ref_dset", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((did2 = H5Dopen2(fid1, "/AA/A/reg_ref_dset", H5P_DEFAULT)) < 0) + TEST_ERROR; /* Read copied datasets */ - if(H5Dread(did1, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_buf) - < 0) TEST_ERROR - if(H5Dread(did2, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, - reg_buf) < 0) TEST_ERROR + if (H5Dread(did1, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_buf) < 0) + TEST_ERROR; + if (H5Dread(did2, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, reg_buf) < 0) + TEST_ERROR; /* Verify that the references contain only "0" bytes */ - if(HDmemcmp(obj_buf, zeros, sizeof(obj_buf))) TEST_ERROR - if(HDmemcmp(reg_buf, zeros, sizeof(reg_buf))) TEST_ERROR + if (HDmemcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) + TEST_ERROR; + if (HDmemcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) + TEST_ERROR; /* Close */ - if(H5Pclose(pid) < 0) TEST_ERROR - if(H5Dclose(did1) < 0) TEST_ERROR - if(H5Dclose(did2) < 0) TEST_ERROR - if(H5Fclose(fid1) < 0) TEST_ERROR - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; + if (H5Dclose(did1) < 0) + TEST_ERROR; + if (H5Dclose(did2) < 0) + TEST_ERROR; + if (H5Fclose(fid1) < 0) + TEST_ERROR; + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Pclose(pid); H5Dclose(did1); H5Dclose(did2); H5Fclose(fid1); H5Fclose(fid2); H5Sclose(sid); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_null_ref */ - +/*------------------------------------------------------------------------- + * Function: test_copy_null_ref_open + * + * Purpose: Creates 2 datasets with references, one with object and + * the other with region references. Copies these datasets + * to a new file without expanding references, causing them + * to become NULL. Next, copies these references to a third + * file with expanding references, to verify that NULL + * references are handled correctly. + * + * Note: this is copied from test_copy_null_ref() with modifications + * to test for opened datasets in the files. + * + * Return: Success: 0 + * Failure: number of errors + * + * Programmer: Neil Fortner + * Wednesday, March 31, 2010 + * + *------------------------------------------------------------------------- + */ +static int +test_copy_null_ref_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) +{ + hid_t fid1 = -1, fid2 = -1, fid3 = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t pid = -1; /* Object copy property list ID */ + hid_t did1 = -1, did2 = -1; /* Dataset IDs */ + hid_t did3 = -1, did4 = -1; /* Dataset IDs */ + hid_t did5 = -1, did6 = -1; /* Dataset IDs */ + hid_t dcpl = -1; /* Dataset creation property list */ + hsize_t chunk_dim1d[1] = {2}; /* Chunk dimensions */ + hsize_t dim1d[1] = {3}; /* Dataset dimensions */ + hobj_ref_t obj_buf[3]; /* Buffer for object refs */ + hdset_reg_ref_t reg_buf[3]; /* Buffer for region refs */ + char zeros[MAX(sizeof(obj_buf), sizeof(reg_buf))]; /* Array of zeros, for memcmp */ + char src_filename[NAME_BUF_SIZE]; + char mid_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + + TESTING("H5Ocopy(): NULL references for opened datasets"); + + /* Initialize "zeros" array */ + HDmemset(zeros, 0, sizeof(zeros)); + + /* Initialize the filenames */ + h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); + h5_fixname(FILENAME[1], src_fapl, mid_filename, sizeof mid_filename); + h5_fixname(FILENAME[2], dst_fapl, dst_filename, sizeof dst_filename); + + /* Reset file token checking info */ + token_reset(); + + /* Create source file */ + if ((fid1 = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; + + /* Create dataspace */ + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; + + /* create and set chunk plist */ + if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(dcpl, 1, chunk_dim1d) < 0) + TEST_ERROR; + if (H5Pset_deflate(dcpl, 9) < 0) + TEST_ERROR; + if (H5Pset_chunk_opts(dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0) + TEST_ERROR; + + /* Create object reference dataset at SRC file */ + if ((did1 = H5Dcreate2(fid1, "obj_ref_dset", H5T_STD_REF_OBJ, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Create region reference dataset at SRC file */ + if ((did2 = H5Dcreate2(fid1, "reg_ref_dset", H5T_STD_REF_DSETREG, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < + 0) + TEST_ERROR; + + /* Create references */ + if (H5Rcreate(&obj_buf[0], did1, ".", H5R_OBJECT, (hid_t)-1) < 0) + TEST_ERROR; + if (H5Rcreate(&obj_buf[1], did2, ".", H5R_OBJECT, (hid_t)-1) < 0) + TEST_ERROR; + if (H5Rcreate(®_buf[0], did1, ".", H5R_DATASET_REGION, sid) < 0) + TEST_ERROR; + if (H5Rcreate(®_buf[1], did2, ".", H5R_DATASET_REGION, sid) < 0) + TEST_ERROR; + + /* Write data into file */ + if (H5Dwrite(did1, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_buf) < 0) + TEST_ERROR; + if (H5Dwrite(did2, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, reg_buf) < 0) + TEST_ERROR; + + /* Create middle file */ + if ((fid2 = H5Fcreate(mid_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; + + /* Copy the source file to the middle file. Note the expand references + * flag is not set. */ + if (H5Ocopy(fid1, "/", fid2, "/A", H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + + /* Close datasets in source file */ + if (H5Dclose(did1) < 0) + TEST_ERROR; + if (H5Dclose(did2) < 0) + TEST_ERROR; + + /* Close source file */ + if (H5Fclose(fid1) < 0) + TEST_ERROR; + + /* Open copied datasets */ + if ((did3 = H5Dopen2(fid2, "/A/obj_ref_dset", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((did4 = H5Dopen2(fid2, "/A/reg_ref_dset", H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Read copied datasets */ + if (H5Dread(did3, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_buf) < 0) + TEST_ERROR; + if (H5Dread(did4, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, reg_buf) < 0) + TEST_ERROR; + + /* Verify that the references contain only "0" bytes */ + if (HDmemcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) + TEST_ERROR; + if (HDmemcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) + TEST_ERROR; + + /* Create destination file */ + if ((fid3 = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; + + /* Create object copy property list */ + if ((pid = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; + + /* Set the "expand references" flag */ + if (H5Pset_copy_object(pid, H5O_COPY_EXPAND_REFERENCE_FLAG) < 0) + TEST_ERROR; + + /* Copy the middle file to the destination file. Note the expand references + * flag *is* set, even though the references are now NULL. */ + if (H5Ocopy(fid2, "/", fid3, "/AA", pid, H5P_DEFAULT) < 0) + TEST_ERROR; + + /* Close datasets in middle file */ + if (H5Dclose(did3) < 0) + TEST_ERROR; + if (H5Dclose(did4) < 0) + TEST_ERROR; + + /* Close the middle file */ + if (H5Fclose(fid2) < 0) + TEST_ERROR; + + /* Open copied datasets */ + if ((did5 = H5Dopen2(fid3, "/AA/A/obj_ref_dset", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((did6 = H5Dopen2(fid3, "/AA/A/reg_ref_dset", H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* Read copied datasets */ + if (H5Dread(did5, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_buf) < 0) + TEST_ERROR; + if (H5Dread(did6, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, reg_buf) < 0) + TEST_ERROR; + + /* Verify that the references contain only "0" bytes */ + if (HDmemcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) + TEST_ERROR; + if (HDmemcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) + TEST_ERROR; + + /* Close */ + if (H5Pclose(pid) < 0) + TEST_ERROR; + if (H5Pclose(dcpl) < 0) + TEST_ERROR; + if (H5Dclose(did5) < 0) + TEST_ERROR; + if (H5Dclose(did6) < 0) + TEST_ERROR; + if (H5Fclose(fid3) < 0) + TEST_ERROR; + if (H5Sclose(sid) < 0) + TEST_ERROR; + + PASSED(); + return 0; + +error: + H5E_BEGIN_TRY + { + H5Pclose(pid); + H5Pclose(dcpl); + H5Sclose(sid); + H5Dclose(did1); + H5Dclose(did2); + H5Dclose(did3); + H5Dclose(did4); + H5Dclose(did5); + H5Dclose(did6); + H5Fclose(fid1); + H5Fclose(fid2); + H5Fclose(fid3); + } + H5E_END_TRY; + return 1; +} /* end test_copy_null_ref_open */ + /*------------------------------------------------------------------------- * Function: test_copy_attr_crt_order * @@ -8162,11 +12028,11 @@ error: static int test_copy_attr_crt_order(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid1 = -1, fid2 = -1; /* File IDs */ - hid_t gcplid = -1; /* Group creation property list ID */ - hid_t gid1 = -1, gid2 = -1; /* Group IDs */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid1 = -1, fid2 = -1; /* File IDs */ + hid_t gcplid = -1; /* Group creation property list ID */ + hid_t gid1 = -1, gid2 = -1; /* Group IDs */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): attributes with creation order"); @@ -8174,99 +12040,113 @@ test_copy_attr_crt_order(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], src_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* Create source file */ - if((fid1 = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) - TEST_ERROR + if ((fid1 = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Create GCPL */ - if((gcplid = H5Pcreate(H5P_GROUP_CREATE)) < 0) TEST_ERROR + if ((gcplid = H5Pcreate(H5P_GROUP_CREATE)) < 0) + TEST_ERROR; /* Create group with creation order tracked */ - if(H5Pset_attr_creation_order(gcplid, H5P_CRT_ORDER_TRACKED) < 0) TEST_ERROR - if((gid1 = H5Gcreate2(fid1, NAME_GROUP_TOP, H5P_DEFAULT, gcplid, H5P_DEFAULT)) - < 0) - TEST_ERROR + if (H5Pset_attr_creation_order(gcplid, H5P_CRT_ORDER_TRACKED) < 0) + TEST_ERROR; + if ((gid1 = H5Gcreate2(fid1, NAME_GROUP_TOP, H5P_DEFAULT, gcplid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Add attributes to group */ - if(test_copy_attach_attributes(gid1, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid1, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* Close group */ - if(H5Gclose(gid1) < 0) TEST_ERROR + if (H5Gclose(gid1) < 0) + TEST_ERROR; /* Create group with creation order tracked and indexed */ - if(H5Pset_attr_creation_order(gcplid, H5P_CRT_ORDER_TRACKED - | H5P_CRT_ORDER_INDEXED) < 0) - TEST_ERROR - if((gid1 = H5Gcreate2(fid1, NAME_GROUP_TOP2, H5P_DEFAULT, gcplid, - H5P_DEFAULT)) < 0) - TEST_ERROR + if (H5Pset_attr_creation_order(gcplid, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) + TEST_ERROR; + if ((gid1 = H5Gcreate2(fid1, NAME_GROUP_TOP2, H5P_DEFAULT, gcplid, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Add attributes to group */ - if(test_copy_attach_attributes(gid1, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid1, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* Close group */ - if(H5Gclose(gid1) < 0) TEST_ERROR + if (H5Gclose(gid1) < 0) + TEST_ERROR; /* Close GCPL */ - if(H5Pclose(gcplid) < 0) TEST_ERROR - + if (H5Pclose(gcplid) < 0) + TEST_ERROR; /* Create destination file */ - if((fid2 = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) - TEST_ERROR + if ((fid2 = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; /* Copy the groups to the destination file */ - if(H5Ocopy(fid1, NAME_GROUP_TOP, fid2, NAME_GROUP_TOP, H5P_DEFAULT, - H5P_DEFAULT) < 0) - TEST_ERROR - if(H5Ocopy(fid1, NAME_GROUP_TOP2, fid2, NAME_GROUP_TOP2, H5P_DEFAULT, - H5P_DEFAULT) < 0) - TEST_ERROR + if (H5Ocopy(fid1, NAME_GROUP_TOP, fid2, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid1, NAME_GROUP_TOP2, fid2, NAME_GROUP_TOP2, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* Open groups with creation order tracked */ - if((gid1 = H5Gopen2(fid1, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) TEST_ERROR - if((gid2 = H5Gopen2(fid2, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid1 = H5Gopen2(fid1, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((gid2 = H5Gopen2(fid2, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Compare the attributes */ - if(compare_std_attributes(gid1, gid2, H5P_DEFAULT) != TRUE) TEST_ERROR + if (compare_std_attributes(gid1, gid2, H5P_DEFAULT) != TRUE) + TEST_ERROR; /* Close groups */ - if(H5Gclose(gid1) < 0) TEST_ERROR - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid1) < 0) + TEST_ERROR; + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* Open groups with creation order tracked and indexed */ - if((gid1 = H5Gopen2(fid1, NAME_GROUP_TOP2, H5P_DEFAULT)) < 0) TEST_ERROR - if((gid2 = H5Gopen2(fid2, NAME_GROUP_TOP2, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid1 = H5Gopen2(fid1, NAME_GROUP_TOP2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((gid2 = H5Gopen2(fid2, NAME_GROUP_TOP2, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Compare the attributes */ - if(compare_std_attributes(gid1, gid2, H5P_DEFAULT) != TRUE) TEST_ERROR + if (compare_std_attributes(gid1, gid2, H5P_DEFAULT) != TRUE) + TEST_ERROR; /* Close groups */ - if(H5Gclose(gid1) < 0) TEST_ERROR - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid1) < 0) + TEST_ERROR; + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* Close */ - if(H5Fclose(fid1) < 0) TEST_ERROR - if(H5Fclose(fid2) < 0) TEST_ERROR + if (H5Fclose(fid1) < 0) + TEST_ERROR; + if (H5Fclose(fid2) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Gclose(gid1); H5Gclose(gid2); H5Pclose(gcplid); H5Fclose(fid1); H5Fclose(fid2); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_attr_crt_order */ - /*------------------------------------------------------------------------- * Function: test_copy_committed_datatype_merge * @@ -8281,31 +12161,32 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_committed_datatype_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, - hid_t dst_fapl, hbool_t reopen) +test_copy_committed_datatype_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, + hbool_t reopen) { - hid_t fid_src1 = -1, fid_src2 = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t ocpypl_id = -1; /* Object copy plist ID */ - unsigned int i; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - int buf[DIM_SIZE_1]; /* Buffer for writing data */ - H5O_info_t oinfo; /* Object info */ - haddr_t exp_addr; /* Expected object address */ - char src1_filename[NAME_BUF_SIZE]; - char src2_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - - if(reopen) { - TESTING("H5Ocopy(): merging committed datatypes with reopen") + hid_t fid_src1 = -1, fid_src2 = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t ocpypl_id = -1; /* Object copy plist ID */ + unsigned int i; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + int buf[DIM_SIZE_1]; /* Buffer for writing data */ + H5O_info2_t oinfo; /* Object info */ + H5O_token_t exp_token; /* Expected object token */ + char src1_filename[NAME_BUF_SIZE]; + char src2_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + int token_cmp; + + if (reopen) { + TESTING("H5Ocopy(): merging committed datatypes with reopen"); } /* end if */ else - TESTING("H5Ocopy(): merging committed datatypes") + TESTING("H5Ocopy(): merging committed datatypes"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = (int)i; /* Initialize the filenames */ @@ -8313,185 +12194,266 @@ test_copy_committed_datatype_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap h5_fixname(FILENAME[3], src_fapl, src2_filename, sizeof src2_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source files */ - if((fid_src1 = H5Fcreate(src1_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR - if((fid_src2 = H5Fcreate(src2_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src1 = H5Fcreate(src1_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; + if ((fid_src2 = H5Fcreate(src2_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* * Populate source file 1 */ /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type */ - if((H5Tcommit2(fid_src1, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype */ + if ((H5Tcommit2(fid_src1, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src1, NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src1, NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file 1 */ - if(H5Fclose(fid_src1) < 0) TEST_ERROR + if (H5Fclose(fid_src1) < 0) + TEST_ERROR; /* * Populate source file 2 */ /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type */ - if((H5Tcommit2(fid_src2, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype */ + if ((H5Tcommit2(fid_src2, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src2, NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src2, NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file 1 */ - if(H5Fclose(fid_src2) < 0) TEST_ERROR - + if (H5Fclose(fid_src2) < 0) + TEST_ERROR; /* open the source files with read-only */ - if((fid_src1 = H5Fopen(src1_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR - if((fid_src2 = H5Fopen(src2_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src1 = H5Fopen(src1_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; + if ((fid_src2 = H5Fopen(src2_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* Create ocpl and set merge named dtype flag */ - if((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR - if(H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) TEST_ERROR + if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; + if (H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) + TEST_ERROR; /* * First copy each entire file to the destination file (each with their own * group), and verify the committed datatypes are merged */ /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy SRC1 to DST */ - if(H5Ocopy(fid_src1, "/", fid_dst, NAME_GROUP_TOP, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src1, "/", fid_dst, NAME_GROUP_TOP, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; /* copy SRC2 to DST */ - if(H5Ocopy(fid_src2, "/", fid_dst, NAME_GROUP_TOP2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src2, "/", fid_dst, NAME_GROUP_TOP2, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open SRC1 committed dtype, get address */ - if((tid = H5Topen2(fid_dst, NAME_GROUP_TOP "/" NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open SRC1 dset dtype, check address */ - if((did = H5Dopen2(fid_dst, NAME_GROUP_TOP "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* Open SRC2 committed dtype, check address */ - if((tid = H5Topen2(fid_dst, NAME_GROUP_TOP2 "/" NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open SRC2 dset dtype, check address */ - if((did = H5Dopen2(fid_dst, NAME_GROUP_TOP2 "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* Open SRC1 committed dtype, get token */ + if ((tid = H5Topen2(fid_dst, NAME_GROUP_TOP "/" NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open SRC1 dset dtype, check token */ + if ((did = H5Dopen2(fid_dst, NAME_GROUP_TOP "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Open SRC2 committed dtype, check token */ + if ((tid = H5Topen2(fid_dst, NAME_GROUP_TOP2 "/" NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open SRC2 dset dtype, check token */ + if ((did = H5Dopen2(fid_dst, NAME_GROUP_TOP2 "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* * Now copy only the datasets to the destination file, and verify the committed * datatypes are merged */ /* recreate destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* copy SRC1 to DST */ - if(H5Ocopy(fid_src1, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src1, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; /* copy SRC2 to DST */ - if(H5Ocopy(fid_src2, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src2, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE2, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open SRC1 dset dtype, get address */ - if((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* Open SRC2 dset dtype, check address */ - if((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* Open SRC1 dset dtype, get token */ + if ((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Open SRC2 dset dtype, check token */ + if ((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* close the SRC files */ - if(H5Fclose(fid_src1) < 0) TEST_ERROR - if(H5Fclose(fid_src2) < 0) TEST_ERROR + if (H5Fclose(fid_src1) < 0) + TEST_ERROR; + if (H5Fclose(fid_src2) < 0) + TEST_ERROR; /* close property list */ - if(H5Pclose(ocpypl_id) < 0) TEST_ERROR + if (H5Pclose(ocpypl_id) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Fclose(fid_src1); H5Fclose(fid_src2); H5Fclose(fid_dst); @@ -8499,11 +12461,11 @@ error: H5Sclose(sid); H5Dclose(did); H5Pclose(ocpypl_id); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_committed_datatype_merge */ - /*------------------------------------------------------------------------- * Function: test_copy_committed_datatype_merge_same_file * @@ -8521,261 +12483,384 @@ error: static int test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reopen) { - hid_t fid = -1; /* File ID */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t gid = -1; /* Group ID */ - hid_t ocpypl_id = -1; /* Object copy plist ID */ - unsigned int i; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - int buf[DIM_SIZE_1]; /* Buffer for writing data */ - H5O_info_t oinfo; /* Object info */ - haddr_t exp_addr; /* Expected object address */ - char filename[NAME_BUF_SIZE]; - - if(reopen) - TESTING("H5Ocopy(): merging committed datatypes to the source file with reopen") + hid_t fid = -1; /* File ID */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t gid = -1; /* Group ID */ + hid_t ocpypl_id = -1; /* Object copy plist ID */ + unsigned int i; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + int buf[DIM_SIZE_1]; /* Buffer for writing data */ + H5O_info2_t oinfo; /* Object info */ + H5O_token_t exp_token; /* Expected object token */ + char filename[NAME_BUF_SIZE]; + int token_cmp; + + if (reopen) + TESTING("H5Ocopy(): merging committed datatypes to the source file with reopen"); else - TESTING("H5Ocopy(): merging committed datatypes to the source file") + TESTING("H5Ocopy(): merging committed datatypes to the source file"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = (int)i; /* Initialize the filename */ h5_fixname(FILENAME[0], fapl, filename, sizeof filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create file */ - if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) TEST_ERROR + if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* * Populate first group */ /* Create group */ - if((gid = H5Gcreate2(fid, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type */ - if((H5Tcommit2(fid, NAME_GROUP_TOP "/" NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype */ + if ((H5Tcommit2(fid, NAME_GROUP_TOP "/" NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid, NAME_GROUP_TOP "/" NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid, NAME_GROUP_TOP "/" NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* * Populate second group */ /* Create group */ - if((gid = H5Gcreate2(fid, NAME_GROUP_TOP2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid, NAME_GROUP_TOP2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type */ - if((H5Tcommit2(fid, NAME_GROUP_TOP2 "/" NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype */ + if ((H5Tcommit2(fid, NAME_GROUP_TOP2 "/" NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid, NAME_GROUP_TOP2 "/" NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid, NAME_GROUP_TOP2 "/" NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the group */ - if(H5Gclose(gid) < 0) TEST_ERROR - + if (H5Gclose(gid) < 0) + TEST_ERROR; /* Create ocpl and set merge committed dtype flag */ - if((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR - if(H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) TEST_ERROR + if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; + if (H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) + TEST_ERROR; /* * First copy each group to the destination group 3 (each with their own * group), and verify the committed datatypes are merged as expected. All - * datatypes copied should reference (share an address with) the + * datatypes copied should reference (share a token with) the * corresponding source datatype. */ /* Create destination group */ - if((gid = H5Gcreate2(fid, NAME_GROUP_TOP3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Gclose(gid) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid, NAME_GROUP_TOP3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Gclose(gid) < 0) + TEST_ERROR; /* copy group 1 to DST */ - if(H5Ocopy(fid, NAME_GROUP_TOP, fid, NAME_GROUP_TOP3 "/" NAME_GROUP_TOP, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid, NAME_GROUP_TOP, fid, NAME_GROUP_TOP3 "/" NAME_GROUP_TOP, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; /* copy group 2 to DST */ - if(H5Ocopy(fid, NAME_GROUP_TOP2, fid, NAME_GROUP_TOP3 "/" NAME_GROUP_TOP2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid, NAME_GROUP_TOP2, fid, NAME_GROUP_TOP3 "/" NAME_GROUP_TOP2, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid) < 0) TEST_ERROR - if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) TEST_ERROR + if (H5Fclose(fid) < 0) + TEST_ERROR; + if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open group 1 source committed dtype, get address */ - if((tid = H5Topen2(fid, NAME_GROUP_TOP "/" NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open group 1 source dset dtype, check address */ - if((did = H5Dopen2(fid, NAME_GROUP_TOP "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* Open group 1 committed dtype, check address */ - if((tid = H5Topen2(fid, NAME_GROUP_TOP3 "/" NAME_GROUP_TOP "/" NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open group 1 dset dtype, check address */ - if((did = H5Dopen2(fid, NAME_GROUP_TOP3 "/" NAME_GROUP_TOP "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* Open group 2 source committed dtype, get address and make sure it is + /* Open group 1 source committed dtype, get token */ + if ((tid = H5Topen2(fid, NAME_GROUP_TOP "/" NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open group 1 source dset dtype, check token */ + if ((did = H5Dopen2(fid, NAME_GROUP_TOP "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Open group 1 committed dtype, check token */ + if ((tid = H5Topen2(fid, NAME_GROUP_TOP3 "/" NAME_GROUP_TOP "/" NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open group 1 dset dtype, check token */ + if ((did = H5Dopen2(fid, NAME_GROUP_TOP3 "/" NAME_GROUP_TOP "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Open group 2 source committed dtype, get token and make sure it is * different from group 1 source committed dtype */ - if((tid = H5Topen2(fid, NAME_GROUP_TOP2 "/" NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr == exp_addr) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open group 2 source dset dtype, check address */ - if((did = H5Dopen2(fid, NAME_GROUP_TOP2 "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* Open group 2 committed dtype, check address */ - if((tid = H5Topen2(fid, NAME_GROUP_TOP3 "/" NAME_GROUP_TOP2 "/" NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open group 2 dset dtype, check address */ - if((did = H5Dopen2(fid, NAME_GROUP_TOP3 "/" NAME_GROUP_TOP2 "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if ((tid = H5Topen2(fid, NAME_GROUP_TOP2 "/" NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (!token_cmp) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open group 2 source dset dtype, check token */ + if ((did = H5Dopen2(fid, NAME_GROUP_TOP2 "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Open group 2 committed dtype, check token */ + if ((tid = H5Topen2(fid, NAME_GROUP_TOP3 "/" NAME_GROUP_TOP2 "/" NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open group 2 dset dtype, check token */ + if ((did = H5Dopen2(fid, NAME_GROUP_TOP3 "/" NAME_GROUP_TOP2 "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* * Now copy only the datasets to the destination group, and verify the committed * datatypes are merged as expected */ /* Create destination group */ - if((gid = H5Gcreate2(fid, NAME_GROUP_TOP4, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Gclose(gid) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid, NAME_GROUP_TOP4, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Gclose(gid) < 0) + TEST_ERROR; /* copy SRC1 to DST */ - if(H5Ocopy(fid, NAME_GROUP_TOP "/" NAME_DATASET_SIMPLE, fid, NAME_GROUP_TOP4 "/" NAME_DATASET_SIMPLE, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid, NAME_GROUP_TOP "/" NAME_DATASET_SIMPLE, fid, NAME_GROUP_TOP4 "/" NAME_DATASET_SIMPLE, + ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; /* copy SRC2 to DST */ - if(H5Ocopy(fid, NAME_GROUP_TOP2 "/" NAME_DATASET_SIMPLE, fid, NAME_GROUP_TOP4 "/" NAME_DATASET_SIMPLE2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid, NAME_GROUP_TOP2 "/" NAME_DATASET_SIMPLE, fid, NAME_GROUP_TOP4 "/" NAME_DATASET_SIMPLE2, + ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid) < 0) TEST_ERROR - if((fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) TEST_ERROR + if (H5Fclose(fid) < 0) + TEST_ERROR; + if ((fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open group 1 source dset dtype, get address */ - if((did = H5Dopen2(fid, NAME_GROUP_TOP "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* Open group 1 dset dtype, check address */ - if((did = H5Dopen2(fid, NAME_GROUP_TOP4 "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* Open group 2 source dset dtype, get address and make sure it is + /* Open group 1 source dset dtype, get token */ + if ((did = H5Dopen2(fid, NAME_GROUP_TOP "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Open group 1 dset dtype, check token */ + if ((did = H5Dopen2(fid, NAME_GROUP_TOP4 "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Open group 2 source dset dtype, get token and make sure it is * different from group 1 source dset dtype */ - if((did = H5Dopen2(fid, NAME_GROUP_TOP2 "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr == exp_addr) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* Open group 2 dset dtype, check address */ - if((did = H5Dopen2(fid, NAME_GROUP_TOP4 "/" NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if ((did = H5Dopen2(fid, NAME_GROUP_TOP2 "/" NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (!token_cmp) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Open group 2 dset dtype, check token */ + if ((did = H5Dopen2(fid, NAME_GROUP_TOP4 "/" NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* Close file */ - if(H5Fclose(fid) < 0) TEST_ERROR + if (H5Fclose(fid) < 0) + TEST_ERROR; /* close property list */ - if(H5Pclose(ocpypl_id) < 0) TEST_ERROR + if (H5Pclose(ocpypl_id) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Fclose(fid); H5Tclose(tid); H5Sclose(sid); H5Dclose(did); H5Pclose(ocpypl_id); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_committed_datatype_merge_same_file */ - - /*------------------------------------------------------------------------- * Function: test_copy_committed_dt_merge_sugg * @@ -8792,219 +12877,288 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, - hid_t dst_fapl, hbool_t reopen) +test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, + hbool_t reopen) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t ocpypl_id = -1; /* Object copy plist ID */ - unsigned int i; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - int buf[DIM_SIZE_1]; /* Buffer for writing data */ - H5O_info_t oinfo; /* Object info */ - haddr_t exp_addr; /* Expected object address */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - - if(reopen) - TESTING("H5Ocopy(): merging committed datatypes with suggestions and reopen") + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t ocpypl_id = -1; /* Object copy plist ID */ + unsigned int i; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + int buf[DIM_SIZE_1]; /* Buffer for writing data */ + H5O_info2_t oinfo; /* Object info */ + H5O_token_t exp_token; /* Expected object token */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + int token_cmp; + + if (reopen) + TESTING("H5Ocopy(): merging committed datatypes with suggestions and reopen"); else - TESTING("H5Ocopy(): merging committed datatypes with suggestions") + TESTING("H5Ocopy(): merging committed datatypes with suggestions"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = (int)i; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* * Populate source file */ /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype */ + if ((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; /* * Populate destination file */ /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type "a" */ - if((H5Tcommit2(fid_dst, "/a", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype "a" */ + if ((H5Tcommit2(fid_dst, "/a", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type "b" */ - if((H5Tcommit2(fid_dst, "/b", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype "b" */ + if ((H5Tcommit2(fid_dst, "/b", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* Create ocpl and set merge committed dtype flag */ - if((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR - if(H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) TEST_ERROR + if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; + if (H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) + TEST_ERROR; /* * First copy dataset using "/b" as a suggestion, and verify that it uses * datatype "b" in the destination file */ /* Add datatype suggestion */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, "/b") < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, "/b") < 0) + TEST_ERROR; /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* copy SRC dset to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open committed dtype "b", get address */ - if((tid = H5Topen2(fid_dst, "/b", H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open dset dtype, check address */ - if((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* Open committed dtype "b", get token */ + if ((tid = H5Topen2(fid_dst, "/b", H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open dset dtype, check token */ + if ((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* * Now free suggestions, copy dataset without any suggestions, and verify * that it uses datatype "a" in the destination file */ /* Free suggestions */ - if(H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) TEST_ERROR + if (H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) + TEST_ERROR; /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* Delete destination dataset */ /* copy SRC dset to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE2, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open committed dtype "a", get address */ - if((tid = H5Topen2(fid_dst, "/a", H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open dset 2 dtype, check address */ - if((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* Open committed dtype "b", get address */ - if((tid = H5Topen2(fid_dst, "/b", H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open dset dtype, check address */ - if((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* Open committed dtype "a", get token */ + if ((tid = H5Topen2(fid_dst, "/a", H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open dset 2 dtype, check token */ + if ((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Open committed dtype "b", get token */ + if ((tid = H5Topen2(fid_dst, "/b", H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open dset dtype, check token */ + if ((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close property list */ - if(H5Pclose(ocpypl_id) < 0) TEST_ERROR + if (H5Pclose(ocpypl_id) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Fclose(fid_src); H5Fclose(fid_dst); H5Tclose(tid); H5Sclose(sid); H5Dclose(did); H5Pclose(ocpypl_id); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_committed_dt_merge_sugg */ - /*------------------------------------------------------------------------- * Function: test_copy_committed_dt_merge_attr * @@ -9021,163 +13175,207 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_committed_dt_merge_attr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, - hid_t dst_fapl, hbool_t reopen) +test_copy_committed_dt_merge_attr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, + hbool_t reopen) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t aid = -1; /* Attribute ID */ - hid_t gid = -1; /* Group ID */ - hid_t ocpypl_id = -1; /* Object copy plist ID */ - unsigned int i; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - int buf[DIM_SIZE_1]; /* Buffer for writing data */ - H5O_info_t oinfo; /* Object info */ - haddr_t exp_addr; /* Expected object address */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - - if(reopen) - TESTING("H5Ocopy(): merging committed datatypes with attributes and reopen") + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t aid = -1; /* Attribute ID */ + hid_t gid = -1; /* Group ID */ + hid_t ocpypl_id = -1; /* Object copy plist ID */ + unsigned int i; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + int buf[DIM_SIZE_1]; /* Buffer for writing data */ + H5O_info2_t oinfo; /* Object info */ + H5O_token_t exp_token; /* Expected object token */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + int token_cmp; + + if (reopen) + TESTING("H5Ocopy(): merging committed datatypes with attributes and reopen"); else - TESTING("H5Ocopy(): merging committed datatypes with attributes") + TESTING("H5Ocopy(): merging committed datatypes with attributes"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = (int)i; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* * Populate source file */ /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype */ + if ((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; /* * Populate destination file */ /* Create group */ - if((gid = H5Gcreate2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* create anonymous committed data type */ - if((H5Tcommit_anon(fid_dst, tid, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* create anonymous committed datatype */ + if ((H5Tcommit_anon(fid_dst, tid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create attribute at SRC file */ - if((aid = H5Acreate2(gid, "attr", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((aid = H5Acreate2(gid, "attr", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Awrite(aid, tid, buf) < 0) TEST_ERROR + if (H5Awrite(aid, tid, buf) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the attribute */ - if(H5Aclose(aid) < 0) TEST_ERROR + if (H5Aclose(aid) < 0) + TEST_ERROR; /* close the group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* Create ocpl and set merge committed dtype flag */ - if((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR - if(H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) TEST_ERROR + if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; + if (H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) + TEST_ERROR; /* * Copy dataset and verify that it uses the same committed datatype as the * already existing attribute in the destination file. */ /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* copy SRC dset to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open attribute dtype, get address */ - if((aid = H5Aopen_by_name(fid_dst, NAME_GROUP_TOP, "attr", H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Aget_type(aid)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR - - /* Open dset dtype, check address */ - if((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* Open attribute dtype, get token */ + if ((aid = H5Aopen_by_name(fid_dst, NAME_GROUP_TOP, "attr", H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Aget_type(aid)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; + + /* Open dset dtype, check token */ + if ((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close property list */ - if(H5Pclose(ocpypl_id) < 0) TEST_ERROR + if (H5Pclose(ocpypl_id) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Fclose(fid_src); H5Fclose(fid_dst); H5Tclose(tid); @@ -9186,61 +13384,62 @@ error: H5Aclose(aid); H5Gclose(gid); H5Pclose(ocpypl_id); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_committed_dt_merge_attr */ /* * Defines used for the committed datatype tests */ -#define SRC_ROOT_GROUP "src_root" -#define ROOT_NDT_INT "root_ndt_int" +#define SRC_ROOT_GROUP "src_root" +#define ROOT_NDT_INT "root_ndt_int" #define GROUP_NDT_SHORT "group_ndt_short" -#define SRC_GRP "src_grp" -#define DST_GRP "dst_grp" -#define DST_GRP2 "dst_grp2" +#define SRC_GRP "src_grp" +#define DST_GRP "dst_grp" +#define DST_GRP2 "dst_grp2" -#define SRC_NDT_SHORT "src_ndt_short" -#define SRC_NDT_INT "src_ndt_int" -#define SRC_NDT_INT2 "src_ndt_int2" -#define SRC_NDT_FLOAT "src_ndt_float" -#define SRC_NDT_DOUBLE "src_ndt_double" +#define SRC_NDT_SHORT "src_ndt_short" +#define SRC_NDT_INT "src_ndt_int" +#define SRC_NDT_INT2 "src_ndt_int2" +#define SRC_NDT_FLOAT "src_ndt_float" +#define SRC_NDT_DOUBLE "src_ndt_double" -#define DST_NDT_SHORT "dst_ndt_short" -#define DST_NDT_INT "dst_ndt_int" -#define DST_NDT_FLOAT "dst_ndt_float" -#define DST_NDT_DOUBLE "dst_ndt_double" +#define DST_NDT_SHORT "dst_ndt_short" +#define DST_NDT_INT "dst_ndt_int" +#define DST_NDT_FLOAT "dst_ndt_float" +#define DST_NDT_DOUBLE "dst_ndt_double" -#define SRC_NDT_DSET "src_ndt_dset" -#define SRC_NDT_DSET2 "src_ndt_dset2" -#define SRC_NDT_DSET3 "src_ndt_dset3" +#define SRC_NDT_DSET "src_ndt_dset" +#define SRC_NDT_DSET2 "src_ndt_dset2" +#define SRC_NDT_DSET3 "src_ndt_dset3" -#define SRC_DSET "src_dset" -#define SRC_DSET1 "src_dset1" +#define SRC_DSET "src_dset" +#define SRC_DSET1 "src_dset1" -#define SRC_ATTR "src_attr" +#define SRC_ATTR "src_attr" -#define DST_ATTR_ANON_SHORT "dst_attr_anon_short" -#define DST_ATTR_ANON_INT "dst_attr_anon_int" +#define DST_ATTR_ANON_SHORT "dst_attr_anon_short" +#define DST_ATTR_ANON_INT "dst_attr_anon_int" #define DST_ATTR "dst_attr" -#define DST_ATTR2 "dst_attr2" - +#define DST_ATTR2 "dst_attr2" + /*------------------------------------------------------------------------- * Function: test_copy_cdt_hier_merge * * Purpose: Tests the "merge committed datatypes" feature of H5Ocopy: - * SRC file: - * Create committed datatypes at / and /g0 - * Create datasets with native type and committed datatypes at /g0 - * DST file: - * Create attributes with anonymous committed datatypes at /uncopied + * SRC file: + * Create committed datatypes at / and /g0 + * Create datasets with native type and committed datatypes at /g0 + * DST file: + * Create attributes with anonymous committed datatypes at /uncopied * - * Copy / at SRC to DST - * Copy /g0 at SRC to DST - * Copy the datasets in /g0 at SRC to DST /uncopied - * Verify that committed datatypes are copied and merged correctly + * Copy / at SRC to DST + * Copy /g0 at SRC to DST + * Copy the datasets in /g0 at SRC to DST /uncopied + * Verify that committed datatypes are copied and merged correctly * * Return: Success: 0 * Failure: number of errors @@ -9252,324 +13451,467 @@ error: static int test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t reopen) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t gid = -1; /* Group IDs */ - hid_t f_tid = -1; /* Datatype ID for root group */ - hid_t g_tid = -1; /* Datatype ID for group */ - hid_t anon_tid = -1; /* Anonymous datatype */ - hid_t aid = -1; /* Attribute ID */ - hid_t ocpypl_id = -1; /* Object copy plist ID */ - int i; /* Local index variable */ - hsize_t dim1d[1]; /* dimension sizes */ - int buf[DIM_SIZE_1]; /* Buffer for data */ - haddr_t exp_addr_int, exp_addr_short; /* Expected object addresses */ - H5O_info_t oinfo; /* Object info */ - char src_filename[NAME_BUF_SIZE]; /* Source file name */ - char dst_filename[NAME_BUF_SIZE]; /* Destination file name */ - - if(reopen) - TESTING("H5Ocopy(): hier. of committed datatypes and merging with reopen") + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t gid = -1; /* Group IDs */ + hid_t f_tid = -1; /* Datatype ID for root group */ + hid_t g_tid = -1; /* Datatype ID for group */ + hid_t anon_tid = -1; /* Anonymous datatype */ + hid_t aid = -1; /* Attribute ID */ + hid_t ocpypl_id = -1; /* Object copy plist ID */ + int i; /* Local index variable */ + hsize_t dim1d[1]; /* dimension sizes */ + int buf[DIM_SIZE_1]; /* Buffer for data */ + H5O_token_t exp_token_int, exp_token_short; /* Expected object tokenes */ + H5O_info2_t oinfo; /* Object info */ + char src_filename[NAME_BUF_SIZE]; /* Source file name */ + char dst_filename[NAME_BUF_SIZE]; /* Destination file name */ + int token_cmp; + + if (reopen) + TESTING("H5Ocopy(): hier. of committed datatypes and merging with reopen"); else - TESTING("H5Ocopy(): hier. of committed datatypes and merging ") + TESTING("H5Ocopy(): hier. of committed datatypes and merging "); /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = i; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); - /* - * Populate source file + /* + * Populate source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create and commit committed datatype (int) to root group */ - if((f_tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((H5Tcommit2(fid_src, ROOT_NDT_INT, f_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((f_tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_src, ROOT_NDT_INT, f_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Create group /g0 */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create and commit committed datatype (short) to group /g0 */ - if((g_tid = H5Tcopy(H5T_NATIVE_SHORT)) < 0) TEST_ERROR - if((H5Tcommit2(gid, GROUP_NDT_SHORT, g_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((g_tid = H5Tcopy(H5T_NATIVE_SHORT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(gid, GROUP_NDT_SHORT, g_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create dataset of native int in /g0 */ - if((did = H5Dcreate2(gid, SRC_DSET1, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, SRC_DSET1, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data to dataset */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* create dataset of committed datatype (short) in /g0 */ - if((did = H5Dcreate2(gid, SRC_NDT_DSET2, g_tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, SRC_NDT_DSET2, g_tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data to dataset */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* create dataset of committed datatype (int) in /g0 */ - if((did = H5Dcreate2(gid, SRC_NDT_DSET3, f_tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, SRC_NDT_DSET3, f_tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data to dataset */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the datatypes */ - if(H5Tclose(f_tid) < 0) TEST_ERROR - if(H5Tclose(g_tid) < 0) TEST_ERROR + if (H5Tclose(f_tid) < 0) + TEST_ERROR; + if (H5Tclose(g_tid) < 0) + TEST_ERROR; /* close group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; - /* - * Populate destination file + /* + * Populate destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; /* create group /uncopied */ - if((gid = H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create and commit anonymous datatype (short) to /uncopied */ - if((anon_tid = H5Tcopy(H5T_NATIVE_SHORT)) < 0) TEST_ERROR - if((H5Tcommit_anon(gid, anon_tid, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((anon_tid = H5Tcopy(H5T_NATIVE_SHORT)) < 0) + TEST_ERROR; + if ((H5Tcommit_anon(gid, anon_tid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create attribute of anon ndt (short) in /uncopied */ - if((aid = H5Acreate2(gid, DST_ATTR_ANON_SHORT, anon_tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR + if ((aid = H5Acreate2(gid, DST_ATTR_ANON_SHORT, anon_tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the attribute */ - if(H5Aclose(aid) < 0) TEST_ERROR + if (H5Aclose(aid) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(anon_tid) < 0) TEST_ERROR + if (H5Tclose(anon_tid) < 0) + TEST_ERROR; /* create and commit anonymous datatype (int) to /uncopied */ - if((anon_tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((H5Tcommit_anon(gid, anon_tid, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((anon_tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit_anon(gid, anon_tid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create attribute of anon ndt (int) in /uncopied */ - if((aid = H5Acreate2(gid, DST_ATTR_ANON_INT, anon_tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR + if ((aid = H5Acreate2(gid, DST_ATTR_ANON_INT, anon_tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the attribute */ - if(H5Aclose(aid) < 0) TEST_ERROR + if (H5Aclose(aid) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(anon_tid) < 0) TEST_ERROR + if (H5Tclose(anon_tid) < 0) + TEST_ERROR; /* close the group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; } /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create ocpl and set merge committed datatype flag */ - if((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR - if(H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) TEST_ERROR + if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; + if (H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) + TEST_ERROR; /* * Test 1 : copy / in SRC file to DST file */ - if(H5Ocopy(fid_src, "/", fid_dst, SRC_ROOT_GROUP, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR - - /* get address of committed datatype at root group */ - if((tid = H5Topen2(fid_dst, SRC_ROOT_GROUP "/" ROOT_NDT_INT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr_int = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* get address of committed datatype at /g0 */ - if((tid = H5Topen2(fid_dst, SRC_ROOT_GROUP NAME_GROUP_TOP "/" GROUP_NDT_SHORT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr_short = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Ocopy(fid_src, "/", fid_dst, SRC_ROOT_GROUP, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; + + /* get token of committed datatype at root group */ + if ((tid = H5Topen2(fid_dst, SRC_ROOT_GROUP "/" ROOT_NDT_INT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token_int, &oinfo.token, sizeof(exp_token_int)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* get token of committed datatype at /g0 */ + if ((tid = H5Topen2(fid_dst, SRC_ROOT_GROUP NAME_GROUP_TOP "/" GROUP_NDT_SHORT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token_short, &oinfo.token, sizeof(exp_token_short)); + if (H5Tclose(tid) < 0) + TEST_ERROR; /* verify the datatype of first dataset is not committed */ - if((did = H5Dopen2(fid_dst, SRC_ROOT_GROUP NAME_GROUP_TOP "/" SRC_DSET1, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Tcommitted(tid)) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* check address of datatype for second dataset */ - if((did = H5Dopen2(fid_dst, SRC_ROOT_GROUP NAME_GROUP_TOP "/" SRC_NDT_DSET2, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr_short) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* check address of datatype for third dataset */ - if((did = H5Dopen2(fid_dst, SRC_ROOT_GROUP NAME_GROUP_TOP "/" SRC_NDT_DSET3, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr_int) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_dst, SRC_ROOT_GROUP NAME_GROUP_TOP "/" SRC_DSET1, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Tcommitted(tid)) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* check token of datatype for second dataset */ + if ((did = H5Dopen2(fid_dst, SRC_ROOT_GROUP NAME_GROUP_TOP "/" SRC_NDT_DSET2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token_short, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* check token of datatype for third dataset */ + if ((did = H5Dopen2(fid_dst, SRC_ROOT_GROUP NAME_GROUP_TOP "/" SRC_NDT_DSET3, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token_int, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* * Test 2: copy /g0 in SRC to DST */ - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR - - /* get address of committed datatype at /g0 */ - if((tid = H5Topen2(fid_dst, NAME_GROUP_TOP "/" GROUP_NDT_SHORT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr_short) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; + + /* get token of committed datatype at /g0 */ + if ((tid = H5Topen2(fid_dst, NAME_GROUP_TOP "/" GROUP_NDT_SHORT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token_short, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* verify the datatype of first dataset is not committed */ - if((did = H5Dopen2(fid_dst, NAME_GROUP_TOP "/" SRC_DSET1, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Tcommitted(tid)) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* check address of datatype for second dataset */ - if((did = H5Dopen2(fid_dst, NAME_GROUP_TOP "/" SRC_NDT_DSET2, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr_short) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* check address of datatype for third dataset */ - if((did = H5Dopen2(fid_dst, NAME_GROUP_TOP "/" SRC_NDT_DSET3, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr_int) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_dst, NAME_GROUP_TOP "/" SRC_DSET1, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Tcommitted(tid)) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* check token of datatype for second dataset */ + if ((did = H5Dopen2(fid_dst, NAME_GROUP_TOP "/" SRC_NDT_DSET2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token_short, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* check token of datatype for third dataset */ + if ((did = H5Dopen2(fid_dst, NAME_GROUP_TOP "/" SRC_NDT_DSET3, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token_int, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* - * Test 3: copy datsets in /g0 at SRC to DST group /uncopied + * Test 3: copy datasets in /g0 at SRC to DST group /uncopied */ - if(H5Ocopy(fid_src, NAME_GROUP_TOP "/" SRC_DSET1, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_DSET1, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Ocopy(fid_src, NAME_GROUP_TOP "/" SRC_NDT_DSET2, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Ocopy(fid_src, NAME_GROUP_TOP "/" SRC_NDT_DSET3, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET3, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR - - /* Open attribute with anon ndt (short), get address */ - if((aid = H5Aopen_by_name(fid_dst, NAME_GROUP_UNCOPIED, DST_ATTR_ANON_SHORT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Aget_type(aid)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr_short) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR - - /* Open attribute with anon ndt (int), get address */ - if((aid = H5Aopen_by_name(fid_dst, NAME_GROUP_UNCOPIED, DST_ATTR_ANON_INT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Aget_type(aid)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr_int) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP "/" SRC_DSET1, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_DSET1, ocpypl_id, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_GROUP_TOP "/" SRC_NDT_DSET2, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET2, + ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_GROUP_TOP "/" SRC_NDT_DSET3, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET3, + ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; + + /* Open attribute with anon ndt (short), get token */ + if ((aid = H5Aopen_by_name(fid_dst, NAME_GROUP_UNCOPIED, DST_ATTR_ANON_SHORT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; + if ((tid = H5Aget_type(aid)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token_short, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; + + /* Open attribute with anon ndt (int), get token */ + if ((aid = H5Aopen_by_name(fid_dst, NAME_GROUP_UNCOPIED, DST_ATTR_ANON_INT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; + if ((tid = H5Aget_type(aid)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token_int, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; /* verify the datatype of first dataset is not committed */ - if((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_DSET1, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Tcommitted(tid)) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* check address of datatype for second dataset */ - if((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET2, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr_short) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* check address of datatype for third dataset */ - if((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET3, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr_int) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_DSET1, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Tcommitted(tid)) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* check token of datatype for second dataset */ + if ((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token_short, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* check token of datatype for third dataset */ + if ((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET3, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token_int, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* close property list */ - if(H5Pclose(ocpypl_id) < 0) TEST_ERROR + if (H5Pclose(ocpypl_id) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Tclose(tid); - H5Tclose(f_tid); - H5Tclose(g_tid); - H5Tclose(anon_tid); - H5Pclose(ocpypl_id); - H5Aclose(aid); - H5Dclose(did); - H5Sclose(sid); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Tclose(tid); + H5Tclose(f_tid); + H5Tclose(g_tid); + H5Tclose(anon_tid); + H5Pclose(ocpypl_id); + H5Aclose(aid); + H5Dclose(did); + H5Sclose(sid); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_cdt_hier_merge */ - /*------------------------------------------------------------------------- * Function: test_copy_cdt_merge_cdt * * Purpose: Tests the "merge committed datatypes" feature of H5Ocopy: - * SRC file: - * Create committed datatype (short) - * Create committed datatype (float) - * Create committed datatype (int), with attribute of ndt int - * Create committed datatype (double), with attribute of anon ndt short - * DST file: - * Create committed datatype (int) - * Create committed datatype (float), with attribute of native int - * Create committed datatype (double), with attribute of anon ndt short - * - * Copy / at SRC to DST - * Verify that committed datatypes are copied and merged correctly - * - * NOTE: - * Comparison of attributes are not implemented yet. - * Further tests will be added in the future. + * SRC file: + * Create committed datatype (short) + * Create committed datatype (float) + * Create committed datatype (int), with attribute of ndt int + * Create committed datatype (double), with attribute of anon ndt short + * DST file: + * Create committed datatype (int) + * Create committed datatype (float), with attribute of native int + * Create committed datatype (double), with attribute of anon ndt short + * + * Copy / at SRC to DST + * Verify that committed datatypes are copied and merged correctly + * + * NOTE: + * Comparison of attributes are not implemented yet. + * Further tests will be added in the future. * * Return: Success: 0 * Failure: number of errors @@ -9581,232 +13923,311 @@ error: static int test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t reopen) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid1 = -1, tid2 = -1; /* Datatype IDs */ - hid_t tid3 = -1, tid4 = -1; /* Datatype IDs */ - hid_t tid5 = -1, tid = -1; /* Datatype IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t aid = -1; /* Attribute ID */ - hid_t ocpypl_id = -1; /* Object copy plist ID */ - int i; /* Local index variable */ - hsize_t dim1d[1]; /* dimension sizes */ - int buf[DIM_SIZE_1]; /* Buffer for data */ - H5O_info_t oinfo; /* Object info */ - haddr_t exp_addr; /* Expected object addresses */ - char src_filename[NAME_BUF_SIZE]; /* Source file name */ - char dst_filename[NAME_BUF_SIZE]; /* Destination file name */ - - if(reopen) - TESTING("H5Ocopy(): merging various committed datatypes with reopen") + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid1 = -1, tid2 = -1; /* Datatype IDs */ + hid_t tid3 = -1, tid4 = -1; /* Datatype IDs */ + hid_t tid5 = -1, tid = -1; /* Datatype IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t aid = -1; /* Attribute ID */ + hid_t ocpypl_id = -1; /* Object copy plist ID */ + hsize_t dim1d[1]; /* dimension sizes */ + H5O_info2_t oinfo; /* Object info */ + H5O_token_t exp_token; /* Expected object token */ + char src_filename[NAME_BUF_SIZE]; /* Source file name */ + char dst_filename[NAME_BUF_SIZE]; /* Destination file name */ + int token_cmp; + + if (reopen) + TESTING("H5Ocopy(): merging various committed datatypes with reopen"); else - TESTING("H5Ocopy(): merging various committed datatypes") - - /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) - buf[i] = i; + TESTING("H5Ocopy(): merging various committed datatypes"); /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); - /* - * Populate source file + /* + * Populate source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create committed datatype (short) */ - if((tid1 = H5Tcopy(H5T_NATIVE_SHORT)) < 0) TEST_ERROR - if((H5Tcommit2(fid_src, SRC_NDT_SHORT, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid1 = H5Tcopy(H5T_NATIVE_SHORT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_src, SRC_NDT_SHORT, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create committed datatype (float) */ - if((tid2 = H5Tcopy(H5T_NATIVE_FLOAT)) < 0) TEST_ERROR - if((H5Tcommit2(fid_src, SRC_NDT_FLOAT, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid2 = H5Tcopy(H5T_NATIVE_FLOAT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_src, SRC_NDT_FLOAT, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create committed datatype (int) */ - if((tid3 = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((H5Tcommit2(fid_src, SRC_NDT_INT, tid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid3 = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_src, SRC_NDT_INT, tid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create an attribute of committed datatype (int); attach to committed datatype (int) */ - if((aid = H5Acreate2(tid3, SRC_ATTR, tid3, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR + if ((aid = H5Acreate2(tid3, SRC_ATTR, tid3, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; /* create committed datatype (double) */ - if((tid4 = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) TEST_ERROR - if((H5Tcommit2(fid_src, SRC_NDT_DOUBLE, tid4, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid4 = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_src, SRC_NDT_DOUBLE, tid4, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create an anonymous committed datatype (short) */ - if((tid5 = H5Tcopy(H5T_NATIVE_SHORT)) < 0) TEST_ERROR - if((H5Tcommit_anon(fid_src, tid5, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid5 = H5Tcopy(H5T_NATIVE_SHORT)) < 0) + TEST_ERROR; + if ((H5Tcommit_anon(fid_src, tid5, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create an attribute of anon ndt (short); attach to committed datatype (double) */ - if((aid = H5Acreate2(tid4, SRC_ATTR, tid5, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR + if ((aid = H5Acreate2(tid4, SRC_ATTR, tid5, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; /* close the committed datatypes */ - if(H5Tclose(tid1) < 0) TEST_ERROR - if(H5Tclose(tid2) < 0) TEST_ERROR - if(H5Tclose(tid3) < 0) TEST_ERROR - if(H5Tclose(tid4) < 0) TEST_ERROR - if(H5Tclose(tid5) < 0) TEST_ERROR + if (H5Tclose(tid1) < 0) + TEST_ERROR; + if (H5Tclose(tid2) < 0) + TEST_ERROR; + if (H5Tclose(tid3) < 0) + TEST_ERROR; + if (H5Tclose(tid4) < 0) + TEST_ERROR; + if (H5Tclose(tid5) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; - /* - * Populate destination file + /* + * Populate destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; /* create committed datatype (integer) */ - if((tid1 = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((H5Tcommit2(fid_dst, DST_NDT_INT, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid1 = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_dst, DST_NDT_INT, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create committed datatype (float) */ - if((tid2 = H5Tcopy(H5T_NATIVE_FLOAT)) < 0) TEST_ERROR - if((H5Tcommit2(fid_dst, DST_NDT_FLOAT, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid2 = H5Tcopy(H5T_NATIVE_FLOAT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_dst, DST_NDT_FLOAT, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create an attribute of native integer; attach to committed datatype (float) */ - if((aid = H5Acreate2(tid2, DST_ATTR, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR + if ((aid = H5Acreate2(tid2, DST_ATTR, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; /* create committed datatype (double) */ - if((tid3 = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) TEST_ERROR - if((H5Tcommit2(fid_dst, DST_NDT_DOUBLE, tid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid3 = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_dst, DST_NDT_DOUBLE, tid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create anonymous committed datatype (short) */ - if((tid4 = H5Tcopy(H5T_NATIVE_SHORT)) < 0) TEST_ERROR - if((H5Tcommit_anon(fid_dst, tid4, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid4 = H5Tcopy(H5T_NATIVE_SHORT)) < 0) + TEST_ERROR; + if ((H5Tcommit_anon(fid_dst, tid4, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create an attribute of anon ndt (short); attach to ndt (double) */ - if((aid = H5Acreate2(tid3, DST_ATTR, tid4, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR + if ((aid = H5Acreate2(tid3, DST_ATTR, tid4, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; /* close the committed datatypes */ - if(H5Tclose(tid1) < 0) TEST_ERROR - if(H5Tclose(tid2) < 0) TEST_ERROR - if(H5Tclose(tid3) < 0) TEST_ERROR - if(H5Tclose(tid4) < 0) TEST_ERROR + if (H5Tclose(tid1) < 0) + TEST_ERROR; + if (H5Tclose(tid2) < 0) + TEST_ERROR; + if (H5Tclose(tid3) < 0) + TEST_ERROR; + if (H5Tclose(tid4) < 0) + TEST_ERROR; /* close the dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create ocpl and set merge committed dtype flag */ - if((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR - if(H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) TEST_ERROR + if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; + if (H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) + TEST_ERROR; /* copy everything in SRC to DST */ - if(H5Ocopy(fid_src, "/", fid_dst, SRC_ROOT_GROUP, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, "/", fid_dst, SRC_ROOT_GROUP, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - /* - * Verification + /* + * Verification */ - /* get address of committed datatype: /src_root/src_ndt_double */ - if((tid = H5Topen2(fid_dst, "/" SRC_ROOT_GROUP "/" SRC_NDT_DOUBLE, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* get address of committed datatype: /dst_ndt_double */ - if((tid = H5Topen2(fid_dst, "/" DST_NDT_DOUBLE, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - - /* get address of committed datatype: /src_root/src_ndt_float */ - if((tid = H5Topen2(fid_dst, "/" SRC_ROOT_GROUP "/" SRC_NDT_FLOAT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* get address of committed datatype: /dst_ndt_float */ - if((tid = H5Topen2(fid_dst, "/" DST_NDT_FLOAT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - - /* get address of committed datatype: /src_root/src_ndt_int */ - if((tid = H5Topen2(fid_dst, "/" SRC_ROOT_GROUP "/" SRC_NDT_INT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* get address of committed datatype: /dst_ndt_int */ - if((tid = H5Topen2(fid_dst, "/" DST_NDT_INT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - - /* get address of committed datatype: /src_root/src_ndt_short */ - if((tid = H5Topen2(fid_dst, "/" SRC_ROOT_GROUP "/" SRC_NDT_SHORT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* open attribute; get its dtype; get dtype's address: /src_root/src_ndt_double/dst_attr */ - if((aid = H5Aopen_by_name(fid_dst, "/" SRC_ROOT_GROUP "/" SRC_NDT_DOUBLE, DST_ATTR, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Aget_type(aid)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR + /* get token of committed datatype: /src_root/src_ndt_double */ + if ((tid = H5Topen2(fid_dst, "/" SRC_ROOT_GROUP "/" SRC_NDT_DOUBLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* get token of committed datatype: /dst_ndt_double */ + if ((tid = H5Topen2(fid_dst, "/" DST_NDT_DOUBLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* get token of committed datatype: /src_root/src_ndt_float */ + if ((tid = H5Topen2(fid_dst, "/" SRC_ROOT_GROUP "/" SRC_NDT_FLOAT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* get token of committed datatype: /dst_ndt_float */ + if ((tid = H5Topen2(fid_dst, "/" DST_NDT_FLOAT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* get token of committed datatype: /src_root/src_ndt_int */ + if ((tid = H5Topen2(fid_dst, "/" SRC_ROOT_GROUP "/" SRC_NDT_INT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* get token of committed datatype: /dst_ndt_int */ + if ((tid = H5Topen2(fid_dst, "/" DST_NDT_INT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* get token of committed datatype: /src_root/src_ndt_short */ + if ((tid = H5Topen2(fid_dst, "/" SRC_ROOT_GROUP "/" SRC_NDT_SHORT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* open attribute; get its dtype; get dtype's token: /src_root/src_ndt_double/dst_attr */ + if ((aid = H5Aopen_by_name(fid_dst, "/" SRC_ROOT_GROUP "/" SRC_NDT_DOUBLE, DST_ATTR, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Aget_type(aid)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; /* close the files */ - if(H5Fclose(fid_src) < 0) TEST_ERROR - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* close the object copy property list */ - if(H5Pclose(ocpypl_id) < 0) TEST_ERROR + if (H5Pclose(ocpypl_id) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Pclose(ocpypl_id); - H5Tclose(tid); - H5Tclose(tid1); - H5Tclose(tid2); - H5Tclose(tid3); - H5Tclose(tid4); - H5Tclose(tid5); - H5Aclose(aid); - H5Sclose(sid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Pclose(ocpypl_id); + H5Tclose(tid); + H5Tclose(tid1); + H5Tclose(tid2); + H5Tclose(tid3); + H5Tclose(tid4); + H5Tclose(tid5); + H5Aclose(aid); + H5Sclose(sid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_cdt_merge_cdt */ - - /*------------------------------------------------------------------------- * Function: test_copy_cdt_merge_suggs * * Purpose: Tests the suggested searching paths feature (H5Padd_merge_committed_dtype_path) - * is correctly applied in merging the committed datatypes. - * + * is correctly applied in merging the committed datatypes. + * * Return: Success: 0 * Failure: number of errors * @@ -9815,239 +14236,313 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, - hid_t dst_fapl, hbool_t reopen) +test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t reopen) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t ocpypl_id = -1; /* Object copy plist ID */ - unsigned int i; /* Local index variables */ - int buf[DIM_SIZE_1]; /* Buffer for writing data */ - H5O_info_t oinfo; /* Object info */ - haddr_t exp_addr; /* Expected object address */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - - if(reopen) - TESTING("H5Ocopy(): merging committed datatypes with suggestions and reopen") + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t ocpypl_id = -1; /* Object copy plist ID */ + H5O_info2_t oinfo; /* Object info */ + H5O_token_t exp_token; /* Expected object token */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + int token_cmp; + + if (reopen) + TESTING("H5Ocopy(): merging committed datatypes with suggestions and reopen"); else - TESTING("H5Ocopy(): merging committed datatypes with suggestions") - - /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) - buf[i] = (int)i; + TESTING("H5Ocopy(): merging committed datatypes with suggestions"); /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* * Populate source file */ /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create committed datatype: "/src_ndt_int" */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR - if((H5Tcommit2(fid_src, SRC_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_src, SRC_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* * Populate destination file */ /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; /* create committed datatype: "/dst_ndt_int" */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((H5Tcommit2(fid_dst, DST_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_dst, DST_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* Create a group /uncopied */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* - * Test 1 + * Test 1 */ /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* Create ocpl and set merge committed dtype flag */ - if((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR - if(H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) TEST_ERROR + if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; + if (H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) + TEST_ERROR; /* copy "/src_ndt_int" from SRC file to "/uncopied/src_ndt_int" at DST file */ - if(H5Ocopy(fid_src, SRC_NDT_INT, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, SRC_NDT_INT, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT, ocpypl_id, H5P_DEFAULT) < + 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* open committed dtype "/dst_ndt_int", get its address */ - if((tid = H5Topen2(fid_dst, DST_NDT_INT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* check address of "/uncopied/src_ndt_int" */ - if((tid = H5Topen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + /* open committed dtype "/dst_ndt_int", get its token */ + if ((tid = H5Topen2(fid_dst, DST_NDT_INT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* check token of "/uncopied/src_ndt_int" */ + if ((tid = H5Topen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* - * Test 2 + /* + * Test 2 */ /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* add committed datatype search suggestion: "/uncopied/src_ndt_int" */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT) < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT) < 0) + TEST_ERROR; /* copy "/src_ndt_int" from SRC file to "/src_ndt_int" at DST file */ - if(H5Ocopy(fid_src, SRC_NDT_INT, fid_dst, SRC_NDT_INT, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, SRC_NDT_INT, fid_dst, SRC_NDT_INT, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* open committed dtype "/uncopied/src_ndt_int", get its address */ - if((tid = H5Topen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* check address of "/src_ndt_int" */ - if((tid = H5Topen2(fid_dst, SRC_NDT_INT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + /* open committed dtype "/uncopied/src_ndt_int", get its token */ + if ((tid = H5Topen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* check token of "/src_ndt_int" */ + if ((tid = H5Topen2(fid_dst, SRC_NDT_INT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* - * Test 3 + /* + * Test 3 */ /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* remove "/uncopied/src_ndt_int" from DST file */ - if(H5Ldelete(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ldelete(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT, H5P_DEFAULT) < 0) + TEST_ERROR; /* copy "/src_ndt_int" from SRC file to "/uncopied/src_ndt_int" at DST file */ /* use default ocpypl_id -- without merging and suggestion */ - if(H5Ocopy(fid_src, SRC_NDT_INT, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, SRC_NDT_INT, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; /* copy "/src_ndt_int" from SRC file to "/src_ndt_int2" at DST file */ /* copy with merging and search suggestion: "/uncopied/src_ndt_int" */ - if(H5Ocopy(fid_src, SRC_NDT_INT, fid_dst, SRC_NDT_INT2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR - - if(reopen) { + if (H5Ocopy(fid_src, SRC_NDT_INT, fid_dst, SRC_NDT_INT2, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; + + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open committed dtype "/uncopied/src_ndt_int", get its address */ - if((tid = H5Topen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* check address of "/src_ndt_int2" */ - if((tid = H5Topen2(fid_dst, SRC_NDT_INT2, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + /* Open committed dtype "/uncopied/src_ndt_int", get its token */ + if ((tid = H5Topen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* check token of "/src_ndt_int2" */ + if ((tid = H5Topen2(fid_dst, SRC_NDT_INT2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* - * Test 4 + /* + * Test 4 */ /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* add committed datatype search suggestion */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, DST_NDT_INT) < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, DST_NDT_INT) < 0) + TEST_ERROR; /* copy "src_ndt_int" from SRC file to "/uncopied/src_ndt_int2" at DST file */ /* copy with merging and search suggestion: "/dst_ndt_int, /uncopied/src_ndt_int" */ - if(H5Ocopy(fid_src, SRC_NDT_INT, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, SRC_NDT_INT, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT2, ocpypl_id, H5P_DEFAULT) < + 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open committed dtype "/dst_dt_int", get its address */ - if((tid = H5Topen2(fid_dst, DST_NDT_INT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* check address of "/uncopied/src_ndt_int2" */ - if((tid = H5Topen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT2, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + /* Open committed dtype "/dst_dt_int", get its token */ + if ((tid = H5Topen2(fid_dst, DST_NDT_INT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* check token of "/uncopied/src_ndt_int2" */ + if ((tid = H5Topen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_INT2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close property list */ - if(H5Pclose(ocpypl_id) < 0) TEST_ERROR + if (H5Pclose(ocpypl_id) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Fclose(fid_src); H5Fclose(fid_dst); H5Tclose(tid); H5Pclose(ocpypl_id); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_cdt_merge_suggs */ - /*------------------------------------------------------------------------- * Function: test_copy_cdt_merge_dset_suggs * * Purpose: Tests the suggested searching paths feature (H5Padd_merge_committed_dtype_path) - * is correctly applied in merging the committed datatypes of datasets. - * + * is correctly applied in merging the committed datatypes of datasets. + * * Return: Success: 0 * Failure: number of errors * @@ -10056,274 +14551,373 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, - hid_t dst_fapl, hbool_t reopen) +test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t reopen) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t ocpypl_id = -1; /* Object copy plist ID */ - unsigned int i; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - int buf[DIM_SIZE_1]; /* Buffer for writing data */ - H5O_info_t oinfo; /* Object info */ - haddr_t exp_addr; /* Expected object address */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - - if(reopen) - TESTING("H5Ocopy(): merging committed datatypes of datasets with suggestions and reopen") + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t ocpypl_id = -1; /* Object copy plist ID */ + unsigned int i; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + int buf[DIM_SIZE_1]; /* Buffer for writing data */ + H5O_info2_t oinfo; /* Object info */ + H5O_token_t exp_token; /* Expected object token */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + int token_cmp; + + if (reopen) + TESTING("H5Ocopy(): merging committed datatypes of datasets with suggestions and reopen"); else - TESTING("H5Ocopy(): merging committed datatypes of datasets with suggestions") + TESTING("H5Ocopy(): merging committed datatypes of datasets with suggestions"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = (int)i; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* * Populate source file */ /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create committed datatype: "/src_ndt_int" */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR - if((H5Tcommit2(fid_src, SRC_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_src, SRC_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create dataset */ - if((did = H5Dcreate2(fid_src, SRC_NDT_DSET, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, SRC_NDT_DSET, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data to dataset */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; - /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + /* close the dataset */ + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* * Populate destination file */ /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; /* create committed datatype: "/dst_ndt_int" */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR - if((H5Tcommit2(fid_dst, DST_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_dst, DST_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Create a group "/uncopied" */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* - * Test 1 + * Test 1 */ /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* Create ocpl and set merge committed dtype flag */ - if((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR - if(H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) TEST_ERROR + if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; + if (H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) + TEST_ERROR; /* copy "/src_ndt_dset" from SRC file to "/uncopied/src_ndt_dset" at DST file */ - if(H5Ocopy(fid_src, SRC_NDT_DSET, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, SRC_NDT_DSET, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET, ocpypl_id, + H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open committed dtype "/dst_ndt_int", get its address */ - if((tid = H5Topen2(fid_dst, DST_NDT_INT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* check address of datatype for the copied dataset: "/uncopied/src_ndt_dset" */ - if((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* Open committed dtype "/dst_ndt_int", get its token */ + if ((tid = H5Topen2(fid_dst, DST_NDT_INT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* check token of datatype for the copied dataset: "/uncopied/src_ndt_dset" */ + if ((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* - * Test 2 + /* + * Test 2 */ /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* add committed datatype search suggestion: "/uncopied/src_ndt_dset" */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET) < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET) < 0) + TEST_ERROR; /* copy "/src_ndt_dset" from SRC file to "/src_ndt_dset" at DST file */ - if(H5Ocopy(fid_src, SRC_NDT_DSET, fid_dst, SRC_NDT_DSET, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, SRC_NDT_DSET, fid_dst, SRC_NDT_DSET, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open committed dtype dataset "/uncopied/src_ndt_dset", get its datatype address */ - if((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* check address of datatype for the copied dataset: "/src_ndt_dset" */ - if((did = H5Dopen2(fid_dst, SRC_NDT_DSET, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* Open committed dtype dataset "/uncopied/src_ndt_dset", get its datatype token */ + if ((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* check token of datatype for the copied dataset: "/src_ndt_dset" */ + if ((did = H5Dopen2(fid_dst, SRC_NDT_DSET, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* - * Test 3 + /* + * Test 3 */ /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* remove "/uncopied/src_ndt_dset" */ - if(H5Ldelete(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ldelete(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET, H5P_DEFAULT) < 0) + TEST_ERROR; /* copy "src_ndt_dset" from SRC file to "/uncopied/src_ndt_dset" at DST file */ /* use default ocpypl_id -- without merging and suggestion */ - if(H5Ocopy(fid_src, SRC_NDT_DSET, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, SRC_NDT_DSET, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; /* copy "src_ndt_dset" from SRC file to "/src_ndt_dset2" at DST file */ /* use merging and suggested searching path: "/uncopied/src_ndt_dset" */ - if(H5Ocopy(fid_src, SRC_NDT_DSET, fid_dst, SRC_NDT_DSET2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR - - if(reopen) { + if (H5Ocopy(fid_src, SRC_NDT_DSET, fid_dst, SRC_NDT_DSET2, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; + + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* open the copied dataset: /uncopied/src_ndt_dset", get its address */ - if((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* check address of datatype for the copied dataset: "/src_ndt_dset2" */ - if((did = H5Dopen2(fid_dst, SRC_NDT_DSET2, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* open the copied dataset: /uncopied/src_ndt_dset", get its token */ + if ((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* check token of datatype for the copied dataset: "/src_ndt_dset2" */ + if ((did = H5Dopen2(fid_dst, SRC_NDT_DSET2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* - * Test 4 + /* + * Test 4 */ /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* add committed datatype search suggestion: "/src_ndt_dset" */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, SRC_NDT_DSET) < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, SRC_NDT_DSET) < 0) + TEST_ERROR; /* copy /src_ndt_dset from SRC file to /uncopied/src_ndt_dset2 at DST */ /* use merging and suggested search paths: "/src_ndt_dset, /uncopied/src_ndt_dset" */ - if(H5Ocopy(fid_src, SRC_NDT_DSET, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, SRC_NDT_DSET, fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET2, ocpypl_id, + H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* open the copied dataset: "/src_ndt_dset", get its datatype address */ - if((did = H5Dopen2(fid_dst, SRC_NDT_DSET, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* check address of datatype for the copied dataset: /uncopied/src_ndt_dset2 */ - if((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET2, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* open the copied dataset: "/src_ndt_dset", get its datatype token */ + if ((did = H5Dopen2(fid_dst, SRC_NDT_DSET, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* check token of datatype for the copied dataset: /uncopied/src_ndt_dset2 */ + if ((did = H5Dopen2(fid_dst, NAME_GROUP_UNCOPIED "/" SRC_NDT_DSET2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close property list */ - if(H5Pclose(ocpypl_id) < 0) TEST_ERROR + if (H5Pclose(ocpypl_id) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Fclose(fid_src); H5Fclose(fid_dst); H5Tclose(tid); H5Sclose(sid); H5Dclose(did); H5Pclose(ocpypl_id); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_cdt_merge_dset_suggs */ - /*------------------------------------------------------------------------- * Function: test_copy_cdt_merge_all_suggs * * Purpose: Tests the merging committed datatype + search suggestion feature. - * + * * Return: Success: 0 * Failure: number of errors * @@ -10332,459 +14926,606 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_cdt_merge_all_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, - hid_t dst_fapl, hbool_t reopen) +test_copy_cdt_merge_all_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t reopen) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t gid = -1; /* Group ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t tid = -1; /* Datatype ID */ - hid_t aid = -1; /* Attribute ID */ - hid_t did = -1; /* Dataset ID */ - hid_t exp_did = -1; /* Dataset ID */ - hid_t tid_short = -1; /* Datatype ID */ - hid_t exp_tid; /* Expected datatype ID */ - hid_t ocpypl_id = -1; /* Object copy plist ID */ - unsigned int i; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - int buf[DIM_SIZE_1]; /* Buffer for writing data */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - - if(reopen) - TESTING("H5Ocopy(): merging different committed datatypes with suggestions and reopen") + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t gid = -1; /* Group ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t tid = -1; /* Datatype ID */ + hid_t aid = -1; /* Attribute ID */ + hid_t did = -1; /* Dataset ID */ + hid_t exp_did = -1; /* Dataset ID */ + hid_t tid_short = -1; /* Datatype ID */ + hid_t exp_tid = -1; /* Expected datatype ID */ + hid_t ocpypl_id = -1; /* Object copy plist ID */ + hsize_t dim1d[1]; /* Dataset dimensions */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + + if (reopen) + TESTING("H5Ocopy(): merging different committed datatypes with suggestions and reopen"); else - TESTING("H5Ocopy(): merging different committed datatypes with suggestions") - - /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) - buf[i] = (int)i; + TESTING("H5Ocopy(): merging different committed datatypes with suggestions"); /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* * Populate source file */ /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* set dataspace dimension, create dataspace */ dim1d[0] = DIM_SIZE_1; - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create a group */ - if((gid = H5Gcreate2(fid_src, SRC_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, SRC_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create committed datatype in group */ - if((tid = H5Tcopy(H5T_NATIVE_SHORT)) < 0) TEST_ERROR - if((H5Tcommit2(gid, SRC_NDT_SHORT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_SHORT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(gid, SRC_NDT_SHORT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create first dataset in group */ - if((did = H5Dcreate2(gid, SRC_NDT_DSET, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, SRC_NDT_DSET, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* closing */ - if(H5Dclose(did) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* create committed datatype in group */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((H5Tcommit2(gid, SRC_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(gid, SRC_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create second dataset in group */ - if((did = H5Dcreate2(gid, SRC_NDT_DSET2, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, SRC_NDT_DSET2, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* closing */ - if(H5Dclose(did) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* create third dataset in group */ - if((did = H5Dcreate2(gid, SRC_DSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - + if ((did = H5Dcreate2(gid, SRC_DSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + /* get datatype */ - if((tid_short = H5Topen2(fid_src, "/" SRC_GRP "/" SRC_NDT_SHORT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid_short = H5Topen2(fid_src, "/" SRC_GRP "/" SRC_NDT_SHORT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create an attribute attached to the dataset */ - if((aid = H5Acreate2(did, SRC_ATTR, tid_short, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR + if ((aid = H5Acreate2(did, SRC_ATTR, tid_short, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* closing */ - if(H5Aclose(aid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - if(H5Tclose(tid_short) < 0) TEST_ERROR + if (H5Aclose(aid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + if (H5Tclose(tid_short) < 0) + TEST_ERROR; /* close the group */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* * Populate DST file */ /* create DST file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; /* set dataspace dimension, create dataspace */ dim1d[0] = DIM_SIZE_2; - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* create committed datatype in root group */ - if((tid = H5Tcopy(H5T_NATIVE_SHORT)) < 0)TEST_ERROR - if((H5Tcommit2(fid_dst, DST_NDT_SHORT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_SHORT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_dst, DST_NDT_SHORT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* create committed datatype in root group */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR - if((H5Tcommit2(fid_dst, DST_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_dst, DST_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create an attribute attached to committed datatype */ - if((aid = H5Acreate2(tid, DST_ATTR, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR + if ((aid = H5Acreate2(tid, DST_ATTR, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* closing */ - if(H5Aclose(aid) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - + if (H5Aclose(aid) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* create committed datatype in root group */ - if((tid = H5Tcopy(H5T_NATIVE_FLOAT)) < 0)TEST_ERROR - if((H5Tcommit2(fid_dst, DST_NDT_FLOAT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_FLOAT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_dst, DST_NDT_FLOAT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create an attribute attached to committed datatype */ - if((aid = H5Acreate2(tid, DST_ATTR, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + if ((aid = H5Acreate2(tid, DST_ATTR, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* create a group */ - if((gid = H5Gcreate2(fid_dst, DST_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_dst, DST_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create a committed datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR - if((H5Tcommit2(gid, DST_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(gid, DST_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create an attribute attached to committed datatype */ - if((aid = H5Acreate2(gid, DST_ATTR, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR + if ((aid = H5Acreate2(gid, DST_ATTR, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* closing */ - if(H5Aclose(aid) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Aclose(aid) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* create an attribute attached to group */ - if((aid = H5Acreate2(gid, DST_ATTR2, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR + if ((aid = H5Acreate2(gid, DST_ATTR2, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* closing */ - if(H5Aclose(aid) < 0) TEST_ERROR - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Aclose(aid) < 0) + TEST_ERROR; + if (H5Gclose(gid) < 0) + TEST_ERROR; /* create a group */ - if((gid = H5Gcreate2(fid_dst, DST_GRP2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_dst, DST_GRP2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create a committed datatype in group */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR - if((H5Tcommit2(gid, DST_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(gid, DST_NDT_INT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create an attribute attached to group */ - if((aid = H5Acreate2(gid, DST_ATTR, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR + if ((aid = H5Acreate2(gid, DST_ATTR, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* closing */ - if(H5Aclose(aid) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Aclose(aid) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* create a committed datatype in group */ - if((tid = H5Tcopy(H5T_NATIVE_SHORT)) < 0)TEST_ERROR - if((H5Tcommit2(gid, DST_NDT_SHORT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_SHORT)) < 0) + TEST_ERROR; + if ((H5Tcommit2(gid, DST_NDT_SHORT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* closing */ - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Gclose(gid) < 0) + TEST_ERROR; /* create a committed datatype at root group */ - if((tid = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)TEST_ERROR - if((H5Tcommit2(fid_dst, DST_NDT_DOUBLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) + TEST_ERROR; + if ((H5Tcommit2(fid_dst, DST_NDT_DOUBLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* get datatype */ - if((tid_short = H5Topen2(fid_dst, "/" DST_GRP2 "/" DST_NDT_SHORT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((tid_short = H5Topen2(fid_dst, "/" DST_GRP2 "/" DST_NDT_SHORT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create an attribute attached to committed datatype */ - if((aid = H5Acreate2(tid, DST_ATTR, tid_short, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) - TEST_ERROR + if ((aid = H5Acreate2(tid, DST_ATTR, tid_short, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* closing */ - if(H5Aclose(aid) < 0) TEST_ERROR - if(H5Tclose(tid_short) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Aclose(aid) < 0) + TEST_ERROR; + if (H5Tclose(tid_short) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* + /* * Test 1 */ /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* Create ocpl and set merge committed dtype flag */ - if((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR - if(H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) TEST_ERROR + if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; + if (H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) + TEST_ERROR; /* copy "/src_grp/src_ndt_dset2" from SRC file to DST file */ - if(H5Ocopy(fid_src, "/" SRC_GRP "/" SRC_NDT_DSET2, fid_dst, "A_src_dset2", ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, "/" SRC_GRP "/" SRC_NDT_DSET2, fid_dst, "A_src_dset2", ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ /* get datatype for attribute attached to the group */ - if((aid = H5Aopen_by_name(fid_dst, DST_GRP, DST_ATTR, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if((exp_tid = H5Aget_type(aid)) < 0) TEST_ERROR + if ((aid = H5Aopen_by_name(fid_dst, DST_GRP, DST_ATTR, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((exp_tid = H5Aget_type(aid)) < 0) + TEST_ERROR; /* open datatype of dataset */ - if((did = H5Dopen2(fid_dst, "A_src_dset2", H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_dst, "A_src_dset2", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; /* should be the same */ - if(!H5Tequal(exp_tid, tid)) TEST_ERROR + if (!H5Tequal(exp_tid, tid)) + TEST_ERROR; /* closing */ - if(H5Tclose(exp_tid) < 0) TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Tclose(exp_tid) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - if(H5Fclose(fid_dst) < 0) TEST_ERROR - - /* + /* * Test 2 */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* add committed datatype search suggestion */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, "/" DST_GRP2) < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, "/" DST_GRP2) < 0) + TEST_ERROR; /* copy "/src_grp/src_ndt_dset2" from SRC file to DST file */ - if(H5Ocopy(fid_src, "/" SRC_GRP "/" SRC_NDT_DSET2, fid_dst, "B_src_dset2", ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, "/" SRC_GRP "/" SRC_NDT_DSET2, fid_dst, "B_src_dset2", ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ /* get datatype for attribute attached to the group */ - if((aid = H5Aopen_by_name(fid_dst, DST_GRP2, DST_ATTR, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if((exp_tid = H5Aget_type(aid)) < 0) TEST_ERROR + if ((aid = H5Aopen_by_name(fid_dst, DST_GRP2, DST_ATTR, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((exp_tid = H5Aget_type(aid)) < 0) + TEST_ERROR; /* open datatype of dataset */ - if((did = H5Dopen2(fid_dst, "B_src_dset2", H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_dst, "B_src_dset2", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; /* should be the same */ - if(!H5Tequal(exp_tid, tid)) TEST_ERROR + if (!H5Tequal(exp_tid, tid)) + TEST_ERROR; /* closing */ - if(H5Tclose(exp_tid) < 0) TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Tclose(exp_tid) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* + /* * Test 3 */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* add another committed datatype search suggestion */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, "/" DST_GRP "/" DST_NDT_INT) < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, "/" DST_GRP "/" DST_NDT_INT) < 0) + TEST_ERROR; /* copy "/src_grp/src_ndt_dset2" from SRC file to DST file */ - if(H5Ocopy(fid_src, "/" SRC_GRP "/" SRC_NDT_DSET2, fid_dst, "C_src_dset2", ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, "/" SRC_GRP "/" SRC_NDT_DSET2, fid_dst, "C_src_dset2", ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* open committed dtype "/dst_grp/dst_dt_int", get its address */ - if((exp_tid = H5Topen2(fid_dst, "/" DST_GRP "/" DST_NDT_INT, H5P_DEFAULT)) < 0) TEST_ERROR + /* open committed dtype "/dst_grp/dst_dt_int", get its token */ + if ((exp_tid = H5Topen2(fid_dst, "/" DST_GRP "/" DST_NDT_INT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* open datatype of dataset */ - if((did = H5Dopen2(fid_dst, "C_src_dset2", H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_dst, "C_src_dset2", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; /* should be the same */ - if(!H5Tequal(exp_tid, tid)) TEST_ERROR + if (!H5Tequal(exp_tid, tid)) + TEST_ERROR; /* closing */ - if(H5Tclose(exp_tid) < 0) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Tclose(exp_tid) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* + /* * Test 4 */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* delete the group */ - if(H5Ldelete(fid_dst, "/" DST_GRP, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ldelete(fid_dst, "/" DST_GRP, H5P_DEFAULT) < 0) + TEST_ERROR; /* free the search suggestion paths */ - if(H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) TEST_ERROR + if (H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) + TEST_ERROR; /* copy "/src_grp/src_ndt_dset2" from SRC file to DST file */ - if(H5Ocopy(fid_src, "/" SRC_GRP "/" SRC_NDT_DSET2, fid_dst, "D_src_dset2", ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, "/" SRC_GRP "/" SRC_NDT_DSET2, fid_dst, "D_src_dset2", ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ /* open datatype of dataset */ - if((exp_did = H5Dopen2(fid_dst, "A_src_dset2", H5P_DEFAULT)) < 0) TEST_ERROR - if((exp_tid = H5Dget_type(exp_did)) < 0) TEST_ERROR + if ((exp_did = H5Dopen2(fid_dst, "A_src_dset2", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((exp_tid = H5Dget_type(exp_did)) < 0) + TEST_ERROR; /* Open datatype of dataset */ - if((did = H5Dopen2(fid_dst, "C_src_dset2", H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_dst, "C_src_dset2", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; /* should be the same */ - if(!H5Tequal(exp_tid, tid)) TEST_ERROR + if (!H5Tequal(exp_tid, tid)) + TEST_ERROR; /* closing */ - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* open datatype of dataset */ - if((did = H5Dopen2(fid_dst, "D_src_dset2", H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_dst, "D_src_dset2", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; /* should be the same */ - if(!H5Tequal(exp_tid, tid)) TEST_ERROR + if (!H5Tequal(exp_tid, tid)) + TEST_ERROR; /* closing */ - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* closing */ - if(H5Tclose(exp_tid) < 0) TEST_ERROR - if(H5Dclose(exp_did) < 0) TEST_ERROR + if (H5Tclose(exp_tid) < 0) + TEST_ERROR; + if (H5Dclose(exp_did) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* + /* * Test 5 */ /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* Add committed datatype search suggestion */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, "/" DST_NDT_DOUBLE) < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, "/" DST_NDT_DOUBLE) < 0) + TEST_ERROR; /* copy "/src_grp/src_ndt_dset" from SRC file to DST file */ - if(H5Ocopy(fid_src, "/" SRC_GRP "/" SRC_NDT_DSET, fid_dst, "A_src_dset", ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, "/" SRC_GRP "/" SRC_NDT_DSET, fid_dst, "A_src_dset", ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ /* open attribute's dtype attached to committed datatype /dst_ndt_double */ - if((aid = H5Aopen_by_name(fid_dst, DST_NDT_DOUBLE, DST_ATTR, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if((exp_tid = H5Aget_type(aid)) < 0) TEST_ERROR + if ((aid = H5Aopen_by_name(fid_dst, DST_NDT_DOUBLE, DST_ATTR, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((exp_tid = H5Aget_type(aid)) < 0) + TEST_ERROR; - /* Open datatype of dataset, check address */ - if((did = H5Dopen2(fid_dst, "A_src_dset", H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR + /* Open datatype of dataset, check token */ + if ((did = H5Dopen2(fid_dst, "A_src_dset", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; /* should be the same */ - if(!H5Tequal(exp_tid, tid)) TEST_ERROR + if (!H5Tequal(exp_tid, tid)) + TEST_ERROR; /* closing */ - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - if(H5Aclose(aid) < 0) TEST_ERROR - if(H5Tclose(exp_tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + if (H5Aclose(aid) < 0) + TEST_ERROR; + if (H5Tclose(exp_tid) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* + /* * Test 6 */ /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* Add committed datatype search suggestion */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, "/" DST_NDT_SHORT) < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, "/" DST_NDT_SHORT) < 0) + TEST_ERROR; /* copy "/src_grp/src_ndt_dset" from SRC file to DST file */ - if(H5Ocopy(fid_src, "/" SRC_GRP "/" SRC_NDT_DSET, fid_dst, "B_src_dset", ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, "/" SRC_GRP "/" SRC_NDT_DSET, fid_dst, "B_src_dset", ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ /* open committed dtype "/dst_ndt_short" */ - if((exp_tid = H5Topen2(fid_dst, "/" DST_NDT_SHORT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((exp_tid = H5Topen2(fid_dst, "/" DST_NDT_SHORT, H5P_DEFAULT)) < 0) + TEST_ERROR; - /* open datatype of dataset, check address */ - if((did = H5Dopen2(fid_dst, "B_src_dset", H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR + /* open datatype of dataset, check token */ + if ((did = H5Dopen2(fid_dst, "B_src_dset", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; /* should be the same */ - if(!H5Tequal(exp_tid, tid)) TEST_ERROR + if (!H5Tequal(exp_tid, tid)) + TEST_ERROR; /* closing */ - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - if(H5Tclose(exp_tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + if (H5Tclose(exp_tid) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; - /* close property list */ - if(H5Pclose(ocpypl_id) < 0) TEST_ERROR + /* close property list */ + if (H5Pclose(ocpypl_id) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Fclose(fid_src); H5Fclose(fid_dst); H5Tclose(tid); @@ -10795,11 +15536,11 @@ error: H5Aclose(aid); H5Sclose(sid); H5Pclose(ocpypl_id); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_cdt_merge_all_suggs */ - /*------------------------------------------------------------------------- * Function: test_copy_set_mcdt_search_cb * @@ -10815,347 +15556,463 @@ error: */ /* User data struct for the callback */ typedef struct mcdt_search_cb_ud { - H5O_mcdt_search_ret_t search_action; /* Return value for callback */ - unsigned called; /* # of times callback has been called */ + H5O_mcdt_search_ret_t search_action; /* Return value for callback */ + unsigned called; /* # of times callback has been called */ } mcdt_search_cb_ud; /* The user callback function */ static H5O_mcdt_search_ret_t mcdt_search_cb(void *_udata) { - mcdt_search_cb_ud *udata = (mcdt_search_cb_ud *)_udata; + mcdt_search_cb_ud *udata = (mcdt_search_cb_ud *)_udata; udata->called++; - return(udata->search_action); + return (udata->search_action); } /* mcdt_search_cb() */ static int -test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, - hid_t dst_fapl, hbool_t reopen) +test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t reopen) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t ocpypl_id = -1; /* Object copy plist ID */ - unsigned int i; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - int buf[DIM_SIZE_1]; /* Buffer for writing data */ - H5O_info_t oinfo; /* Object info */ - haddr_t exp_addr; /* Expected object address */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - mcdt_search_cb_ud cb_udata; /* User data for callback */ - - if(reopen) - TESTING("H5Ocopy(): H5Pset_mcdt_search_cb and reopen") + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t ocpypl_id = -1; /* Object copy plist ID */ + unsigned int i; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + int buf[DIM_SIZE_1]; /* Buffer for writing data */ + H5O_info2_t oinfo; /* Object info */ + H5O_token_t exp_token; /* Expected object token */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + mcdt_search_cb_ud cb_udata; /* User data for callback */ + int token_cmp; + + if (reopen) + TESTING("H5Ocopy(): H5Pset_mcdt_search_cb and reopen"); else - TESTING("H5Ocopy(): H5Pset_mcdt_search_cb") + TESTING("H5Ocopy(): H5Pset_mcdt_search_cb"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = (int)i; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* * Populate source file */ /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* named data type */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* named datatype */ + if ((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; /* Create an uncopied group in destination file */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* * Populate destination file */ /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type "a" */ - if((H5Tcommit2(fid_dst, "/a", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype "a" */ + if ((H5Tcommit2(fid_dst, "/a", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type "b" */ - if((H5Tcommit2(fid_dst, "/b", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype "b" */ + if ((H5Tcommit2(fid_dst, "/b", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* Create ocpl and set merge committed dtype flag */ - if((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR - if(H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) TEST_ERROR + if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; + if (H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) + TEST_ERROR; /* * First copy dataset using "/b" as a suggestion, and verify that it uses * datatype "b" in the destination file */ /* Add datatype suggestion */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, "/b") < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, "/b") < 0) + TEST_ERROR; /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* copy SRC dset to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open committed dtype "b", get address */ - if((tid = H5Topen2(fid_dst, "/b", H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open dset dtype, check address */ - if((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* Open committed dtype "b", get token */ + if ((tid = H5Topen2(fid_dst, "/b", H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open dset dtype, check token */ + if ((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* * Set callback to continue the search */ cb_udata.search_action = H5O_MCDT_SEARCH_CONT; - cb_udata.called = 0; + cb_udata.called = 0; /* Free suggestions */ - if(H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) TEST_ERROR + if (H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) + TEST_ERROR; /* Add datatype suggestion to group "/uncopied" */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, NAME_GROUP_UNCOPIED) < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, NAME_GROUP_UNCOPIED) < 0) + TEST_ERROR; /* Continue the global search */ - if(H5Pset_mcdt_search_cb(ocpypl_id, mcdt_search_cb, &cb_udata) < 0) - TEST_ERROR + if (H5Pset_mcdt_search_cb(ocpypl_id, mcdt_search_cb, &cb_udata) < 0) + TEST_ERROR; /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* copy SRC dset to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE2, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; /* Verify callback has been called exactly once */ - if(cb_udata.called != 1) TEST_ERROR + if (cb_udata.called != 1) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open committed dtype "a", get address */ - if((tid = H5Topen2(fid_dst, "/a", H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open copied dataset and its dtype, check address */ - if((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr != exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* Open committed dtype "a", get token */ + if ((tid = H5Topen2(fid_dst, "/a", H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open copied dataset and its dtype, check token */ + if ((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* + /* * Stop the search, default action is to create an anonymous committed datatype */ cb_udata.search_action = H5O_MCDT_SEARCH_STOP; - cb_udata.called = 0; + cb_udata.called = 0; /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* copy SRC dset to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE3, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE3, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; /* Verify callback has been called exactly once */ - if(cb_udata.called != 1) TEST_ERROR + if (cb_udata.called != 1) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open committed dtype "a", get address */ - if((tid = H5Topen2(fid_dst, "/a", H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open the copied dataset and get its dtype, addresses should not be equal */ - if((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE3, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr == exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* Open committed dtype "b", get address */ - if((tid = H5Topen2(fid_dst, "/b", H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open the copied dataset and get its dtype, addresses should not be equal */ - if((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE3, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr == exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* Open committed dtype "a", get token */ + if ((tid = H5Topen2(fid_dst, "/a", H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open the copied dataset and get its dtype, tokens should not be equal */ + if ((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE3, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (!token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Open committed dtype "b", get token */ + if ((tid = H5Topen2(fid_dst, "/b", H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open the copied dataset and get its dtype, tokens should not be equal */ + if ((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE3, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (!token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* * Stop the search, default action is to create an anonymous committed datatype. * Disable suggestion list. */ cb_udata.search_action = H5O_MCDT_SEARCH_STOP; - cb_udata.called = 0; + cb_udata.called = 0; /* Free suggestions */ - if(H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) TEST_ERROR + if (H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) + TEST_ERROR; /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* Delete dataset */ - if(H5Ldelete(fid_dst, NAME_DATASET_SIMPLE3, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ldelete(fid_dst, NAME_DATASET_SIMPLE3, H5P_DEFAULT) < 0) + TEST_ERROR; /* copy SRC dset to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE3, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE3, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; /* Verify callback has been called exactly once */ - if(cb_udata.called != 1) TEST_ERROR + if (cb_udata.called != 1) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - /* Open committed dtype "a", get address */ - if((tid = H5Topen2(fid_dst, "/a", H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open the copied dataset and get its dtype, addresses should not be equal */ - if((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE3, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr == exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - - /* Open committed dtype "b", get address */ - if((tid = H5Topen2(fid_dst, "/b", H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - exp_addr = oinfo.addr; - if(H5Tclose(tid) < 0) TEST_ERROR - - /* Open the copied dataset and get its dtype, addresses should not be equal */ - if((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE3, H5P_DEFAULT)) < 0) TEST_ERROR - if((tid = H5Dget_type(did)) < 0) TEST_ERROR - if(H5Oget_info(tid, &oinfo) < 0) TEST_ERROR - if(oinfo.addr == exp_addr) TEST_ERROR - if(H5Tclose(tid) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + /* Open committed dtype "a", get token */ + if ((tid = H5Topen2(fid_dst, "/a", H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open the copied dataset and get its dtype, tokens should not be equal */ + if ((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE3, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (!token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + + /* Open committed dtype "b", get token */ + if ((tid = H5Topen2(fid_dst, "/b", H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + if (H5Tclose(tid) < 0) + TEST_ERROR; + + /* Open the copied dataset and get its dtype, tokens should not be equal */ + if ((did = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE3, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((tid = H5Dget_type(did)) < 0) + TEST_ERROR; + if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) + TEST_ERROR; + if (H5Otoken_cmp(tid, &oinfo.token, &exp_token, &token_cmp) < 0) + TEST_ERROR; + if (!token_cmp) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close property list */ - if(H5Pclose(ocpypl_id) < 0) TEST_ERROR + if (H5Pclose(ocpypl_id) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Fclose(fid_src); H5Fclose(fid_dst); H5Tclose(tid); H5Sclose(sid); H5Dclose(did); H5Pclose(ocpypl_id); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_set_mcdt_search_cb */ - /*------------------------------------------------------------------------- * Function: test_copy_set_get_mcdt_cb * @@ -11175,7 +16032,7 @@ mcdt_search_cbA(void *_udata) { H5O_mcdt_search_ret_t *action = (H5O_mcdt_search_ret_t *)_udata; - return(*action); + return (*action); } /* mcdt_search_cb() */ static H5O_mcdt_search_ret_t @@ -11183,143 +16040,172 @@ mcdt_search_cbB(void *_udata) { H5O_mcdt_search_ret_t *action = (H5O_mcdt_search_ret_t *)_udata; - return(*action); + return (*action); } /* mnt_search_cb() */ /* The main test function */ static int -test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, - hid_t dst_fapl, hbool_t reopen) +test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, + hbool_t reopen) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t tid = -1; /* Datatype ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t ocpypl_id = -1; /* Object copy plist ID */ - unsigned int i; /* Local index variables */ - hsize_t dim1d[1]; /* Dataset dimensions */ - int buf[DIM_SIZE_1]; /* Buffer for writing data */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; - H5O_mcdt_search_cb_t mcdt_cb = NULL; /* The callback function */ - H5O_mcdt_search_ret_t mcdt_udataA; /* User data for callback */ - H5O_mcdt_search_ret_t mcdt_udataB; /* User data for callback */ - H5O_mcdt_search_ret_t *mcdt_udata_p = NULL; /* Pointer to user data for callback */ - - if(reopen) - TESTING("H5Ocopy(): H5Pset/get_mcdt_search_cb and reopen") + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t tid = -1; /* Datatype ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t ocpypl_id = -1; /* Object copy plist ID */ + unsigned int i; /* Local index variables */ + hsize_t dim1d[1]; /* Dataset dimensions */ + int buf[DIM_SIZE_1]; /* Buffer for writing data */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + H5O_mcdt_search_cb_t mcdt_cb = NULL; /* The callback function */ + H5O_mcdt_search_ret_t mcdt_udataA; /* User data for callback */ + H5O_mcdt_search_ret_t mcdt_udataB; /* User data for callback */ + H5O_mcdt_search_ret_t *mcdt_udata_p = NULL; /* Pointer to user data for callback */ + + if (reopen) + TESTING("H5Ocopy(): H5Pset/get_mcdt_search_cb and reopen"); else - TESTING("H5Ocopy(): H5Pset/get_mcdt_search_cb") + TESTING("H5Ocopy(): H5Pset/get_mcdt_search_cb"); /* set initial data values */ - for(i = 0; i < DIM_SIZE_1; i++) + for (i = 0; i < DIM_SIZE_1; i++) buf[i] = (int)i; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim1d[0]=DIM_SIZE_1; + dim1d[0] = DIM_SIZE_1; /* create dataspace */ - if((sid = H5Screate_simple(1, dim1d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(1, dim1d, NULL)) < 0) + TEST_ERROR; /* * Populate source file */ /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype */ + if ((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create dataset at SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data into file */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; /* Create an uncopied group in destination file */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* * Populate destination file */ /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type "a" */ - if((H5Tcommit2(fid_dst, "/a", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype "a" */ + if ((H5Tcommit2(fid_dst, "/a", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* create datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; - /* committed data type "b" */ - if((H5Tcommit2(fid_dst, "/b", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* committed datatype "b" */ + if ((H5Tcommit2(fid_dst, "/b", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* open the source file with read-only */ - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* Create ocpl and set merge committed dtype flag */ - if((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR - if(H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) TEST_ERROR + if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; + if (H5Pset_copy_object(ocpypl_id, H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG) < 0) + TEST_ERROR; /* * First copy dataset using "/b" as a suggestion, and verify that it uses * datatype "b" in the destination file */ /* Add datatype suggestion */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, "/b") < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, "/b") < 0) + TEST_ERROR; /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* copy SRC dset to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ /* Verify "get" routine functionality */ - if(H5Pget_mcdt_search_cb(ocpypl_id, &mcdt_cb, (void **) &mcdt_udata_p) < 0) TEST_ERROR + if (H5Pget_mcdt_search_cb(ocpypl_id, &mcdt_cb, (void **)&mcdt_udata_p) < 0) + TEST_ERROR; - if(mcdt_cb != NULL) TEST_ERROR - if(mcdt_udata_p != NULL) TEST_ERROR + if (mcdt_cb != NULL) + TEST_ERROR; + if (mcdt_udata_p != NULL) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* * Set callback to continue the search @@ -11327,130 +16213,266 @@ test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, mcdt_udataA = H5O_MCDT_SEARCH_CONT; /* Free suggestions */ - if(H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) TEST_ERROR + if (H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) + TEST_ERROR; /* Add datatype suggestion to group "/uncopied" */ - if(H5Padd_merge_committed_dtype_path(ocpypl_id, NAME_GROUP_UNCOPIED) < 0) TEST_ERROR + if (H5Padd_merge_committed_dtype_path(ocpypl_id, NAME_GROUP_UNCOPIED) < 0) + TEST_ERROR; /* Continue the global search */ - if(H5Pset_mcdt_search_cb(ocpypl_id, mcdt_search_cbA, &mcdt_udataA) < 0) - TEST_ERROR + if (H5Pset_mcdt_search_cb(ocpypl_id, mcdt_search_cbA, &mcdt_udataA) < 0) + TEST_ERROR; /* open the destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* copy SRC dset to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE2, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - mcdt_cb = NULL; + mcdt_cb = NULL; mcdt_udata_p = NULL; /* Verify "get" routine functionality */ - if(H5Pget_mcdt_search_cb(ocpypl_id, &mcdt_cb, (void **) &mcdt_udata_p) < 0) TEST_ERROR + if (H5Pget_mcdt_search_cb(ocpypl_id, &mcdt_cb, (void **)&mcdt_udata_p) < 0) + TEST_ERROR; - if(mcdt_cb != mcdt_search_cbA) TEST_ERROR - if(mcdt_udata_p != &mcdt_udataA) TEST_ERROR + if (mcdt_cb != mcdt_search_cbA) + TEST_ERROR; + if (mcdt_udata_p != &mcdt_udataA) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* * Stop the search, default action is to create an anonymous committed datatype */ mcdt_udataB = H5O_MCDT_SEARCH_STOP; - if(H5Pset_mcdt_search_cb(ocpypl_id, mcdt_search_cbA, &mcdt_udataB) < 0) - TEST_ERROR + if (H5Pset_mcdt_search_cb(ocpypl_id, mcdt_search_cbA, &mcdt_udataB) < 0) + TEST_ERROR; /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; - /* copy SRC dset to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE3, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + /* copy SRC dset to DST */ + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE3, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - mcdt_cb = NULL; + mcdt_cb = NULL; mcdt_udata_p = NULL; /* Verify "get" routine functionality */ - if(H5Pget_mcdt_search_cb(ocpypl_id, &mcdt_cb, (void **) &mcdt_udata_p) < 0) TEST_ERROR + if (H5Pget_mcdt_search_cb(ocpypl_id, &mcdt_cb, (void **)&mcdt_udata_p) < 0) + TEST_ERROR; - if(mcdt_cb != mcdt_search_cbA) TEST_ERROR - if(mcdt_udata_p != &mcdt_udataB) TEST_ERROR + if (mcdt_cb != mcdt_search_cbA) + TEST_ERROR; + if (mcdt_udata_p != &mcdt_udataB) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; - /* Free suggestions */ - if(H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) TEST_ERROR + /* Free suggestions */ + if (H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) + TEST_ERROR; - if(H5Pset_mcdt_search_cb(ocpypl_id, mcdt_search_cbB, &mcdt_udataB) < 0) - TEST_ERROR + if (H5Pset_mcdt_search_cb(ocpypl_id, mcdt_search_cbB, &mcdt_udataB) < 0) + TEST_ERROR; /* open destination file */ - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; /* Delete dataset */ - if(H5Ldelete(fid_dst, NAME_DATASET_SIMPLE3, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ldelete(fid_dst, NAME_DATASET_SIMPLE3, H5P_DEFAULT) < 0) + TEST_ERROR; /* copy SRC dset to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE3, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE3, ocpypl_id, H5P_DEFAULT) < 0) + TEST_ERROR; - if(reopen) { + if (reopen) { /* Reopen file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR - if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; + if ((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDONLY, dst_fapl)) < 0) + TEST_ERROR; } /* end if */ - mcdt_cb = NULL; + mcdt_cb = NULL; mcdt_udata_p = NULL; /* Verify "get" routine functionality */ - if(H5Pget_mcdt_search_cb(ocpypl_id, &mcdt_cb, (void **) &mcdt_udata_p) < 0) TEST_ERROR + if (H5Pget_mcdt_search_cb(ocpypl_id, &mcdt_cb, (void **)&mcdt_udata_p) < 0) + TEST_ERROR; - if(mcdt_cb != mcdt_search_cbB) TEST_ERROR - if(mcdt_udata_p != &mcdt_udataB) TEST_ERROR + if (mcdt_cb != mcdt_search_cbB) + TEST_ERROR; + if (mcdt_udata_p != &mcdt_udataB) + TEST_ERROR; /* Close destination file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close property list */ - if(H5Pclose(ocpypl_id) < 0) TEST_ERROR + if (H5Pclose(ocpypl_id) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Fclose(fid_src); H5Fclose(fid_dst); H5Tclose(tid); H5Sclose(sid); H5Dclose(did); H5Pclose(ocpypl_id); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_copy_set_get_mcdt_search_cb */ - +/*------------------------------------------------------------------------- + * Function: test_copy_iterate + * + * Purpose: Tests iterating over objects in the root group, copying + * all of them. + * + * Return: Success: 0 + * Failure: number of errors + * + * Programmer: Neil Fortner + * Thursday, July 12, 2012 + * + *------------------------------------------------------------------------- + */ +static herr_t +test_copy_iterate_cb(hid_t loc_id, const char *name, const H5L_info2_t H5_ATTR_UNUSED *link_info, + void *op_data) +{ + hid_t dst_loc_id = *((hid_t *)op_data); + + if (H5Ocopy(loc_id, name, dst_loc_id, name, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + + return (H5_ITER_CONT); + +error: + return (H5_ITER_ERROR); +} /* end test_copy_iterate_cb */ + +static int +test_copy_iterate(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) +{ + hid_t fid1 = -1, fid2 = -1; /* File IDs */ + hid_t gid = -1; /* Group ID */ + int i; + char grp_name[16]; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; + + TESTING("H5Ocopy(): inside H5Literate() callback"); + + /* Initialize the filenames */ + h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); + h5_fixname(FILENAME[1], src_fapl, dst_filename, sizeof dst_filename); + + /* Reset file token checking info */ + token_reset(); + + /* Create source file */ + if ((fid1 = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; + + /* Create groups */ + for (i = 0; i < 9; i++) { + HDsnprintf(grp_name, sizeof(grp_name), "grp%d", i); + if ((gid = H5Gcreate2(fid1, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Gclose(gid) < 0) + TEST_ERROR; + } /* end for */ + + /* Create destination file */ + if ((fid2 = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; + + /* Close files */ + if (H5Fclose(fid1) < 0) + TEST_ERROR; + if (H5Fclose(fid2) < 0) + TEST_ERROR; + + /* Reopen files */ + if ((fid1 = H5Fopen(src_filename, H5F_ACC_RDWR, src_fapl)) < 0) + TEST_ERROR; + if ((fid2 = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) + TEST_ERROR; + + /* Iterate over links in the root group, copying each object */ + if ((gid = H5Gopen2(fid1, "/", H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Literate2(gid, H5_INDEX_NAME, H5_ITER_INC, NULL, test_copy_iterate_cb, &fid2) < 0) + TEST_ERROR; + + /* Close */ + if (H5Gclose(gid) < 0) + TEST_ERROR; + if (H5Fclose(fid1) < 0) + TEST_ERROR; + if (H5Fclose(fid2) < 0) + TEST_ERROR; + + PASSED(); + return 0; + +error: + H5E_BEGIN_TRY + { + H5Gclose(gid); + H5Fclose(fid1); + H5Fclose(fid2); + } + H5E_END_TRY; + return 1; +} /* end test_copy_iterate */ + /*------------------------------------------------------------------------- * Function: test_copy_option * @@ -11462,317 +16484,409 @@ error: * Programmer: Peter Cao * March 11, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static int -test_copy_option(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, - unsigned flag, hbool_t crt_intermediate_grp, const char* test_desciption) +test_copy_option(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, unsigned flag, + hbool_t crt_intermediate_grp, const char *test_desciption) { - hid_t fid_src = -1, fid_dst = -1, fid_ext = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - hid_t gid=-1, gid2=-1, gid_ref=-1; /* Group IDs */ - hid_t gid_sub=-1, gid_sub_sub=-1; /* Sub-group ID */ - hid_t pid=-1, lcpl_id=-1; /* Property IDs */ - unsigned cpy_flags; /* Object copy flags */ - int depth = -1; /* Copy depth */ - hsize_t dim2d[2]; - int buf[DIM_SIZE_1][DIM_SIZE_2]; - int i, j; - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1, fid_ext = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + hid_t gid = -1, gid2 = -1, gid_ref = -1; /* Group IDs */ + hid_t gid_sub = -1, gid_sub_sub = -1; /* Sub-group ID */ + hid_t pid = -1, lcpl_id = -1; /* Property IDs */ + unsigned cpy_flags; /* Object copy flags */ + int depth = -1; /* Copy depth */ + hsize_t dim2d[2]; + int buf[DIM_SIZE_1][DIM_SIZE_2]; + int i, j; + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING(test_desciption); /* set initial data values */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = 10000 + 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create group at the SRC file */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* attach attributes to the group */ - if(test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* Set dataspace dimensions */ - dim2d[0]=DIM_SIZE_1; - dim2d[1]=DIM_SIZE_2; + dim2d[0] = DIM_SIZE_1; + dim2d[1] = DIM_SIZE_2; /* create dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; /* add a dataset to the top group */ - if((did = H5Dcreate2(gid, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* create a sub-group */ - if((gid_sub = H5Gcreate2(fid_src, NAME_GROUP_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid_sub = H5Gcreate2(fid_src, NAME_GROUP_SUB, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* add a dataset to the sub group */ - if((did = H5Dcreate2(gid_sub, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid_sub, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; /* create sub-sub-group */ - if((gid_sub_sub = H5Gcreate2(gid_sub, NAME_GROUP_SUB_SUB2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid_sub_sub = H5Gcreate2(gid_sub, NAME_GROUP_SUB_SUB2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* add a dataset to the sub sub group */ - if((did = H5Dcreate2(gid_sub_sub, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid_sub_sub, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* close dataset */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; - if(H5Gclose(gid_sub_sub) < 0) TEST_ERROR + if (H5Gclose(gid_sub_sub) < 0) + TEST_ERROR; - if(H5Gclose(gid_sub) < 0) TEST_ERROR + if (H5Gclose(gid_sub) < 0) + TEST_ERROR; /* close the group */ - if(H5Gclose(gid) < 0) FAIL_STACK_ERROR + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR; - if((flag & H5O_COPY_EXPAND_SOFT_LINK_FLAG) > 0) { + if ((flag & H5O_COPY_EXPAND_SOFT_LINK_FLAG) > 0) { /* Create group to copy */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Lcreate_soft(NAME_DATASET_SUB_SUB, fid_src, NAME_LINK_SOFT, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Lcreate_soft("nowhere", fid_src, NAME_LINK_SOFT_DANGLE, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Gclose(gid) < 0) FAIL_STACK_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + if (H5Lcreate_soft(NAME_DATASET_SUB_SUB, fid_src, NAME_LINK_SOFT, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; + if (H5Lcreate_soft("nowhere", fid_src, NAME_LINK_SOFT_DANGLE, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR; /* Create group to compare with */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Lcreate_hard(fid_src, NAME_DATASET_SUB_SUB, H5L_SAME_LOC, NAME_LINK_SOFT2, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Lcreate_soft("nowhere", fid_src, NAME_LINK_SOFT_DANGLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Gclose(gid) < 0) FAIL_STACK_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + if (H5Lcreate_hard(fid_src, NAME_DATASET_SUB_SUB, H5L_SAME_LOC, NAME_LINK_SOFT2, H5P_DEFAULT, + H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; + if (H5Lcreate_soft("nowhere", fid_src, NAME_LINK_SOFT_DANGLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR; } /* end if */ - if((flag & H5O_COPY_EXPAND_EXT_LINK_FLAG) > 0) { - char ext_filename[NAME_BUF_SIZE]; + if ((flag & H5O_COPY_EXPAND_EXT_LINK_FLAG) > 0) { + char ext_filename[NAME_BUF_SIZE]; h5_fixname(FILENAME[2], src_fapl, ext_filename, sizeof ext_filename); /* Create the external file and dataset */ - if((fid_ext = H5Fcreate(ext_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR - if((did = H5Dcreate2(fid_ext, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - if(H5Fclose(fid_ext) < 0) TEST_ERROR + if ((fid_ext = H5Fcreate(ext_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; + if ((did = H5Dcreate2(fid_ext, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + if (H5Fclose(fid_ext) < 0) + TEST_ERROR; /* Create group to copy */ - if(!(flag & H5O_COPY_EXPAND_SOFT_LINK_FLAG)) { - if((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (!(flag & H5O_COPY_EXPAND_SOFT_LINK_FLAG)) { + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; } /* end if */ - else - if((gid = H5Gopen2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Lcreate_external(ext_filename, NAME_DATASET_SIMPLE, fid_src, NAME_LINK_EXTERN, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Lcreate_external("no_file", "no_object", fid_src, NAME_LINK_EXTERN_DANGLE, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Gclose(gid) < 0) TEST_ERROR + else if ((gid = H5Gopen2(fid_src, NAME_GROUP_LINK, H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Lcreate_external(ext_filename, NAME_DATASET_SIMPLE, fid_src, NAME_LINK_EXTERN, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Lcreate_external("no_file", "no_object", fid_src, NAME_LINK_EXTERN_DANGLE, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Gclose(gid) < 0) + TEST_ERROR; /* Create group to compare with */ - if(!(flag & H5O_COPY_EXPAND_SOFT_LINK_FLAG)) { - if((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (!(flag & H5O_COPY_EXPAND_SOFT_LINK_FLAG)) { + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_LINK2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; } /* end if */ - else - if((gid = H5Gopen2(fid_src, NAME_GROUP_LINK2, H5P_DEFAULT)) < 0) TEST_ERROR - if((did = H5Dcreate2(fid_src, NAME_LINK_EXTERN2, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR - if(H5Lcreate_external("no_file", "no_object", fid_src, NAME_LINK_EXTERN_DANGLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Dclose(did) < 0) TEST_ERROR - if(H5Gclose(gid) < 0) TEST_ERROR + else if ((gid = H5Gopen2(fid_src, NAME_GROUP_LINK2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((did = H5Dcreate2(fid_src, NAME_LINK_EXTERN2, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + if (H5Lcreate_external("no_file", "no_object", fid_src, NAME_LINK_EXTERN_DANGLE2, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Dclose(did) < 0) + TEST_ERROR; + if (H5Gclose(gid) < 0) + TEST_ERROR; /* Close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; } /* end if */ - if((flag & H5O_COPY_EXPAND_REFERENCE_FLAG) > 0) { - if((gid_ref = H5Gcreate2(fid_src, NAME_GROUP_REF, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((flag & H5O_COPY_EXPAND_REFERENCE_FLAG) > 0) { + if ((gid_ref = H5Gcreate2(fid_src, NAME_GROUP_REF, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create an attribute of object references */ - if(attach_ref_attr(fid_src, gid_ref) < 0) TEST_ERROR + if (attach_ref_attr(fid_src, gid_ref) < 0) + TEST_ERROR; /* create an attribute of region references */ - if(attach_reg_ref_attr(fid_src, gid_ref) < 0) TEST_ERROR + if (attach_reg_ref_attr(fid_src, gid_ref) < 0) + TEST_ERROR; /* create a dataset of region references */ - if(create_reg_ref_dataset(fid_src, gid_ref) < 0) TEST_ERROR + if (create_reg_ref_dataset(fid_src, gid_ref) < 0) + TEST_ERROR; /* Close group holding reference objects */ - if(H5Gclose(gid_ref) < 0) TEST_ERROR + if (H5Gclose(gid_ref) < 0) + TEST_ERROR; } /* end if */ /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* open the source file with read-only */ /* (except when expanding soft links */ - if((flag & H5O_COPY_EXPAND_SOFT_LINK_FLAG) > 0) { - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDWR, src_fapl)) < 0) TEST_ERROR + if ((flag & H5O_COPY_EXPAND_SOFT_LINK_FLAG) > 0) { + if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDWR, src_fapl)) < 0) + TEST_ERROR; } /* end if */ - else - if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR + else if ((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* create property to pass copy options */ - if((pid = H5Pcreate(H5P_OBJECT_COPY)) < 0) TEST_ERROR + if ((pid = H5Pcreate(H5P_OBJECT_COPY)) < 0) + TEST_ERROR; /* set options for object copy */ - if(H5Pset_copy_object(pid, flag) < 0) TEST_ERROR + if (H5Pset_copy_object(pid, flag) < 0) + TEST_ERROR; /* Verify object copy flags */ - if(H5Pget_copy_object(pid, &cpy_flags) < 0) TEST_ERROR - if(cpy_flags != flag) TEST_ERROR + if (H5Pget_copy_object(pid, &cpy_flags) < 0) + TEST_ERROR; + if (cpy_flags != flag) + TEST_ERROR; /* copy the group from SRC to DST */ - if(crt_intermediate_grp) { + if (crt_intermediate_grp) { /* Create link creation plist to pass in intermediate group creation */ - if((lcpl_id = H5Pcreate(H5P_LINK_CREATE)) < 0) TEST_ERROR - if(H5Pset_create_intermediate_group(lcpl_id, TRUE) < 0) TEST_ERROR + if ((lcpl_id = H5Pcreate(H5P_LINK_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_create_intermediate_group(lcpl_id, TRUE) < 0) + TEST_ERROR; - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, "/new_g0/new_g00", pid, lcpl_id) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, "/new_g0/new_g00", pid, lcpl_id) < 0) + TEST_ERROR; - if(H5Pclose(lcpl_id) < 0) TEST_ERROR + if (H5Pclose(lcpl_id) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, "/new_g0/new_g00", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - - } else if(((flag & H5O_COPY_EXPAND_SOFT_LINK_FLAG) > 0) - || ((flag & H5O_COPY_EXPAND_EXT_LINK_FLAG) > 0)) { - if(H5Ocopy(fid_src, NAME_GROUP_LINK, fid_dst, NAME_GROUP_LINK, pid, H5P_DEFAULT) < 0) TEST_ERROR + if ((gid2 = H5Gopen2(fid_dst, "/new_g0/new_g00", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + } + else if (((flag & H5O_COPY_EXPAND_SOFT_LINK_FLAG) > 0) || ((flag & H5O_COPY_EXPAND_EXT_LINK_FLAG) > 0)) { + if (H5Ocopy(fid_src, NAME_GROUP_LINK, fid_dst, NAME_GROUP_LINK, pid, H5P_DEFAULT) < 0) + TEST_ERROR; - if((flag & H5O_COPY_EXPAND_SOFT_LINK_FLAG) > 0) + if ((flag & H5O_COPY_EXPAND_SOFT_LINK_FLAG) > 0) /* Unlink dataset to copy from original location */ /* (So group comparison works properly) */ - if(H5Ldelete(fid_src, NAME_DATASET_SUB_SUB, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(fid_src, NAME_DATASET_SUB_SUB, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_LINK2, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_LINK2, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_LINK, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - - } else if(flag & (H5O_COPY_WITHOUT_ATTR_FLAG | H5O_COPY_PRESERVE_NULL_FLAG)) { - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, pid, H5P_DEFAULT) < 0) TEST_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_LINK, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + } + else if (flag & (H5O_COPY_WITHOUT_ATTR_FLAG | H5O_COPY_PRESERVE_NULL_FLAG)) { + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, pid, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - } else if(flag & H5O_COPY_SHALLOW_HIERARCHY_FLAG) { - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, pid, H5P_DEFAULT) < 0) TEST_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + } + else if (flag & H5O_COPY_SHALLOW_HIERARCHY_FLAG) { + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, pid, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* Set the copy depth */ depth = 1; - } else if((flag & H5O_COPY_EXPAND_REFERENCE_FLAG) > 0) { - if(H5Ocopy(fid_src, NAME_GROUP_REF, fid_dst, NAME_GROUP_REF, pid, H5P_DEFAULT) < 0) TEST_ERROR + } + else if ((flag & H5O_COPY_EXPAND_REFERENCE_FLAG) > 0) { + if (H5Ocopy(fid_src, NAME_GROUP_REF, fid_dst, NAME_GROUP_REF, pid, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the group for copy */ - if((gid = H5Gopen2(fid_src, NAME_GROUP_REF, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid_src, NAME_GROUP_REF, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; /* open the destination group */ - if((gid2 = H5Gopen2(fid_dst, NAME_GROUP_REF, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - } else { + if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_REF, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + } + else { /* Unknown flag */ - TEST_ERROR + TEST_ERROR; } /* end else */ /* Check if the groups are equal */ - if(compare_groups(gid, gid2, pid, depth, flag) != TRUE) TEST_ERROR - if(H5Gclose(gid2) < 0) TEST_ERROR - if(H5Gclose(gid) < 0) TEST_ERROR + if (compare_groups(gid, gid2, pid, depth, flag) != TRUE) + TEST_ERROR; + if (H5Gclose(gid2) < 0) + TEST_ERROR; + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; /* close properties */ - if(H5Pclose(pid) < 0) TEST_ERROR + if (H5Pclose(pid) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Pclose(lcpl_id); H5Pclose(pid); - H5Sclose(sid); - H5Dclose(did); - H5Gclose(gid_ref); - H5Gclose(gid_sub); - H5Gclose(gid2); - H5Gclose(gid); - H5Fclose(fid_dst); - H5Fclose(fid_src); - H5Fclose(fid_ext); - } H5E_END_TRY; + H5Sclose(sid); + H5Dclose(did); + H5Gclose(gid_ref); + H5Gclose(gid_sub); + H5Gclose(gid2); + H5Gclose(gid); + H5Fclose(fid_dst); + H5Fclose(fid_src); + H5Fclose(fid_ext); + } + H5E_END_TRY; return 1; } /* end test_copy_option */ - /*------------------------------------------------------------------------- * Function: test_copy_dataset_open * * Purpose: To ensure that H5Ocopy() copies data of opened dataset correctly. - * This is for bug fix HDFFV-7853. - * - * Test Case 1: - * Create a dataset with attributes in SRC file - * Copy the opened dataset to another location in the same file - * Copy the opened dataset to DST file - * Close the dataset - * - * Test Case 2: - * Reopen the dataset, write new data to the dataset - * Copy the opened dataset to another location in the same file - * Copy the opened dataset to to DST file - * Close the dataset - * - * Test Case 3: - * Create a committed datatype - * Create a dataset with the committed datatype in SRC file - * Open the committed datatype - * Copy the opened dataset (with the opened committed datatype) to another location in the same file - * Copy the opened dataset (with the opened committed datatype) to DST file - * Close the dataset and the committed datatype - * - * Test Case 4: - * Create a group with attributes, create a dataset in the group - * Copy the opened group (together with the opened dataset) to another location in the same file - * Copy the opened group (together with the opened dataset) to DST file - * Close the group and the dataset + * This is for bug fix HDFFV-7853. + * + * Test Case 1: + * Create a dataset with attributes in SRC file + * Copy the opened dataset to another location in the same file + * Copy the opened dataset to DST file + * Close the dataset + * + * Test Case 2: + * Reopen the dataset, write new data to the dataset + * Copy the opened dataset to another location in the same file + * Copy the opened dataset to to DST file + * Close the dataset + * + * Test Case 3: + * Create a committed datatype + * Create a dataset with the committed datatype in SRC file + * Open the committed datatype + * Copy the opened dataset (with the opened committed datatype) to another location in the same file + * Copy the opened dataset (with the opened committed datatype) to DST file + * Close the dataset and the committed datatype + * + * Test Case 4: + * Create a group with attributes, create a dataset in the group + * Copy the opened group (together with the opened dataset) to another location in the same file + * Copy the opened group (together with the opened dataset) to DST file + * Close the group and the dataset * * Return: Success: 0 * Failure: number of errors @@ -11780,283 +16894,405 @@ error: * Programmer: Vailin Choi * Feb 7, 2012 * - * Modifications: - * *------------------------------------------------------------------------- */ static int test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) { - hid_t fid_src = -1, fid_dst = -1; /* File IDs */ - hid_t sid = -1; /* Dataspace ID */ - hid_t tid = -1; /* Datatype ID */ - hid_t did = -1, did2 = -1; /* Dataset IDs */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - int buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ - int newbuf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ - hsize_t dim2d[2]; /* Dataset dimensions */ - int i, j; /* local index variables */ - char src_filename[NAME_BUF_SIZE]; - char dst_filename[NAME_BUF_SIZE]; + hid_t fid_src = -1, fid_dst = -1; /* File IDs */ + hid_t sid = -1; /* Dataspace ID */ + hid_t tid = -1; /* Datatype ID */ + hid_t did = -1, did2 = -1; /* Dataset IDs */ + hid_t did3 = -1, did4 = -1; /* Dataset IDs */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + hid_t pid = -1; /* Dataset creation property list */ + hsize_t chunk_dim2d[2] = {CHUNK_SIZE_1, CHUNK_SIZE_2}; /* Chunk dimension sizes */ + int buf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + int newbuf[DIM_SIZE_1][DIM_SIZE_2]; /* Buffer for writing data */ + hsize_t dim2d[2]; /* Dataset dimensions */ + int i, j; /* local index variables */ + char src_filename[NAME_BUF_SIZE]; + char dst_filename[NAME_BUF_SIZE]; TESTING("H5Ocopy(): copying objects while opened"); /* Initialize write buffer */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - buf[i][j] = 10000 + 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + buf[i][j] = 10000 + 100 * i + j; /* Initialize another write buffer */ - for (i=0; i<DIM_SIZE_1; i++) - for (j=0; j<DIM_SIZE_2; j++) - newbuf[i][j] = 100*i+j; + for (i = 0; i < DIM_SIZE_1; i++) + for (j = 0; j < DIM_SIZE_2; j++) + newbuf[i][j] = 100 * i + j; /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); h5_fixname(FILENAME[1], dst_fapl, dst_filename, sizeof dst_filename); - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* create source file */ - if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR + if ((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) + TEST_ERROR; /* create destination file */ - if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR + if ((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) + TEST_ERROR; - /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */ - if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* Create an uncopied object in destination file so that tokens in source and destination files aren't the + * same */ + if (H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Set dataspace dimensions */ dim2d[0] = DIM_SIZE_1; dim2d[1] = DIM_SIZE_2; /* create 2D dataspace */ - if((sid = H5Screate_simple(2, dim2d, NULL)) < 0) TEST_ERROR + if ((sid = H5Screate_simple(2, dim2d, NULL)) < 0) + TEST_ERROR; - /* create 2D int dataset in SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* create and set chunk plist */ + if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_chunk(pid, 2, chunk_dim2d) < 0) + TEST_ERROR; + + /* create 2D dataset in SRC file */ + if ((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; + + /* create 2D chunked dataset in SRC file */ + if ((did2 = H5Dcreate2(fid_src, NAME_DATASET_CHUNKED, H5T_NATIVE_INT, sid, H5P_DEFAULT, pid, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data to the dataset */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; /* attach attributes to the dataset */ - if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) + TEST_ERROR; + if (test_copy_attach_attributes(did2, H5T_NATIVE_INT) < 0) + TEST_ERROR; - /* - * Test case 1 + /* + * Test case 1 */ - /* + /* * Copy within the same file */ /* copy the opened dataset to another location in SRC file */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_src, NAME_DATASET_SIMPLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_src, NAME_DATASET_SIMPLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_src, NAME_DATASET_CHUNKED2, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the copied dataset */ - if((did2 = H5Dopen2(fid_src, NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did3 = H5Dopen2(fid_src, NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((did4 = H5Dopen2(fid_src, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did3, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; + if (compare_datasets(did2, did4, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the copied dataset */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did3) < 0) + TEST_ERROR; + if (H5Dclose(did4) < 0) + TEST_ERROR; - /* + /* * Copy to another file */ /* copy the opened dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the copied dataset in DST file */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did3 = H5Dopen2(fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((did4 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did3, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; + if (compare_datasets(did2, did4, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the copied dataset in DST file */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did3) < 0) + TEST_ERROR; + if (H5Dclose(did4) < 0) + TEST_ERROR; /* close the dataset in SRC file */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + if (H5Dclose(did2) < 0) + TEST_ERROR; - /* - * Test case 2 + /* + * Test case 2 */ /* reopen the dataset in SRC file */ - if((did = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((did2 = H5Dopen2(fid_src, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) + TEST_ERROR; /* write another set of data to the dataset */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, newbuf) < 0) TEST_ERROR + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, newbuf) < 0) + TEST_ERROR; + if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, newbuf) < 0) + TEST_ERROR; - /* + /* * Copy within the same file */ /* copy the opened dataset to another location in SRC file */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_src, "NEW_DATASET", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_src, "NEW_DATASET_SIMPLE", H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_src, "NEW_DATASET_CHUNKED", H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the copied dataset */ - if((did2 = H5Dopen2(fid_src, "NEW_DATASET", H5P_DEFAULT)) < 0) TEST_ERROR + if ((did3 = H5Dopen2(fid_src, "NEW_DATASET_SIMPLE", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((did4 = H5Dopen2(fid_src, "NEW_DATASET_CHUNKED", H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, newbuf) != TRUE) TEST_ERROR + if (compare_datasets(did, did3, H5P_DEFAULT, newbuf) != TRUE) + TEST_ERROR; + if (compare_datasets(did2, did4, H5P_DEFAULT, newbuf) != TRUE) + TEST_ERROR; /* close the copied dataset in SRC file */ - if(H5Dclose(did2) < 0) TEST_ERROR - /* + if (H5Dclose(did3) < 0) + TEST_ERROR; + if (H5Dclose(did4) < 0) + TEST_ERROR; + /* * Copy to another file */ /* copy the opened dataset from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, "NEW_DATASET", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, "NEW_DATASET_SIMPLE", H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; + if (H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_dst, "NEW_DATASET_CHUNKED", H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the copied dataset in DST file */ - if((did2 = H5Dopen2(fid_dst, "NEW_DATASET", H5P_DEFAULT)) < 0) TEST_ERROR + if ((did3 = H5Dopen2(fid_dst, "NEW_DATASET_SIMPLE", H5P_DEFAULT)) < 0) + TEST_ERROR; + if ((did4 = H5Dopen2(fid_dst, "NEW_DATASET_CHUNKED", H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, newbuf) != TRUE) TEST_ERROR + if (compare_datasets(did, did3, H5P_DEFAULT, newbuf) != TRUE) + TEST_ERROR; + if (compare_datasets(did2, did4, H5P_DEFAULT, newbuf) != TRUE) + TEST_ERROR; /* close the copied dataset in DST file */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did3) < 0) + TEST_ERROR; + if (H5Dclose(did4) < 0) + TEST_ERROR; /* close the dataset at SRC file */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; + if (H5Dclose(did2) < 0) + TEST_ERROR; - /* - * Test case 3 + /* + * Test case 3 */ /* make a copy of the datatype */ - if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR + if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR; /* commit the datatype */ - if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* close the datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; /* open the committed datatype */ tid = H5Topen2(fid_src, NAME_DATATYPE_SIMPLE, H5P_DEFAULT); /* create 2D dataset with the opened committed datatype in SRC file */ - if((did = H5Dcreate2(fid_src, NAME_DATASET_NAMED_DTYPE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(fid_src, NAME_DATASET_NAMED_DTYPE, tid, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data to the dataset */ - if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR + if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; - /* + /* * Copy within the same file */ /* copy the opened dataset (with the opened committed datatype) to another location in SRC file */ - if(H5Ocopy(fid_src, NAME_DATASET_NAMED_DTYPE, fid_src, NAME_DATASET_NAMED_DTYPE2, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_NAMED_DTYPE, fid_src, NAME_DATASET_NAMED_DTYPE2, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; /* open the copied dataset */ - if((did2 = H5Dopen2(fid_src, NAME_DATASET_NAMED_DTYPE2, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_src, NAME_DATASET_NAMED_DTYPE2, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the copied dataset in SRC file */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; - /* + /* * Copy to another file */ /* copy the opened dataset (with the opened committed datatype) from SRC to DST */ - if(H5Ocopy(fid_src, NAME_DATASET_NAMED_DTYPE, fid_dst, NAME_DATASET_NAMED_DTYPE2, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_DATASET_NAMED_DTYPE, fid_dst, NAME_DATASET_NAMED_DTYPE2, H5P_DEFAULT, + H5P_DEFAULT) < 0) + TEST_ERROR; /* open the copied dataset in DST file */ - if((did2 = H5Dopen2(fid_dst, NAME_DATASET_NAMED_DTYPE2, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_NAMED_DTYPE2, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the datasets are equal */ - if(compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) TEST_ERROR + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + TEST_ERROR; /* close the copied dataset in DST file */ - if(H5Dclose(did2) < 0) TEST_ERROR + if (H5Dclose(did2) < 0) + TEST_ERROR; /* close the dataset at SRC file */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close the committed datatype at SRC file */ - if(H5Tclose(tid) < 0) TEST_ERROR + if (H5Tclose(tid) < 0) + TEST_ERROR; - /* - * Test case 4 + /* + * Test case 4 */ /* create a group in SRC file */ - if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* attach attributes to the group */ - if(test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) TEST_ERROR + if (test_copy_attach_attributes(gid, H5T_NATIVE_INT) < 0) + TEST_ERROR; /* create 2D int dataset in the group at SRC file */ - if((did = H5Dcreate2(gid, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((did = H5Dcreate2(gid, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + TEST_ERROR; /* write data to the dataset */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR - /* + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + TEST_ERROR; + /* * Copy within the same file */ /* copy the opened group (together with opened dataset) to another location in SRC file */ - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_src, "COPIED_GROUP", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_src, "COPIED_GROUP", H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the copied group at SRC */ - if((gid2 = H5Gopen2(fid_src, "COPIED_GROUP", H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid2 = H5Gopen2(fid_src, "COPIED_GROUP", H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the DST dataset */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; - /* + /* * Copy to another file */ /* copy the opened group (together with opened dataset) to DST file */ - if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, "COPIED_GROUP", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, "COPIED_GROUP", H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR; /* open the copied group at DST */ - if((gid2 = H5Gopen2(fid_dst, "COPIED_GROUP", H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid2 = H5Gopen2(fid_dst, "COPIED_GROUP", H5P_DEFAULT)) < 0) + TEST_ERROR; /* Check if the groups are equal */ - if(compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) TEST_ERROR + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + TEST_ERROR; /* close the group in DST file */ - if(H5Gclose(gid2) < 0) TEST_ERROR + if (H5Gclose(gid2) < 0) + TEST_ERROR; /* close the group in SRC file */ - if(H5Gclose(gid) < 0) TEST_ERROR + if (H5Gclose(gid) < 0) + TEST_ERROR; /* close the dataset in SRC file */ - if(H5Dclose(did) < 0) TEST_ERROR + if (H5Dclose(did) < 0) + TEST_ERROR; /* close dataspace */ - if(H5Sclose(sid) < 0) TEST_ERROR + if (H5Sclose(sid) < 0) + TEST_ERROR; /* close the SRC file */ - if(H5Fclose(fid_src) < 0) TEST_ERROR + if (H5Fclose(fid_src) < 0) + TEST_ERROR; /* close the DST file */ - if(H5Fclose(fid_dst) < 0) TEST_ERROR + if (H5Fclose(fid_dst) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Dclose(did); - H5Dclose(did2); - H5Sclose(sid); - H5Gclose(gid); - H5Gclose(gid2); - H5Fclose(fid_dst); - H5Fclose(fid_src); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Dclose(did); + H5Dclose(did2); + H5Sclose(sid); + H5Gclose(gid); + H5Gclose(gid2); + H5Fclose(fid_dst); + H5Fclose(fid_src); + } + H5E_END_TRY; return 1; } /* end test_copy_dataset_open */ - /*------------------------------------------------------------------------- - * Function: main + * Function: main * * Purpose: Test H5Ocopy() * @@ -12064,52 +17300,67 @@ error: * new or old format, messages can be shared in either, * both, or neither of the source and destination files. * - * Return: Non-negative on success/Negative on failure + * Return: EXIT_SUCCESS/EXIT_FAILURE * * Programmer: Peter Cao * Friday, September 30, 2005 * - * Modifications: - * *------------------------------------------------------------------------- */ int main(void) { - int nerrors = 0; - hid_t fapl, fapl2; - hid_t fcpl_shared, ocpl; + int nerrors = 0; + hid_t fapl, fapl2; + hid_t fcpl_shared, ocpl; unsigned max_compact, min_dense; - int configuration; /* Configuration of tests. */ - int ExpressMode; - hbool_t same_file; /* Whether to run tests that only use one file */ + int configuration; /* Configuration of tests. */ + int ExpressMode; + const char *env_h5_drvr; /* File Driver value from environment */ + hbool_t same_file; /* Whether to run tests that only use one file */ + hbool_t driver_is_default_compatible; + + env_h5_drvr = HDgetenv(HDF5_DRIVER); + if (env_h5_drvr == NULL) + env_h5_drvr = "nomatch"; /* Setup */ h5_reset(); fapl = h5_fileaccess(); + if (h5_driver_is_default_vfd_compatible(fapl, &driver_is_default_compatible) < 0) + TEST_ERROR; + ExpressMode = GetTestExpress(); if (ExpressMode > 1) - printf("***Express test mode on. Some tests may be skipped\n"); + HDprintf("***Express test mode on. Some tests may be skipped\n"); /* Copy the file access property list */ - if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR + if ((fapl2 = H5Pcopy(fapl)) < 0) + TEST_ERROR; /* Set the "use the latest version of the format" bounds for creating objects in the file */ - if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR + if (H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) + TEST_ERROR; /* Create an FCPL with sharing enabled */ - if((fcpl_shared = H5Pcreate(H5P_FILE_CREATE)) < 0) TEST_ERROR - if(H5Pset_shared_mesg_nindexes(fcpl_shared, 1) < 0) TEST_ERROR - if(H5Pset_shared_mesg_index(fcpl_shared, 0, H5O_SHMESG_ALL_FLAG, 10) < 0) TEST_ERROR + if ((fcpl_shared = H5Pcreate(H5P_FILE_CREATE)) < 0) + TEST_ERROR; + if (H5Pset_shared_mesg_nindexes(fcpl_shared, 1) < 0) + TEST_ERROR; + if (H5Pset_shared_mesg_index(fcpl_shared, 0, H5O_SHMESG_ALL_FLAG, 10) < 0) + TEST_ERROR; /* Obtain the default attribute storage phase change values */ - if((ocpl = H5Pcreate(H5P_OBJECT_CREATE)) < 0) TEST_ERROR - if(H5Pget_attr_phase_change(ocpl, &max_compact, &min_dense) < 0) TEST_ERROR - if(H5Pclose(ocpl) < 0) TEST_ERROR + if ((ocpl = H5Pcreate(H5P_OBJECT_CREATE)) < 0) + TEST_ERROR; + if (H5Pget_attr_phase_change(ocpl, &max_compact, &min_dense) < 0) + TEST_ERROR; + if (H5Pclose(ocpl) < 0) + TEST_ERROR; /* Test in all configurations */ - for(configuration = 0; configuration <= MAX_CONFIGURATION; configuration++) { + for (configuration = 0; configuration <= MAX_CONFIGURATION; configuration++) { hid_t src_fapl; hid_t dst_fapl; hid_t fcpl_src; @@ -12121,71 +17372,86 @@ main(void) same_file = TRUE; /* No need to test dense attributes with old format */ - if(!(configuration & CONFIG_SRC_NEW_FORMAT) && (configuration & CONFIG_DENSE)) + if (!(configuration & CONFIG_SRC_NEW_FORMAT) && (configuration & CONFIG_DENSE)) continue; /* Test with and without shared messages */ - if(configuration & CONFIG_SHARE_SRC) { - puts("\nTesting with shared src messages:"); + if (configuration & CONFIG_SHARE_SRC) { + HDputs("\nTesting with shared src messages:"); fcpl_src = fcpl_shared; } else { - puts("\nTesting without shared src messages:"); + HDputs("\nTesting without shared src messages:"); fcpl_src = H5P_DEFAULT; } - if(configuration & CONFIG_SHARE_DST) { - puts("Testing with shared dst messages:"); - fcpl_dst = fcpl_shared; + if (configuration & CONFIG_SHARE_DST) { + HDputs("Testing with shared dst messages:"); + fcpl_dst = fcpl_shared; same_file = FALSE; } else { - puts("Testing without shared dst messages:"); + HDputs("Testing without shared dst messages:"); fcpl_dst = H5P_DEFAULT; } /* Set the FAPL for the source file's type of format */ - if(configuration & CONFIG_SRC_NEW_FORMAT) { - puts("Testing with latest format for source file:"); + if (configuration & CONFIG_SRC_NEW_FORMAT) { + HDputs("Testing with latest format for source file:"); src_fapl = fapl2; /* Test with and without dense attributes */ - if(configuration & CONFIG_DENSE) { - puts("Testing with dense attributes:"); + if (configuration & CONFIG_DENSE) { + HDputs("Testing with dense attributes:"); num_attributes_g = max_compact + 1; } else { - puts("Testing without dense attributes:"); + HDputs("Testing without dense attributes:"); num_attributes_g = MAX(min_dense, 2) - 2; } } /* end if */ else { - puts("Testing with oldest file format for source file:"); - src_fapl = fapl; + HDputs("Testing with oldest file format for source file:"); + src_fapl = fapl; num_attributes_g = 4; } /* end else */ /* Set the FAPL for the destination file's type of format */ - if(configuration & CONFIG_DST_NEW_FORMAT) { - puts("Testing with latest format for destination file:"); - dst_fapl = fapl2; + if (configuration & CONFIG_DST_NEW_FORMAT) { + HDputs("Testing with latest format for destination file:"); + dst_fapl = fapl2; same_file = FALSE; } /* end if */ else { - puts("Testing with oldest file format for destination file:"); + HDputs("Testing with oldest file format for destination file:"); dst_fapl = fapl; } /* end else */ /* The tests... */ nerrors += test_copy_dataset_simple(fcpl_src, fcpl_dst, src_fapl, dst_fapl); + nerrors += test_copy_dataset_versionbounds(fcpl_src, src_fapl); nerrors += test_copy_dataset_simple_samefile(fcpl_src, src_fapl); - nerrors += test_copy_dataset_simple_empty(fcpl_src, fcpl_dst, src_fapl, dst_fapl); + + /* Test with dataset opened in the file or not */ + nerrors += test_copy_dataset_simple_empty(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); + nerrors += test_copy_dataset_simple_empty(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_dataset_compound(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_chunked(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_chunked_empty(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_chunked_sparse(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_compressed(fcpl_src, fcpl_dst, src_fapl, dst_fapl); - nerrors += test_copy_dataset_compact(fcpl_src, fcpl_dst, src_fapl, dst_fapl); - nerrors += test_copy_dataset_multi_ohdr_chunks(fcpl_src, fcpl_dst, src_fapl, dst_fapl); + + /* Test with dataset opened in the file or not */ + nerrors += test_copy_dataset_no_edge_filt(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); + nerrors += test_copy_dataset_no_edge_filt(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + + /* Test with dataset opened in the file or not */ + nerrors += test_copy_dataset_compact(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); + nerrors += test_copy_dataset_compact(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + + nerrors += test_copy_dataset_multi_ohdr_chunks(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); + nerrors += test_copy_dataset_multi_ohdr_chunks(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_dataset_attr_named_dtype(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_group_empty(fcpl_src, fcpl_dst, src_fapl, dst_fapl); @@ -12195,10 +17461,12 @@ main(void) nerrors += test_copy_group_loop(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_group_wide_loop(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_group_links(fcpl_src, fcpl_dst, src_fapl, dst_fapl); - nerrors += test_copy_soft_link(fcpl_src, fcpl_dst, src_fapl, dst_fapl); -#ifndef H5_CANNOT_OPEN_TWICE + + /* Test with dataset opened in the file or not */ + nerrors += test_copy_soft_link(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); + nerrors += test_copy_soft_link(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_ext_link(fcpl_src, fcpl_dst, src_fapl, dst_fapl); -#endif /* H5_CANNOT_OPEN_TWICE */ nerrors += test_copy_exist(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_path(fcpl_src, fcpl_dst, src_fapl, dst_fapl); @@ -12206,49 +17474,47 @@ main(void) nerrors += test_copy_attr_crt_order(fcpl_src, fcpl_dst, src_fapl, dst_fapl); + nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_WITHOUT_ATTR_FLAG, FALSE, + "H5Ocopy(): without attributes"); + nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, 0, TRUE, + "H5Ocopy(): with missing groups"); + nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_EXPAND_SOFT_LINK_FLAG, + FALSE, "H5Ocopy(): expand soft link"); + nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_EXPAND_EXT_LINK_FLAG, + FALSE, "H5Ocopy(): expand external link"); + + /* Splitter VFD currently has external link-related bugs */ + if (HDstrcmp(env_h5_drvr, "splitter")) { + nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, + H5O_COPY_EXPAND_SOFT_LINK_FLAG | H5O_COPY_EXPAND_EXT_LINK_FLAG, FALSE, + "H5Ocopy(): expand soft and external links"); + } + + nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_SHALLOW_HIERARCHY_FLAG, + FALSE, "H5Ocopy(): shallow group copy"); + nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_EXPAND_REFERENCE_FLAG, + FALSE, "H5Ocopy(): expand object reference"); + nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_PRESERVE_NULL_FLAG, + FALSE, "H5Ocopy(): preserve NULL messages"); nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, - H5O_COPY_WITHOUT_ATTR_FLAG, - FALSE, "H5Ocopy(): without attributes"); - nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, - 0, - TRUE, "H5Ocopy(): with missing groups"); - nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, - H5O_COPY_EXPAND_SOFT_LINK_FLAG, - FALSE, "H5Ocopy(): expand soft link"); - nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, - H5O_COPY_EXPAND_EXT_LINK_FLAG, - FALSE, "H5Ocopy: expand external link"); - nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, - H5O_COPY_EXPAND_SOFT_LINK_FLAG | H5O_COPY_EXPAND_EXT_LINK_FLAG, - FALSE, "H5Ocopy: expand soft and external links"); - nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, - H5O_COPY_SHALLOW_HIERARCHY_FLAG, - FALSE, "H5Ocopy(): shallow group copy"); - nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, - H5O_COPY_EXPAND_REFERENCE_FLAG, - FALSE, "H5Ocopy(): expand object reference"); - nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, - H5O_COPY_PRESERVE_NULL_FLAG, - FALSE, "H5Ocopy(): preserve NULL messages"); - nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, - H5O_COPY_WITHOUT_ATTR_FLAG | H5O_COPY_PRESERVE_NULL_FLAG, - TRUE, "H5Ocopy(): preserve NULL messages"); + H5O_COPY_WITHOUT_ATTR_FLAG | H5O_COPY_PRESERVE_NULL_FLAG, TRUE, + "H5Ocopy(): preserve NULL messages"); nerrors += test_copy_dataset_open(fcpl_src, fcpl_dst, src_fapl, dst_fapl); /* Tests that do not use attributes and do not need to be tested * multiple times for different attribute configurations */ - if(configuration < CONFIG_DENSE) { - hbool_t reopen; + if (configuration < CONFIG_DENSE) { + unsigned reopen; nerrors += test_copy_named_datatype(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_named_datatype_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_named_datatype_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); /* Loop over reopening the file */ - for(reopen = FALSE; reopen <= TRUE; reopen++) { + for (reopen = FALSE; reopen <= TRUE; reopen++) { nerrors += test_copy_committed_datatype_merge(fcpl_src, fcpl_dst, src_fapl, dst_fapl, reopen); - if(same_file) + if (same_file) nerrors += test_copy_committed_datatype_merge_same_file(fcpl_src, src_fapl, reopen); nerrors += test_copy_committed_dt_merge_sugg(fcpl_src, fcpl_dst, src_fapl, dst_fapl, reopen); @@ -12274,48 +17540,92 @@ main(void) nerrors += test_copy_dataset_compact_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_compressed_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_attribute_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); + nerrors += test_copy_attribute_compound_vlstr(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_compact_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_contig_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); - nerrors += test_copy_dataset_chunked_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); + + /* Test with dataset opened in the file or not */ + nerrors += test_copy_dataset_chunked_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); + nerrors += test_copy_dataset_chunked_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_dataset_compressed_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_compact_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); - nerrors += test_copy_dataset_contig_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); + + /* Test with dataset opened in the file or not */ + nerrors += test_copy_dataset_contig_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); + nerrors += test_copy_dataset_contig_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_dataset_chunked_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); - nerrors += test_copy_dataset_compressed_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); + + /* Test with dataset opened in the file or not */ + nerrors += test_copy_dataset_compressed_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); + nerrors += test_copy_dataset_compressed_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_dataset_contig_cmpd_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_chunked_cmpd_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_compact_cmpd_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_same_file_named_datatype(fcpl_src, src_fapl); - nerrors += test_copy_old_layout(fcpl_dst, dst_fapl); + + if (driver_is_default_compatible) { + /* Test with dataset opened in the file or not */ + nerrors += test_copy_old_layout(fcpl_dst, dst_fapl, FALSE); + nerrors += test_copy_old_layout(fcpl_dst, dst_fapl, TRUE); + } + + /* Test with dataset opened in the file or not */ nerrors += test_copy_null_ref(fcpl_src, fcpl_dst, src_fapl, dst_fapl); - } + nerrors += test_copy_null_ref_open(fcpl_src, fcpl_dst, src_fapl, dst_fapl); -/* TODO: not implemented - nerrors += test_copy_mount(src_fapl); -*/ + nerrors += test_copy_iterate(fcpl_src, fcpl_dst, src_fapl, dst_fapl); + } /* end if */ + + /* TODO: not implemented + nerrors += test_copy_mount(src_fapl); + */ } /* end for */ - /* Reset file address checking info */ - addr_reset(); + /* Reset file token checking info */ + token_reset(); /* Verify symbol table messages are cached */ nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0); /* Results */ - if(nerrors) { - printf("***** %d OBJECT COPY TEST%s FAILED! *****\n", - nerrors, (1 == nerrors ? "" : "S")); - exit(1); + if (nerrors) { + HDprintf("***** %d OBJECT COPY TEST%s FAILED! *****\n", nerrors, (1 == nerrors ? "" : "S")); + HDexit(EXIT_FAILURE); } /* end if */ - puts ("All object copying tests passed."); + HDputs("All object copying tests passed."); + + /* close property list. + * NOTE: if this property list is not closed and the test is + * run with the split or multi driver, an interesting + * problem is exposed in the property list shutdown code. + * + * Namely, since the split/multi driver copies property + * lists for internal use, there's a (high) chance that + * leaving the FAPL open and having the library's shutdown + * code close it will cause the underlying property lists + * to be cleaned up first, causing the actual property list + * close operation to fail (since it won't be able to close + * the already closed underlying property list). + * + * The could be addressed by converting the split/multi to + * use non-public API routines, or putting some way into the + * public H5I routines to indicate ordering at shutdown. + * + * For now, we just make certain to close the property list. + * (QAK - 2016/04/06) + * + */ + H5Pclose(fapl2); h5_cleanup(FILENAME, fapl); - return 0; + HDexit(EXIT_SUCCESS); error: - return 1; + HDexit(EXIT_FAILURE); } /* main */ - |