mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-11 16:01:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
58a685ac81
hdf5/test/tvltypes.c

757 lines
26 KiB
C
Raw Normal View History

[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
/****************************************************************************
* NCSA HDF *
* Software Development Group *
* National Center for Supercomputing Applications *
* University of Illinois at Urbana-Champaign *
* 605 E. Springfield, Champaign IL 61820 *
* *
* For conditions of distribution and use, see the accompanying *
* hdf/COPYING file. *
* *
****************************************************************************/
#ifdef RCSID
static char RcsId[] = "$Revision$";
#endif
/* $Id$ */
/***********************************************************
*
* Test program: tvltypes
*
* Test the Variable-Length Datatype functionality
*
*************************************************************/
#include <testhdf5.h>
#include <hdf5.h>
#define FILE "tvltypes.h5"
/* 1-D dataset with fixed dimensions */
#define SPACE1_NAME "Space1"
#define SPACE1_RANK 1
#define SPACE1_DIM1 4
/* 2-D dataset with fixed dimensions */
#define SPACE2_NAME "Space2"
#define SPACE2_RANK 2
#define SPACE2_DIM1 10
#define SPACE2_DIM2 10
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
void *test_vltypes_alloc_custom(size_t size, void *info);
void test_vltypes_free_custom(void *mem, void *info);
/****************************************************************
**
** test_vltypes_alloc_custom(): Test VL datatype custom memory
** allocation routines. This routine just uses malloc to
** allocate the memory and increments the amount of memory
** allocated.
**
****************************************************************/
void *test_vltypes_alloc_custom(size_t size, void *info)
{
void *ret_value=NULL; /* Pointer to return */
int *mem_used=(int *)info; /* Get the pointer to the memory used */
[svn-r1536] Fixed alignment problems on DEC Alpha platform.
1999-07-24 05:20:07 +08:00
size_t extra; /* Extra space needed */
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
[svn-r1536] Fixed alignment problems on DEC Alpha platform.
1999-07-24 05:20:07 +08:00
/*
* This weird contortion is required on the DEC Alpha to keep the
* alignment correct - QAK
*/
extra=MAX(sizeof(void *),sizeof(int));
if((ret_value=HDmalloc(extra+size))!=NULL) {
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
*(int *)ret_value=size;
*mem_used+=size;
} /* end if */
[svn-r1536] Fixed alignment problems on DEC Alpha platform.
1999-07-24 05:20:07 +08:00
ret_value=((unsigned char *)ret_value)+extra;
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
return(ret_value);
}
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
/****************************************************************
**
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
** test_vltypes_free_custom(): Test VL datatype custom memory
** allocation routines. This routine just uses free to
** release the memory and decrements the amount of memory
** allocated.
**
****************************************************************/
void test_vltypes_free_custom(void *_mem, void *info)
{
unsigned char *mem;
int *mem_used=(int *)info; /* Get the pointer to the memory used */
[svn-r1536] Fixed alignment problems on DEC Alpha platform.
1999-07-24 05:20:07 +08:00
size_t extra; /* Extra space needed */
/*
* This weird contortion is required on the DEC Alpha to keep the
* alignment correct - QAK
*/
extra=MAX(sizeof(void *),sizeof(int));
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
if(_mem!=NULL) {
[svn-r1536] Fixed alignment problems on DEC Alpha platform.
1999-07-24 05:20:07 +08:00
mem=((unsigned char *)_mem)-extra;
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
*mem_used-=*(int *)mem;
HDfree(mem);
} /* end if */
}
/****************************************************************
**
** test_vltypes_vlen_atomic(): Test basic VL datatype code.
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
** Tests VL datatypes of atomic datatypes
**
****************************************************************/
static void
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
test_vltypes_vlen_atomic(void)
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
{
hvl_t wdata[SPACE1_DIM1]; /* Information to write */
hvl_t rdata[SPACE1_DIM1]; /* Information read in */
hid_t fid1; /* HDF5 File IDs */
hid_t dataset; /* Dataset ID */
hid_t sid1; /* Dataspace ID */
hid_t tid1; /* Datatype ID */
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
hid_t xfer_pid; /* Dataset transfer property list ID */
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
hsize_t dims1[] = {SPACE1_DIM1};
[svn-r1577] Added test for H5Dvlen_get_buf_size function.
1999-08-20 02:50:30 +08:00
hsize_t size; /* Number of bytes which will be used */
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
uintn i,j; /* counting variables */
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
int mem_used=0; /* Memory used during allocation */
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
herr_t ret; /* Generic return value */
/* Output message about test being performed */
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
MESSAGE(5, ("Testing Basic Atomic VL Datatype Functionality\n"));
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
/* Allocate and initialize VL data to write */
for(i=0; i<SPACE1_DIM1; i++) {
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
wdata[i].p=malloc((i+1)*sizeof(unsigned int));
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
wdata[i].len=i+1;
for(j=0; j<(i+1); j++)
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
((unsigned int *)wdata[i].p)[j]=i*10+j;
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
} /* end for */
/* Create file */
fid1 = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(fid1, FAIL, "H5Fcreate");
/* Create dataspace for datasets */
sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
CHECK(sid1, FAIL, "H5Screate_simple");
/* Create a datatype to refer to */
tid1 = H5Tvlen_create (H5T_NATIVE_UINT);
CHECK(tid1, FAIL, "H5Tvlen_create");
/* Create a dataset */
dataset=H5Dcreate(fid1,"Dataset1",tid1,sid1,H5P_DEFAULT);
CHECK(dataset, FAIL, "H5Dcreate");
/* Write dataset to disk */
ret=H5Dwrite(dataset,tid1,H5S_ALL,H5S_ALL,H5P_DEFAULT,wdata);
CHECK(ret, FAIL, "H5Dwrite");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Change to the custom memory allocation routines for reading VL data */
[svn-r1568] Changes since 19990730 ---------------------- This extensive change is the virtual file layer implementation. I've ported and tested the sec2, family, and core drivers and only ported the mpio driver (Albert will test it). So if you need MPIO I would recommend sticking with the previous version for a while. You will get a few compile warnings about split and stdio drivers not being implemented and possibly tracing information not inserted in some of the drivers. You can safely ignore them but I plan to fix them. I'm still working on the split driver because I just realized that it needs a part of the VFL that isn't written yet. Documentation is being updated also because there were some minor changes (mostly just name changes). It should be available on my web site later this week. ./MANIFEST ./src/Makefile.in ./src/hdf5.h ./src/H5Flow.c [REMOVED] ./src/H5Fstdio.c [REMOVED] ./src/H5Fsec2.c [REMOVED] ./src/H5Fsplit.c [REMOVED] ./src/H5Fmpio.c [REMOVED] ./src/H5Ffamily.c [REMOVED] ./src/H5Fcore.c [REMOVED] ./src/H5MFpublic.h [REMOVED] ./src/H5FD.c [NEW] ./src/H5FDcore.c [NEW] ./src/H5FDcore.h [NEW] ./src/H5FDfamily.c [NEW] ./src/H5FDfamily.h [NEW] ./src/H5FDmpio.c [NEW] ./src/H5FDmpio.h [NEW] ./src/H5FDprivate.h [NEW] ./src/H5FDpublic.h [NEW] ./src/H5FDsec2.c [NEW] ./src/H5FDsec2.h [NEW] Removed/added files for virtual file layer. ./bin/trace ./src/H5.c Removed unused public datatypes and added new VFL public datatypes. Changed an error message. ./config/BlankForm ./config/dec-flags ./config/gnu-flags ./config/hpux10.20 ./config/hpux9.03 ./config/irix5.x ./config/irix6.x ./config/solaris2.x ./config/unicosmk Removed the H5F_OPT_SEEK and H5F_LOW_DFLT constants from the configuration since they're no longer applicable. The default file driver is always the sec2 driver and it always optimizes calls to lseek() or lseek64(). ./config/depend.in C preprocessor errors generated during automatic dependency building are sent to /dev/null to prevent them from appearing twice in the make output. ./src/H5AC.c ./src/H5B.c ./src/H5D.c ./src/H5F.c ./src/H5G.c ./src/H5Gent.c ./src/H5Gnode.c ./src/H5HG.c ./src/H5HL.c ./src/H5O.c ./src/H5Oattr.c ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Oshared.c ./src/H5T.c ./src/H5detect.c ./test/ohdr.c Changed H5F_ADDR_UNDEF to HADDR_UNDEF to be more consistent with the `haddr_t' datatype which is now a public type. ./src/H5D.c ./src/H5P.c ./src/H5Ppublic.h ./src/H5Tconv.c ./test/cmpd_dset.c ./test/dsets.c ./test/overhead.c ./test/tselect.c ./test/tvltypes.c The H5P_DATASET_XFER constant was changed to H5P_DATA_XFER because the properties apply to all types of I/O operations, not just datasets. ./src/H5B.c ./src/H5Bprivate.h ./src/H5D.c ./src/H5Dpublic.h ./src/H5F.c ./src/H5Farray.c ./src/H5Fistore.c ./src/H5Fprivate.h ./src/H5Fpublic.h ./src/H5Gnode.c ./src/H5Gpkg.h ./src/H5HG.c ./src/H5HL.c ./src/H5O.c ./src/H5R.c ./src/H5Sall.c ./src/H5Shyper.c ./src/H5Smpio.c ./src/H5Spoint.c ./src/H5Sprivate.h ./test/big.c ./test/h5test.c ./test/istore.c ./testpar/t_dset.c ./testpar/t_file.c ./tools/h5debug.c ./tools/h5ls.c Modified to work with the virtual file layer by calling H5FD_* functions instead of H5F_low_* functions and by passing file access and data transfer properties by object ID instead of pointer. Changed H5D_transfer_t to H5FD_mpio_xfer_t since the COLLECTIVE vs. INDEPENDENT transfer mode is specific to the MPIO file driver. Moved MPIO-specific stuff into the MPIO driver. ./src/H5B.c ./src/H5D.c ./src/H5Fprivate.h The H5F_mpio_* private functions were renamed and placed in the H5FDmpio driver except those which appeared in H5Smpio.c. ./src/H5E.c ./src/H5Epublic.h Added major error number H5E_VFL for virtual file layer related errors. ./src/H5F.c ./src/H5Fprivate.h Changed the logic that controls whether the boot block is written. Instead of assuming that the first call to write the boot block is only to allocate space, I've added a function argument which makes this explicit. Changed the way files are compared so that a driver-defined comparison function can be called. Files which belong to different drivers are always considered different. Removed H5F_driver_t since file drivers are now identified by object ID instead of a special non-user-extendible datatype. Removed all the hard-coded low-level file properties which have been replaced by the various file drivers. ./src/H5I.c ./src/H5Iprivate.h Added the H5I_inc_ref() which was removed a few months ago since we finally have a use for it. ./src/H5Ipublic.h Added the H5I_VFL object ID type to identify file drivers in the virtual file layer. ./src/H5MF.c ./src/H5MFprivate.h Moved all the allocation/deallocation code into the virtual file layer which allows file drivers to override much of it. ./src/H5P.c ./src/H5Ppublic.h Moved file driver-specific code into the various file driver files. The H5Pcopy() and H5Pclose() functions make calls into the virtual file driver to manage the memory for driver-specific file access and data transfer properties. ./src/H5private.h ./src/H5public.h The `haddr_t' type is now public. ./test/tfile.c Added a few more comments.
1999-08-11 04:21:32 +08:00
xfer_pid=H5Pcreate(H5P_DATA_XFER);
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
CHECK(xfer_pid, FAIL, "H5Pcreate");
ret=H5Pset_vlen_mem_manager(xfer_pid,test_vltypes_alloc_custom,&mem_used,test_vltypes_free_custom,&mem_used);
CHECK(ret, FAIL, "H5Pset_vlen_mem_manager");
[svn-r1577] Added test for H5Dvlen_get_buf_size function.
1999-08-20 02:50:30 +08:00
/* Make certain the correct amount of memory will be used */
ret=H5Dvlen_get_buf_size(dataset,tid1,sid1,&size);
CHECK(ret, FAIL, "H5Dvlen_get_buf_size");
/* 10 elements allocated = 1 + 2 + 3 + 4 elements for each array position */
VERIFY(size,10*sizeof(unsigned int),"H5Dvlen_get_buf_size");
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
/* Read dataset from disk */
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
ret=H5Dread(dataset,tid1,H5S_ALL,H5S_ALL,xfer_pid,rdata);
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
CHECK(ret, FAIL, "H5Dread");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Make certain the correct amount of memory has been used */
/* 10 elements allocated = 1 + 2 + 3 + 4 elements for each array position */
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
VERIFY(mem_used,10*sizeof(unsigned int),"H5Dread");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
/* Compare data read in */
for(i=0; i<SPACE1_DIM1; i++) {
if(wdata[i].len!=rdata[i].len) {
num_errs++;
printf("VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n",(int)i,(int)wdata[i].len,(int)i,(int)rdata[i].len);
continue;
} /* end if */
for(j=0; j<rdata[i].len; j++) {
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
if( ((unsigned int *)wdata[i].p)[j] != ((unsigned int *)rdata[i].p)[j] ) {
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
num_errs++;
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
printf("VL data values don't match!, wdata[%d].p[%d]=%d, rdata[%d].p[%d]=%d\n",(int)i,(int)j, (int)((unsigned int *)wdata[i].p)[j], (int)i,(int)j, (int)((unsigned int *)rdata[i].p)[j]);
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
continue;
} /* end if */
} /* end for */
} /* end for */
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
/* Reclaim the read VL data */
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
ret=H5Dvlen_reclaim(tid1,sid1,xfer_pid,rdata);
CHECK(ret, FAIL, "H5Dvlen_reclaim");
/* Make certain the VL memory has been freed */
VERIFY(mem_used,0,"H5Dvlen_reclaim");
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
/* Reclaim the write VL data */
ret=H5Dvlen_reclaim(tid1,sid1,H5P_DEFAULT,wdata);
CHECK(ret, FAIL, "H5Dvlen_reclaim");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Close Dataset */
ret = H5Dclose(dataset);
CHECK(ret, FAIL, "H5Dclose");
/* Close datatype */
ret = H5Tclose(tid1);
CHECK(ret, FAIL, "H5Tclose");
/* Close disk dataspace */
ret = H5Sclose(sid1);
CHECK(ret, FAIL, "H5Sclose");
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
/* Close dataset transfer property list */
ret = H5Pclose(xfer_pid);
CHECK(ret, FAIL, "H5Pclose");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Close file */
ret = H5Fclose(fid1);
CHECK(ret, FAIL, "H5Fclose");
} /* end test_vltypes_vlen_atomic() */
/****************************************************************
**
** test_vltypes_vlen_compound(): Test basic VL datatype code.
** Tests VL datatypes of compound datatypes
**
****************************************************************/
static void
test_vltypes_vlen_compound(void)
{
typedef struct { /* Struct that the VL sequences are composed of */
int i;
float f;
} s1;
hvl_t wdata[SPACE1_DIM1]; /* Information to write */
hvl_t rdata[SPACE1_DIM1]; /* Information read in */
hid_t fid1; /* HDF5 File IDs */
hid_t dataset; /* Dataset ID */
hid_t sid1; /* Dataspace ID */
hid_t tid1, tid2; /* Datatype IDs */
hid_t xfer_pid; /* Dataset transfer property list ID */
hsize_t dims1[] = {SPACE1_DIM1};
[svn-r1577] Added test for H5Dvlen_get_buf_size function.
1999-08-20 02:50:30 +08:00
hsize_t size; /* Number of bytes which will be used */
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
uintn i,j; /* counting variables */
int mem_used=0; /* Memory used during allocation */
herr_t ret; /* Generic return value */
/* Output message about test being performed */
MESSAGE(5, ("Testing Basic Compound VL Datatype Functionality\n"));
/* Allocate and initialize VL data to write */
for(i=0; i<SPACE1_DIM1; i++) {
wdata[i].p=malloc((i+1)*sizeof(s1));
wdata[i].len=i+1;
for(j=0; j<(i+1); j++) {
((s1 *)wdata[i].p)[j].i=i*10+j;
((s1 *)wdata[i].p)[j].f=(i*20+j)/3.0;
} /* end for */
} /* end for */
/* Create file */
fid1 = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(fid1, FAIL, "H5Fcreate");
/* Create dataspace for datasets */
sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
CHECK(sid1, FAIL, "H5Screate_simple");
/* Create the base compound type */
tid2 = H5Tcreate(H5T_COMPOUND, sizeof(s1));
CHECK(tid2, FAIL, "H5Tcreate");
/* Insert fields */
ret=H5Tinsert(tid2, "i", HOFFSET(s1, i), H5T_NATIVE_INT);
CHECK(ret, FAIL, "H5Tinsert");
ret=H5Tinsert(tid2, "f", HOFFSET(s1, f), H5T_NATIVE_FLOAT);
CHECK(ret, FAIL, "H5Tinsert");
/* Create a datatype to refer to */
tid1 = H5Tvlen_create (tid2);
CHECK(tid1, FAIL, "H5Tvlen_create");
/* Create a dataset */
dataset=H5Dcreate(fid1,"Dataset1",tid1,sid1,H5P_DEFAULT);
CHECK(dataset, FAIL, "H5Dcreate");
/* Write dataset to disk */
ret=H5Dwrite(dataset,tid1,H5S_ALL,H5S_ALL,H5P_DEFAULT,wdata);
CHECK(ret, FAIL, "H5Dwrite");
/* Change to the custom memory allocation routines for reading VL data */
[svn-r1568] Changes since 19990730 ---------------------- This extensive change is the virtual file layer implementation. I've ported and tested the sec2, family, and core drivers and only ported the mpio driver (Albert will test it). So if you need MPIO I would recommend sticking with the previous version for a while. You will get a few compile warnings about split and stdio drivers not being implemented and possibly tracing information not inserted in some of the drivers. You can safely ignore them but I plan to fix them. I'm still working on the split driver because I just realized that it needs a part of the VFL that isn't written yet. Documentation is being updated also because there were some minor changes (mostly just name changes). It should be available on my web site later this week. ./MANIFEST ./src/Makefile.in ./src/hdf5.h ./src/H5Flow.c [REMOVED] ./src/H5Fstdio.c [REMOVED] ./src/H5Fsec2.c [REMOVED] ./src/H5Fsplit.c [REMOVED] ./src/H5Fmpio.c [REMOVED] ./src/H5Ffamily.c [REMOVED] ./src/H5Fcore.c [REMOVED] ./src/H5MFpublic.h [REMOVED] ./src/H5FD.c [NEW] ./src/H5FDcore.c [NEW] ./src/H5FDcore.h [NEW] ./src/H5FDfamily.c [NEW] ./src/H5FDfamily.h [NEW] ./src/H5FDmpio.c [NEW] ./src/H5FDmpio.h [NEW] ./src/H5FDprivate.h [NEW] ./src/H5FDpublic.h [NEW] ./src/H5FDsec2.c [NEW] ./src/H5FDsec2.h [NEW] Removed/added files for virtual file layer. ./bin/trace ./src/H5.c Removed unused public datatypes and added new VFL public datatypes. Changed an error message. ./config/BlankForm ./config/dec-flags ./config/gnu-flags ./config/hpux10.20 ./config/hpux9.03 ./config/irix5.x ./config/irix6.x ./config/solaris2.x ./config/unicosmk Removed the H5F_OPT_SEEK and H5F_LOW_DFLT constants from the configuration since they're no longer applicable. The default file driver is always the sec2 driver and it always optimizes calls to lseek() or lseek64(). ./config/depend.in C preprocessor errors generated during automatic dependency building are sent to /dev/null to prevent them from appearing twice in the make output. ./src/H5AC.c ./src/H5B.c ./src/H5D.c ./src/H5F.c ./src/H5G.c ./src/H5Gent.c ./src/H5Gnode.c ./src/H5HG.c ./src/H5HL.c ./src/H5O.c ./src/H5Oattr.c ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Oshared.c ./src/H5T.c ./src/H5detect.c ./test/ohdr.c Changed H5F_ADDR_UNDEF to HADDR_UNDEF to be more consistent with the `haddr_t' datatype which is now a public type. ./src/H5D.c ./src/H5P.c ./src/H5Ppublic.h ./src/H5Tconv.c ./test/cmpd_dset.c ./test/dsets.c ./test/overhead.c ./test/tselect.c ./test/tvltypes.c The H5P_DATASET_XFER constant was changed to H5P_DATA_XFER because the properties apply to all types of I/O operations, not just datasets. ./src/H5B.c ./src/H5Bprivate.h ./src/H5D.c ./src/H5Dpublic.h ./src/H5F.c ./src/H5Farray.c ./src/H5Fistore.c ./src/H5Fprivate.h ./src/H5Fpublic.h ./src/H5Gnode.c ./src/H5Gpkg.h ./src/H5HG.c ./src/H5HL.c ./src/H5O.c ./src/H5R.c ./src/H5Sall.c ./src/H5Shyper.c ./src/H5Smpio.c ./src/H5Spoint.c ./src/H5Sprivate.h ./test/big.c ./test/h5test.c ./test/istore.c ./testpar/t_dset.c ./testpar/t_file.c ./tools/h5debug.c ./tools/h5ls.c Modified to work with the virtual file layer by calling H5FD_* functions instead of H5F_low_* functions and by passing file access and data transfer properties by object ID instead of pointer. Changed H5D_transfer_t to H5FD_mpio_xfer_t since the COLLECTIVE vs. INDEPENDENT transfer mode is specific to the MPIO file driver. Moved MPIO-specific stuff into the MPIO driver. ./src/H5B.c ./src/H5D.c ./src/H5Fprivate.h The H5F_mpio_* private functions were renamed and placed in the H5FDmpio driver except those which appeared in H5Smpio.c. ./src/H5E.c ./src/H5Epublic.h Added major error number H5E_VFL for virtual file layer related errors. ./src/H5F.c ./src/H5Fprivate.h Changed the logic that controls whether the boot block is written. Instead of assuming that the first call to write the boot block is only to allocate space, I've added a function argument which makes this explicit. Changed the way files are compared so that a driver-defined comparison function can be called. Files which belong to different drivers are always considered different. Removed H5F_driver_t since file drivers are now identified by object ID instead of a special non-user-extendible datatype. Removed all the hard-coded low-level file properties which have been replaced by the various file drivers. ./src/H5I.c ./src/H5Iprivate.h Added the H5I_inc_ref() which was removed a few months ago since we finally have a use for it. ./src/H5Ipublic.h Added the H5I_VFL object ID type to identify file drivers in the virtual file layer. ./src/H5MF.c ./src/H5MFprivate.h Moved all the allocation/deallocation code into the virtual file layer which allows file drivers to override much of it. ./src/H5P.c ./src/H5Ppublic.h Moved file driver-specific code into the various file driver files. The H5Pcopy() and H5Pclose() functions make calls into the virtual file driver to manage the memory for driver-specific file access and data transfer properties. ./src/H5private.h ./src/H5public.h The `haddr_t' type is now public. ./test/tfile.c Added a few more comments.
1999-08-11 04:21:32 +08:00
xfer_pid=H5Pcreate(H5P_DATA_XFER);
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
CHECK(xfer_pid, FAIL, "H5Pcreate");
ret=H5Pset_vlen_mem_manager(xfer_pid,test_vltypes_alloc_custom,&mem_used,test_vltypes_free_custom,&mem_used);
CHECK(ret, FAIL, "H5Pset_vlen_mem_manager");
[svn-r1577] Added test for H5Dvlen_get_buf_size function.
1999-08-20 02:50:30 +08:00
/* Make certain the correct amount of memory will be used */
ret=H5Dvlen_get_buf_size(dataset,tid1,sid1,&size);
CHECK(ret, FAIL, "H5Dvlen_get_buf_size");
/* 10 elements allocated = 1 + 2 + 3 + 4 elements for each array position */
VERIFY(size,10*sizeof(s1),"H5Dvlen_get_buf_size");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Read dataset from disk */
ret=H5Dread(dataset,tid1,H5S_ALL,H5S_ALL,xfer_pid,rdata);
CHECK(ret, FAIL, "H5Dread");
/* Make certain the correct amount of memory has been used */
/* 10 elements allocated = 1 + 2 + 3 + 4 elements for each array position */
VERIFY(mem_used,10*sizeof(s1),"H5Dread");
/* Compare data read in */
for(i=0; i<SPACE1_DIM1; i++) {
if(wdata[i].len!=rdata[i].len) {
num_errs++;
printf("VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n",(int)i,(int)wdata[i].len,(int)i,(int)rdata[i].len);
continue;
} /* end if */
for(j=0; j<rdata[i].len; j++) {
if( ((s1 *)wdata[i].p)[j].i != ((s1 *)rdata[i].p)[j].i ) {
num_errs++;
printf("VL data values don't match!, wdata[%d].p[%d].i=%d, rdata[%d].p[%d].i=%d\n",(int)i,(int)j, (int)((s1 *)wdata[i].p)[j].i, (int)i,(int)j, (int)((s1 *)rdata[i].p)[j].i);
continue;
} /* end if */
if( ((s1 *)wdata[i].p)[j].f != ((s1 *)rdata[i].p)[j].f ) {
num_errs++;
printf("VL data values don't match!, wdata[%d].p[%d].f=%f, rdata[%d].p[%d].f=%f\n",(int)i,(int)j, (double)((s1 *)wdata[i].p)[j].f, (int)i,(int)j, (double)((s1 *)rdata[i].p)[j].f);
continue;
} /* end if */
} /* end for */
} /* end for */
/* Reclaim the VL data */
ret=H5Dvlen_reclaim(tid1,sid1,xfer_pid,rdata);
CHECK(ret, FAIL, "H5Dvlen_reclaim");
/* Make certain the VL memory has been freed */
VERIFY(mem_used,0,"H5Dvlen_reclaim");
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
/* Reclaim the write VL data */
ret=H5Dvlen_reclaim(tid1,sid1,H5P_DEFAULT,wdata);
CHECK(ret, FAIL, "H5Dvlen_reclaim");
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
/* Close Dataset */
ret = H5Dclose(dataset);
CHECK(ret, FAIL, "H5Dclose");
/* Close datatype */
ret = H5Tclose(tid1);
CHECK(ret, FAIL, "H5Tclose");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Close datatype */
ret = H5Tclose(tid2);
CHECK(ret, FAIL, "H5Tclose");
/* Close disk dataspace */
ret = H5Sclose(sid1);
CHECK(ret, FAIL, "H5Sclose");
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
/* Close dataset transfer property list */
ret = H5Pclose(xfer_pid);
CHECK(ret, FAIL, "H5Pclose");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Close file */
ret = H5Fclose(fid1);
CHECK(ret, FAIL, "H5Fclose");
} /* end test_vltypes_vlen_compound() */
/****************************************************************
**
** test_vltypes_compound_vlen_atomic(): Test basic VL datatype code.
** Tests compound datatypes with VL datatypes of atomic datatypes.
**
****************************************************************/
static void
test_vltypes_compound_vlen_atomic(void)
{
typedef struct { /* Struct that the VL sequences are composed of */
int i;
float f;
hvl_t v;
} s1;
s1 wdata[SPACE1_DIM1]; /* Information to write */
s1 rdata[SPACE1_DIM1]; /* Information read in */
hid_t fid1; /* HDF5 File IDs */
hid_t dataset; /* Dataset ID */
hid_t sid1; /* Dataspace ID */
hid_t tid1, tid2; /* Datatype IDs */
hid_t xfer_pid; /* Dataset transfer property list ID */
hsize_t dims1[] = {SPACE1_DIM1};
[svn-r1577] Added test for H5Dvlen_get_buf_size function.
1999-08-20 02:50:30 +08:00
hsize_t size; /* Number of bytes which will be used */
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
uintn i,j; /* counting variables */
int mem_used=0; /* Memory used during allocation */
herr_t ret; /* Generic return value */
/* Output message about test being performed */
MESSAGE(5, ("Testing Compound Datatypes with VL Atomic Datatype Component Functionality\n"));
/* Allocate and initialize VL data to write */
for(i=0; i<SPACE1_DIM1; i++) {
wdata[i].i=i*10;
wdata[i].f=(i*20)/3.0;
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
wdata[i].v.p=malloc((i+1)*sizeof(unsigned int));
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
wdata[i].v.len=i+1;
for(j=0; j<(i+1); j++)
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
((unsigned int *)wdata[i].v.p)[j]=i*10+j;
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
} /* end for */
/* Create file */
fid1 = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(fid1, FAIL, "H5Fcreate");
/* Create dataspace for datasets */
sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
CHECK(sid1, FAIL, "H5Screate_simple");
/* Create a VL datatype to refer to */
tid1 = H5Tvlen_create (H5T_NATIVE_UINT);
CHECK(tid1, FAIL, "H5Tvlen_create");
/* Create the base compound type */
tid2 = H5Tcreate(H5T_COMPOUND, sizeof(s1));
CHECK(tid2, FAIL, "H5Tcreate");
/* Insert fields */
ret=H5Tinsert(tid2, "i", HOFFSET(s1, i), H5T_NATIVE_INT);
CHECK(ret, FAIL, "H5Tinsert");
ret=H5Tinsert(tid2, "f", HOFFSET(s1, f), H5T_NATIVE_FLOAT);
CHECK(ret, FAIL, "H5Tinsert");
ret=H5Tinsert(tid2, "v", HOFFSET(s1, v), tid1);
CHECK(ret, FAIL, "H5Tinsert");
/* Create a dataset */
dataset=H5Dcreate(fid1,"Dataset1",tid2,sid1,H5P_DEFAULT);
CHECK(dataset, FAIL, "H5Dcreate");
/* Write dataset to disk */
ret=H5Dwrite(dataset,tid2,H5S_ALL,H5S_ALL,H5P_DEFAULT,wdata);
CHECK(ret, FAIL, "H5Dwrite");
/* Change to the custom memory allocation routines for reading VL data */
[svn-r1568] Changes since 19990730 ---------------------- This extensive change is the virtual file layer implementation. I've ported and tested the sec2, family, and core drivers and only ported the mpio driver (Albert will test it). So if you need MPIO I would recommend sticking with the previous version for a while. You will get a few compile warnings about split and stdio drivers not being implemented and possibly tracing information not inserted in some of the drivers. You can safely ignore them but I plan to fix them. I'm still working on the split driver because I just realized that it needs a part of the VFL that isn't written yet. Documentation is being updated also because there were some minor changes (mostly just name changes). It should be available on my web site later this week. ./MANIFEST ./src/Makefile.in ./src/hdf5.h ./src/H5Flow.c [REMOVED] ./src/H5Fstdio.c [REMOVED] ./src/H5Fsec2.c [REMOVED] ./src/H5Fsplit.c [REMOVED] ./src/H5Fmpio.c [REMOVED] ./src/H5Ffamily.c [REMOVED] ./src/H5Fcore.c [REMOVED] ./src/H5MFpublic.h [REMOVED] ./src/H5FD.c [NEW] ./src/H5FDcore.c [NEW] ./src/H5FDcore.h [NEW] ./src/H5FDfamily.c [NEW] ./src/H5FDfamily.h [NEW] ./src/H5FDmpio.c [NEW] ./src/H5FDmpio.h [NEW] ./src/H5FDprivate.h [NEW] ./src/H5FDpublic.h [NEW] ./src/H5FDsec2.c [NEW] ./src/H5FDsec2.h [NEW] Removed/added files for virtual file layer. ./bin/trace ./src/H5.c Removed unused public datatypes and added new VFL public datatypes. Changed an error message. ./config/BlankForm ./config/dec-flags ./config/gnu-flags ./config/hpux10.20 ./config/hpux9.03 ./config/irix5.x ./config/irix6.x ./config/solaris2.x ./config/unicosmk Removed the H5F_OPT_SEEK and H5F_LOW_DFLT constants from the configuration since they're no longer applicable. The default file driver is always the sec2 driver and it always optimizes calls to lseek() or lseek64(). ./config/depend.in C preprocessor errors generated during automatic dependency building are sent to /dev/null to prevent them from appearing twice in the make output. ./src/H5AC.c ./src/H5B.c ./src/H5D.c ./src/H5F.c ./src/H5G.c ./src/H5Gent.c ./src/H5Gnode.c ./src/H5HG.c ./src/H5HL.c ./src/H5O.c ./src/H5Oattr.c ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Oshared.c ./src/H5T.c ./src/H5detect.c ./test/ohdr.c Changed H5F_ADDR_UNDEF to HADDR_UNDEF to be more consistent with the `haddr_t' datatype which is now a public type. ./src/H5D.c ./src/H5P.c ./src/H5Ppublic.h ./src/H5Tconv.c ./test/cmpd_dset.c ./test/dsets.c ./test/overhead.c ./test/tselect.c ./test/tvltypes.c The H5P_DATASET_XFER constant was changed to H5P_DATA_XFER because the properties apply to all types of I/O operations, not just datasets. ./src/H5B.c ./src/H5Bprivate.h ./src/H5D.c ./src/H5Dpublic.h ./src/H5F.c ./src/H5Farray.c ./src/H5Fistore.c ./src/H5Fprivate.h ./src/H5Fpublic.h ./src/H5Gnode.c ./src/H5Gpkg.h ./src/H5HG.c ./src/H5HL.c ./src/H5O.c ./src/H5R.c ./src/H5Sall.c ./src/H5Shyper.c ./src/H5Smpio.c ./src/H5Spoint.c ./src/H5Sprivate.h ./test/big.c ./test/h5test.c ./test/istore.c ./testpar/t_dset.c ./testpar/t_file.c ./tools/h5debug.c ./tools/h5ls.c Modified to work with the virtual file layer by calling H5FD_* functions instead of H5F_low_* functions and by passing file access and data transfer properties by object ID instead of pointer. Changed H5D_transfer_t to H5FD_mpio_xfer_t since the COLLECTIVE vs. INDEPENDENT transfer mode is specific to the MPIO file driver. Moved MPIO-specific stuff into the MPIO driver. ./src/H5B.c ./src/H5D.c ./src/H5Fprivate.h The H5F_mpio_* private functions were renamed and placed in the H5FDmpio driver except those which appeared in H5Smpio.c. ./src/H5E.c ./src/H5Epublic.h Added major error number H5E_VFL for virtual file layer related errors. ./src/H5F.c ./src/H5Fprivate.h Changed the logic that controls whether the boot block is written. Instead of assuming that the first call to write the boot block is only to allocate space, I've added a function argument which makes this explicit. Changed the way files are compared so that a driver-defined comparison function can be called. Files which belong to different drivers are always considered different. Removed H5F_driver_t since file drivers are now identified by object ID instead of a special non-user-extendible datatype. Removed all the hard-coded low-level file properties which have been replaced by the various file drivers. ./src/H5I.c ./src/H5Iprivate.h Added the H5I_inc_ref() which was removed a few months ago since we finally have a use for it. ./src/H5Ipublic.h Added the H5I_VFL object ID type to identify file drivers in the virtual file layer. ./src/H5MF.c ./src/H5MFprivate.h Moved all the allocation/deallocation code into the virtual file layer which allows file drivers to override much of it. ./src/H5P.c ./src/H5Ppublic.h Moved file driver-specific code into the various file driver files. The H5Pcopy() and H5Pclose() functions make calls into the virtual file driver to manage the memory for driver-specific file access and data transfer properties. ./src/H5private.h ./src/H5public.h The `haddr_t' type is now public. ./test/tfile.c Added a few more comments.
1999-08-11 04:21:32 +08:00
xfer_pid=H5Pcreate(H5P_DATA_XFER);
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
CHECK(xfer_pid, FAIL, "H5Pcreate");
ret=H5Pset_vlen_mem_manager(xfer_pid,test_vltypes_alloc_custom,&mem_used,test_vltypes_free_custom,&mem_used);
CHECK(ret, FAIL, "H5Pset_vlen_mem_manager");
[svn-r1577] Added test for H5Dvlen_get_buf_size function.
1999-08-20 02:50:30 +08:00
/* Make certain the correct amount of memory will be used */
ret=H5Dvlen_get_buf_size(dataset,tid2,sid1,&size);
CHECK(ret, FAIL, "H5Dvlen_get_buf_size");
/* 10 elements allocated = 1 + 2 + 3 + 4 elements for each array position */
VERIFY(size,10*sizeof(unsigned int),"H5Dvlen_get_buf_size");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Read dataset from disk */
ret=H5Dread(dataset,tid2,H5S_ALL,H5S_ALL,xfer_pid,rdata);
CHECK(ret, FAIL, "H5Dread");
/* Make certain the correct amount of memory has been used */
/* 10 elements allocated = 1 + 2 + 3 + 4 elements for each array position */
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
VERIFY(mem_used,10*sizeof(unsigned int),"H5Dread");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Compare data read in */
for(i=0; i<SPACE1_DIM1; i++) {
if(wdata[i].i!=rdata[i].i) {
num_errs++;
printf("Integer components don't match!, wdata[%d].i=%d, rdata[%d].i=%d\n",(int)i,(int)wdata[i].i,(int)i,(int)rdata[i].i);
continue;
} /* end if */
if(wdata[i].f!=rdata[i].f) {
num_errs++;
printf("Float components don't match!, wdata[%d].f=%f, rdata[%d].f=%f\n",(int)i,(double)wdata[i].f,(int)i,(double)rdata[i].f);
continue;
} /* end if */
if(wdata[i].v.len!=rdata[i].v.len) {
num_errs++;
printf("VL data length don't match!, wdata[%d].v.len=%d, rdata[%d].v.len=%d\n",(int)i,(int)wdata[i].v.len,(int)i,(int)rdata[i].v.len);
continue;
} /* end if */
for(j=0; j<rdata[i].v.len; j++) {
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
if( ((unsigned int *)wdata[i].v.p)[j] != ((unsigned int *)rdata[i].v.p)[j] ) {
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
num_errs++;
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
printf("VL data values don't match!, wdata[%d].v.p[%d]=%d, rdata[%d].v.p[%d]=%d\n",(int)i,(int)j, (int)((unsigned int *)wdata[i].v.p)[j], (int)i,(int)j, (int)((unsigned int *)rdata[i].v.p)[j]);
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
continue;
} /* end if */
} /* end for */
} /* end for */
/* Reclaim the VL data */
ret=H5Dvlen_reclaim(tid2,sid1,xfer_pid,rdata);
CHECK(ret, FAIL, "H5Dvlen_reclaim");
/* Make certain the VL memory has been freed */
VERIFY(mem_used,0,"H5Dvlen_reclaim");
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
/* Reclaim the write VL data */
[svn-r1507] Uncommented VL datatypes in compound datatypes test, since it's working now. Some other memory leaks in the tests fixed.
1999-07-18 08:00:22 +08:00
ret=H5Dvlen_reclaim(tid2,sid1,H5P_DEFAULT,wdata);
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
CHECK(ret, FAIL, "H5Dvlen_reclaim");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Close Dataset */
ret = H5Dclose(dataset);
CHECK(ret, FAIL, "H5Dclose");
/* Close datatype */
ret = H5Tclose(tid2);
CHECK(ret, FAIL, "H5Tclose");
/* Close datatype */
ret = H5Tclose(tid1);
CHECK(ret, FAIL, "H5Tclose");
/* Close disk dataspace */
ret = H5Sclose(sid1);
CHECK(ret, FAIL, "H5Sclose");
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
/* Close dataset transfer property list */
ret = H5Pclose(xfer_pid);
CHECK(ret, FAIL, "H5Pclose");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Close file */
ret = H5Fclose(fid1);
CHECK(ret, FAIL, "H5Fclose");
} /* end test_vltypes_compound_vlen_atomic() */
/****************************************************************
**
** test_vltypes_vlen_vlen_atomic(): Test basic VL datatype code.
** Tests VL datatype with VL datatypes of atomic datatypes.
**
****************************************************************/
static void
test_vltypes_vlen_vlen_atomic(void)
{
hvl_t wdata[SPACE1_DIM1]; /* Information to write */
hvl_t rdata[SPACE1_DIM1]; /* Information read in */
hvl_t *t1, *t2; /* Temporary pointer to VL information */
hid_t fid1; /* HDF5 File IDs */
hid_t dataset; /* Dataset ID */
hid_t sid1; /* Dataspace ID */
hid_t tid1, tid2; /* Datatype IDs */
hid_t xfer_pid; /* Dataset transfer property list ID */
hsize_t dims1[] = {SPACE1_DIM1};
[svn-r1577] Added test for H5Dvlen_get_buf_size function.
1999-08-20 02:50:30 +08:00
hsize_t size; /* Number of bytes which will be used */
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
uintn i,j,k; /* counting variables */
int mem_used=0; /* Memory used during allocation */
herr_t ret; /* Generic return value */
/* Output message about test being performed */
MESSAGE(5, ("Testing VL Datatypes with VL Atomic Datatype Component Functionality\n"));
/* Allocate and initialize VL data to write */
for(i=0; i<SPACE1_DIM1; i++) {
wdata[i].p=malloc((i+1)*sizeof(hvl_t));
wdata[i].len=i+1;
for(t1=wdata[i].p,j=0; j<(i+1); j++, t1++) {
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
t1->p=malloc((j+1)*sizeof(unsigned int));
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
t1->len=j+1;
for(k=0; k<(j+1); k++)
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
((unsigned int *)t1->p)[k]=i*100+j*10+k;
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
} /* end for */
} /* end for */
/* Create file */
fid1 = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(fid1, FAIL, "H5Fcreate");
/* Create dataspace for datasets */
sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
CHECK(sid1, FAIL, "H5Screate_simple");
/* Create a VL datatype to refer to */
tid1 = H5Tvlen_create (H5T_NATIVE_UINT);
CHECK(tid1, FAIL, "H5Tvlen_create");
/* Create the base VL type */
tid2 = H5Tvlen_create (tid1);
CHECK(tid2, FAIL, "H5Tvlen_create");
/* Create a dataset */
dataset=H5Dcreate(fid1,"Dataset1",tid2,sid1,H5P_DEFAULT);
CHECK(dataset, FAIL, "H5Dcreate");
/* Write dataset to disk */
ret=H5Dwrite(dataset,tid2,H5S_ALL,H5S_ALL,H5P_DEFAULT,wdata);
CHECK(ret, FAIL, "H5Dwrite");
[svn-r1730] Close & re-open the file to make certain that the VL datatype information is being written correctly.
1999-10-07 02:12:19 +08:00
/* Close Dataset */
ret = H5Dclose(dataset);
CHECK(ret, FAIL, "H5Dclose");
/* Close datatype */
ret = H5Tclose(tid2);
CHECK(ret, FAIL, "H5Tclose");
/* Close datatype */
ret = H5Tclose(tid1);
CHECK(ret, FAIL, "H5Tclose");
/* Close disk dataspace */
ret = H5Sclose(sid1);
CHECK(ret, FAIL, "H5Sclose");
/* Close file */
ret = H5Fclose(fid1);
CHECK(ret, FAIL, "H5Fclose");
/* Create file */
fid1 = H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
CHECK(fid1, FAIL, "H5Fopen");
/* Create dataspace for datasets */
sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
CHECK(sid1, FAIL, "H5Screate_simple");
/* Create a VL datatype to refer to */
tid1 = H5Tvlen_create (H5T_NATIVE_UINT);
CHECK(tid1, FAIL, "H5Tvlen_create");
/* Create the base VL type */
tid2 = H5Tvlen_create (tid1);
CHECK(tid2, FAIL, "H5Tvlen_create");
/* Open a dataset */
dataset=H5Dopen(fid1,"Dataset1");
CHECK(dataset, FAIL, "H5Dopen");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Change to the custom memory allocation routines for reading VL data */
[svn-r1568] Changes since 19990730 ---------------------- This extensive change is the virtual file layer implementation. I've ported and tested the sec2, family, and core drivers and only ported the mpio driver (Albert will test it). So if you need MPIO I would recommend sticking with the previous version for a while. You will get a few compile warnings about split and stdio drivers not being implemented and possibly tracing information not inserted in some of the drivers. You can safely ignore them but I plan to fix them. I'm still working on the split driver because I just realized that it needs a part of the VFL that isn't written yet. Documentation is being updated also because there were some minor changes (mostly just name changes). It should be available on my web site later this week. ./MANIFEST ./src/Makefile.in ./src/hdf5.h ./src/H5Flow.c [REMOVED] ./src/H5Fstdio.c [REMOVED] ./src/H5Fsec2.c [REMOVED] ./src/H5Fsplit.c [REMOVED] ./src/H5Fmpio.c [REMOVED] ./src/H5Ffamily.c [REMOVED] ./src/H5Fcore.c [REMOVED] ./src/H5MFpublic.h [REMOVED] ./src/H5FD.c [NEW] ./src/H5FDcore.c [NEW] ./src/H5FDcore.h [NEW] ./src/H5FDfamily.c [NEW] ./src/H5FDfamily.h [NEW] ./src/H5FDmpio.c [NEW] ./src/H5FDmpio.h [NEW] ./src/H5FDprivate.h [NEW] ./src/H5FDpublic.h [NEW] ./src/H5FDsec2.c [NEW] ./src/H5FDsec2.h [NEW] Removed/added files for virtual file layer. ./bin/trace ./src/H5.c Removed unused public datatypes and added new VFL public datatypes. Changed an error message. ./config/BlankForm ./config/dec-flags ./config/gnu-flags ./config/hpux10.20 ./config/hpux9.03 ./config/irix5.x ./config/irix6.x ./config/solaris2.x ./config/unicosmk Removed the H5F_OPT_SEEK and H5F_LOW_DFLT constants from the configuration since they're no longer applicable. The default file driver is always the sec2 driver and it always optimizes calls to lseek() or lseek64(). ./config/depend.in C preprocessor errors generated during automatic dependency building are sent to /dev/null to prevent them from appearing twice in the make output. ./src/H5AC.c ./src/H5B.c ./src/H5D.c ./src/H5F.c ./src/H5G.c ./src/H5Gent.c ./src/H5Gnode.c ./src/H5HG.c ./src/H5HL.c ./src/H5O.c ./src/H5Oattr.c ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Oshared.c ./src/H5T.c ./src/H5detect.c ./test/ohdr.c Changed H5F_ADDR_UNDEF to HADDR_UNDEF to be more consistent with the `haddr_t' datatype which is now a public type. ./src/H5D.c ./src/H5P.c ./src/H5Ppublic.h ./src/H5Tconv.c ./test/cmpd_dset.c ./test/dsets.c ./test/overhead.c ./test/tselect.c ./test/tvltypes.c The H5P_DATASET_XFER constant was changed to H5P_DATA_XFER because the properties apply to all types of I/O operations, not just datasets. ./src/H5B.c ./src/H5Bprivate.h ./src/H5D.c ./src/H5Dpublic.h ./src/H5F.c ./src/H5Farray.c ./src/H5Fistore.c ./src/H5Fprivate.h ./src/H5Fpublic.h ./src/H5Gnode.c ./src/H5Gpkg.h ./src/H5HG.c ./src/H5HL.c ./src/H5O.c ./src/H5R.c ./src/H5Sall.c ./src/H5Shyper.c ./src/H5Smpio.c ./src/H5Spoint.c ./src/H5Sprivate.h ./test/big.c ./test/h5test.c ./test/istore.c ./testpar/t_dset.c ./testpar/t_file.c ./tools/h5debug.c ./tools/h5ls.c Modified to work with the virtual file layer by calling H5FD_* functions instead of H5F_low_* functions and by passing file access and data transfer properties by object ID instead of pointer. Changed H5D_transfer_t to H5FD_mpio_xfer_t since the COLLECTIVE vs. INDEPENDENT transfer mode is specific to the MPIO file driver. Moved MPIO-specific stuff into the MPIO driver. ./src/H5B.c ./src/H5D.c ./src/H5Fprivate.h The H5F_mpio_* private functions were renamed and placed in the H5FDmpio driver except those which appeared in H5Smpio.c. ./src/H5E.c ./src/H5Epublic.h Added major error number H5E_VFL for virtual file layer related errors. ./src/H5F.c ./src/H5Fprivate.h Changed the logic that controls whether the boot block is written. Instead of assuming that the first call to write the boot block is only to allocate space, I've added a function argument which makes this explicit. Changed the way files are compared so that a driver-defined comparison function can be called. Files which belong to different drivers are always considered different. Removed H5F_driver_t since file drivers are now identified by object ID instead of a special non-user-extendible datatype. Removed all the hard-coded low-level file properties which have been replaced by the various file drivers. ./src/H5I.c ./src/H5Iprivate.h Added the H5I_inc_ref() which was removed a few months ago since we finally have a use for it. ./src/H5Ipublic.h Added the H5I_VFL object ID type to identify file drivers in the virtual file layer. ./src/H5MF.c ./src/H5MFprivate.h Moved all the allocation/deallocation code into the virtual file layer which allows file drivers to override much of it. ./src/H5P.c ./src/H5Ppublic.h Moved file driver-specific code into the various file driver files. The H5Pcopy() and H5Pclose() functions make calls into the virtual file driver to manage the memory for driver-specific file access and data transfer properties. ./src/H5private.h ./src/H5public.h The `haddr_t' type is now public. ./test/tfile.c Added a few more comments.
1999-08-11 04:21:32 +08:00
xfer_pid=H5Pcreate(H5P_DATA_XFER);
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
CHECK(xfer_pid, FAIL, "H5Pcreate");
ret=H5Pset_vlen_mem_manager(xfer_pid,test_vltypes_alloc_custom,&mem_used,test_vltypes_free_custom,&mem_used);
CHECK(ret, FAIL, "H5Pset_vlen_mem_manager");
[svn-r1730] Close & re-open the file to make certain that the VL datatype information is being written correctly.
1999-10-07 02:12:19 +08:00
/* Make certain the correct amount of memory was used */
[svn-r1577] Added test for H5Dvlen_get_buf_size function.
1999-08-20 02:50:30 +08:00
ret=H5Dvlen_get_buf_size(dataset,tid2,sid1,&size);
CHECK(ret, FAIL, "H5Dvlen_get_buf_size");
/* 10 hvl_t elements allocated = 1 + 2 + 3 + 4 elements for each array position */
/* 20 unsigned int elements allocated = 1 + 3 + 6 + 10 elements */
VERIFY(size,10*sizeof(hvl_t)+20*sizeof(unsigned int),"H5Dvlen_get_buf_size");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Read dataset from disk */
ret=H5Dread(dataset,tid2,H5S_ALL,H5S_ALL,xfer_pid,rdata);
CHECK(ret, FAIL, "H5Dread");
/* Make certain the correct amount of memory has been used */
/* 10 hvl_t elements allocated = 1 + 2 + 3 + 4 elements for each array position */
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
/* 20 unsigned int elements allocated = 1 + 3 + 6 + 10 elements */
VERIFY(mem_used,10*sizeof(hvl_t)+20*sizeof(unsigned int),"H5Dread");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Compare data read in */
for(i=0; i<SPACE1_DIM1; i++) {
if(wdata[i].len!=rdata[i].len) {
num_errs++;
printf("VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n",(int)i,(int)wdata[i].len,(int)i,(int)rdata[i].len);
continue;
} /* end if */
for(t1=wdata[i].p, t2=rdata[i].p, j=0; j<rdata[i].len; j++, t1++, t2++) {
if(t1->len!=t2->len) {
num_errs++;
printf("VL data length don't match!, i=%d, j=%d, t1->len=%d, t2->len=%d\n",(int)i,(int)j,(int)t1->len,(int)t2->len);
continue;
} /* end if */
for(k=0; k<t2->len; k++) {
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
if( ((unsigned int *)t1->p)[k] != ((unsigned int *)t2->p)[k] ) {
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
num_errs++;
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
printf("VL data values don't match!, t1->p[%d]=%d, t2->p[%d]=%d\n",(int)k, (int)((unsigned int *)t1->p)[k], (int)k, (int)((unsigned int *)t2->p)[k]);
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
continue;
} /* end if */
} /* end for */
} /* end for */
} /* end for */
/* Reclaim all the (nested) VL data */
ret=H5Dvlen_reclaim(tid2,sid1,xfer_pid,rdata);
CHECK(ret, FAIL, "H5Dvlen_reclaim");
/* Make certain the VL memory has been freed */
VERIFY(mem_used,0,"H5Dvlen_reclaim");
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
/* Reclaim the write VL data */
[svn-r1507] Uncommented VL datatypes in compound datatypes test, since it's working now. Some other memory leaks in the tests fixed.
1999-07-18 08:00:22 +08:00
ret=H5Dvlen_reclaim(tid2,sid1,H5P_DEFAULT,wdata);
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
CHECK(ret, FAIL, "H5Dvlen_reclaim");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
/* Close Dataset */
ret = H5Dclose(dataset);
CHECK(ret, FAIL, "H5Dclose");
/* Close datatype */
ret = H5Tclose(tid2);
CHECK(ret, FAIL, "H5Tclose");
/* Close datatype */
ret = H5Tclose(tid1);
CHECK(ret, FAIL, "H5Tclose");
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
/* Close disk dataspace */
ret = H5Sclose(sid1);
CHECK(ret, FAIL, "H5Sclose");
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
/* Close dataset transfer property list */
ret = H5Pclose(xfer_pid);
CHECK(ret, FAIL, "H5Pclose");
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
/* Close file */
ret = H5Fclose(fid1);
CHECK(ret, FAIL, "H5Fclose");
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
} /* end test_vltypes_vlen_vlen_atomic() */
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
/****************************************************************
**
** test_vltypes(): Main VL datatype testing routine.
**
****************************************************************/
void
test_vltypes(void)
{
/* Output message about test being performed */
MESSAGE(5, ("Testing Variable-Length Datatypes\n"));
/* These next tests use the same file */
[svn-r1419] Modified dtypes.c to add new dataset transfer property list ID in H5Tconvert calls. Added tests to tvltypes.c which test arrays of VL compound datatypes, array of compound datatypes with VL fields and arrays of nested VL sequences of VL sequences of atomic types, all of which are working correctly.
1999-07-03 18:34:27 +08:00
test_vltypes_vlen_atomic(); /* Test VL atomic datatypes */
[svn-r1495] Corrections and small bugfixes to VL testing.
1999-07-17 02:12:34 +08:00
test_vltypes_vlen_compound(); /* Test VL compound datatypes */
test_vltypes_compound_vlen_atomic(); /* Test compound datatypes with VL atomic components */
test_vltypes_vlen_vlen_atomic(); /* Test VL datatype with VL atomic components */
[svn-r1334] VL datatype testing file. Currently, only atomic datatype sequences are tested, but I expect the others to work correctly also. More tests on VL compound and VL VL (atomic) types forthcoming.
1999-06-12 06:06:26 +08:00
} /* test_vltypes() */
/*-------------------------------------------------------------------------
* Function: cleanup_vltypes
*
* Purpose: Cleanup temporary test files
*
* Return: none
*
* Programmer: Quincey Koziol
* June 8, 1999
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
void
cleanup_vltypes(void)
{
remove(FILE);
}
Reference in New Issue Copy Permalink