mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-30 15:32:37 +08:00
9a433b99a5
Lots of performance improvements & a couple new internal API interfaces. Description: Performance Improvements: - Cached file offset & length sizes in shared file struct, to avoid constantly looking them up in the FCPL. - Generic property improvements: - Added "revision" number to generic property classes to speed up comparisons. - Changed method of storing properties from using a hash-table to the TBBT routines in the library. - Share the propery names between classes and the lists derived from them. - Removed redundant 'def_value' buffer from each property. - Switching code to use a "copy on write" strategy for properties in each list, where the properties in each list are shared with the properties in the class, until a property's value is changed in a list. - Fixed error in layout code which was allocating too many buffers. - Redefined public macros of the form (H5open()/H5check, <variable>) internally to only be (<variable>), avoiding innumerable useless calls to H5open() and H5check_version(). - Reuse already zeroed buffers in H5F_contig_fill instead of constantly re-zeroing them. - Don't write fill values if writing entire dataset. - Use gettimeofday() system call instead of time() system when checking the modification time of a dataset. - Added reference counted string API and use it for tracking the names of objects opening in a file (for the ID->name code). - Removed redundant H5P_get() calls in B-tree routines. - Redefine H5T datatype macros internally to the library, to avoid calling H5check redundantly. - Keep dataspace information for dataset locally instead of reading from disk each time. Added new module to track open objects in a file, to allow this (which will be useful eventually for some FPH5 metadata caching issues). - Remove H5AC_find macro which was inlining metadata cache lookups, and call function instead. - Remove redundant memset() calls from H5G_namei() routine. - Remove redundant checking of object type when locating objects in metadata cache and rely on the address only. - Create default dataset object to use when default dataset creation property list is used to create datasets, bypassing querying for all the property list values. - Use default I/O vector size when performing raw data with the default dataset transfer property list, instead of querying for I/O vector size. - Remove H5P_DEFAULT internally to the library, replacing it with more specific default property list based on the type of property list needed. - Remove redundant memset() calls in object header message (H5O*) routines. - Remove redunant memset() calls in data I/O routines. - Split free-list allocation routines into malloc() and calloc()- like routines, instead of one combined routine. - Remove lots of indirection in H5O*() routines. - Simplify metadata cache entry comparison routine (used when flushing entire cache out). - Only enable metadata cache statistics when H5AC_DEBUG is turned on, instead of always tracking them. - Simplify address comparison macro (H5F_addr_eq). - Remove redundant metadata cache entry protections during dataset creation by protecting the object header once and making all the modifications necessary for the dataset creation before unprotecting it. - Reduce # of "number of element in extent" computations performed by computing and storing the value during dataspace creation. - Simplify checking for group location's file information, when file has not been involving in file-mounting operations. - Use binary encoding for modification time, instead of ASCII. - Hoist H5HL_peek calls (to get information in a local heap) out of loops in many group routine. - Use static variable for iterators of selections, instead of dynamically allocation them each time. - Lookup & insert new entries in one step, avoiding traversing group's B-tree twice. - Fixed memory leak in H5Gget_objname_idx() routine (tangential to performance improvements, but fixed along the way). - Use free-list for reference counted strings. - Don't bother copying object names into cached group entries, since they are re-created when an object is opened. The benchmark I used to measure these results created several thousand small (2K) datasets in a file and wrote out the data for them. This is Elena's "regular.c" benchmark. These changes resulted in approximately ~4.3x speedup of the development branch when compared to the previous code in the development branch and ~1.4x speedup compared to the release branch. Additionally, these changes reduce the total memory used (code and data) by the development branch by ~800KB, bringing the development branch back into the same ballpark as the release branch. I'll send out a more detailed description of the benchmark results as a followup note. New internal API routines: Added "reference counted strings" API for tracking strings that get used by multiple owners without duplicating the strings. Added "ternary search tree" API for text->object mappings. Platforms tested: Tested h5committest {arabica (fortran), eirene (fortran, C++) modi4 (parallel, fortran)} Other platforms/configurations tested? FreeBSD 4.7 (sleipnir) serial & parallel Solaris 2.6 (baldric) serial
638 lines
20 KiB
C
638 lines
20 KiB
C
/****************************************************************************
|
||
* 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. *
|
||
* *
|
||
****************************************************************************/
|
||
|
||
/* $Id$ */
|
||
|
||
/***********************************************************
|
||
*
|
||
* Test program: tvlstr
|
||
*
|
||
* Test the Variable-Length String functionality
|
||
*
|
||
*************************************************************/
|
||
|
||
#ifdef WIN32
|
||
#include <stdio.h>
|
||
#endif
|
||
|
||
#include "testhdf5.h"
|
||
|
||
#include "hdf5.h"
|
||
|
||
#define DATAFILE "tvlstr.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
|
||
|
||
#define VLSTR_TYPE "vl_string_type"
|
||
|
||
/* String for testing attributes */
|
||
static const char *string_att = "This is the string for the attribute";
|
||
static char *string_att_write=NULL;
|
||
|
||
void *test_vlstr_alloc_custom(size_t size, void *info);
|
||
void test_vlstr_free_custom(void *mem, void *info);
|
||
|
||
/****************************************************************
|
||
**
|
||
** test_vlstr_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_vlstr_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 */
|
||
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(size_t));
|
||
|
||
if((ret_value=HDmalloc(extra+size))!=NULL) {
|
||
*(size_t *)ret_value=size;
|
||
*mem_used+=size;
|
||
} /* end if */
|
||
ret_value=((unsigned char *)ret_value)+extra;
|
||
return(ret_value);
|
||
}
|
||
|
||
/****************************************************************
|
||
**
|
||
** test_vlstr_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_vlstr_free_custom(void *_mem, void *info)
|
||
{
|
||
unsigned char *mem;
|
||
int *mem_used=(int *)info; /* Get the pointer to the memory used */
|
||
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(size_t));
|
||
|
||
if(_mem!=NULL) {
|
||
mem=((unsigned char *)_mem)-extra;
|
||
*mem_used-=*(size_t *)mem;
|
||
HDfree(mem);
|
||
} /* end if */
|
||
}
|
||
|
||
/****************************************************************
|
||
**
|
||
** test_vlstrings_basic(): Test basic VL string code.
|
||
** Tests simple VL string I/O
|
||
**
|
||
****************************************************************/
|
||
static void
|
||
test_vlstrings_basic(void)
|
||
{
|
||
const char *wdata[SPACE1_DIM1]= {
|
||
"Four score and seven years ago our forefathers brought forth on this continent a new nation,",
|
||
"conceived in liberty and dedicated to the proposition that all men are created equal.",
|
||
"Now we are engaged in a great civil war,",
|
||
"testing whether that nation or any nation so conceived and so dedicated can long endure."
|
||
}; /* Information to write */
|
||
char *rdata[SPACE1_DIM1]; /* Information read in */
|
||
char *wdata2;
|
||
hid_t dataspace, dataset2;
|
||
hid_t fid1; /* HDF5 File IDs */
|
||
hid_t dataset; /* Dataset ID */
|
||
hid_t sid1; /* Dataspace ID */
|
||
hid_t tid1; /* Datatype ID */
|
||
hid_t xfer_pid; /* Dataset transfer property list ID */
|
||
hsize_t dims1[] = {SPACE1_DIM1};
|
||
hsize_t size; /* Number of bytes which will be used */
|
||
unsigned i; /* counting variable */
|
||
int str_used; /* String data in memory */
|
||
int mem_used=0; /* Memory used during allocation */
|
||
herr_t ret; /* Generic return value */
|
||
|
||
/* Output message about test being performed */
|
||
MESSAGE(5, ("Testing Basic VL String Functionality\n"));
|
||
|
||
/* Create file */
|
||
fid1 = H5Fcreate(DATAFILE, 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 = H5Tcopy (H5T_C_S1);
|
||
CHECK(tid1, FAIL, "H5Tcopy");
|
||
|
||
ret = H5Tset_size (tid1,H5T_VARIABLE);
|
||
CHECK(ret, FAIL, "H5Tset_size");
|
||
|
||
/* 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");
|
||
|
||
dataspace = H5Screate(H5S_SCALAR);
|
||
|
||
dataset2=H5Dcreate(fid1,"Dataset2",tid1,dataspace,H5P_DEFAULT);
|
||
CHECK(dataset, FAIL, "H5Dcreate");
|
||
|
||
wdata2 = (char*)HDcalloc(65534, sizeof(char));
|
||
HDmemset(wdata2, 'A', 65533);
|
||
|
||
ret=H5Dwrite(dataset2,tid1,H5S_ALL,H5S_ALL,H5P_DEFAULT,&wdata2);
|
||
CHECK(ret, FAIL, "H5Dwrite");
|
||
|
||
H5Sclose(dataspace);
|
||
H5Dclose(dataset2);
|
||
HDfree(wdata2);
|
||
|
||
/* Change to the custom memory allocation routines for reading VL string */
|
||
xfer_pid=H5Pcreate(H5P_DATASET_XFER);
|
||
CHECK(xfer_pid, FAIL, "H5Pcreate");
|
||
|
||
ret=H5Pset_vlen_mem_manager(xfer_pid,test_vlstr_alloc_custom,&mem_used,test_vlstr_free_custom,&mem_used);
|
||
CHECK(ret, FAIL, "H5Pset_vlen_mem_manager");
|
||
|
||
/* 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");
|
||
|
||
/* Count the actual number of bytes used by the strings */
|
||
for(i=0,str_used=0; i<SPACE1_DIM1; i++)
|
||
str_used+=strlen(wdata[i])+1;
|
||
|
||
/* Compare against the strings actually written */
|
||
VERIFY(size,(hsize_t)str_used,"H5Dvlen_get_buf_size");
|
||
|
||
/* 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 */
|
||
VERIFY(mem_used,str_used,"H5Dread");
|
||
|
||
/* Compare data read in */
|
||
for(i=0; i<SPACE1_DIM1; i++) {
|
||
if(strlen(wdata[i])!=strlen(rdata[i])) {
|
||
num_errs++;
|
||
printf("VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(int)i,(int)strlen(wdata[i]),(int)i,(int)strlen(rdata[i]));
|
||
continue;
|
||
} /* end if */
|
||
if( strcmp(wdata[i],rdata[i]) != 0 ) {
|
||
num_errs++;
|
||
printf("VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",(int)i,wdata[i],(int)i,rdata[i]);
|
||
continue;
|
||
} /* end if */
|
||
} /* end for */
|
||
|
||
/* Reclaim the read 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");
|
||
|
||
/* 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");
|
||
|
||
/* Close dataset transfer property list */
|
||
ret = H5Pclose(xfer_pid);
|
||
CHECK(ret, FAIL, "H5Pclose");
|
||
|
||
/* Close file */
|
||
ret = H5Fclose(fid1);
|
||
CHECK(ret, FAIL, "H5Fclose");
|
||
|
||
} /* end test_vlstrings_basic() */
|
||
|
||
/****************************************************************
|
||
**
|
||
** test_vlstrings_special(): Test VL string code for special
|
||
** string cases, nil and zero-sized.
|
||
**
|
||
****************************************************************/
|
||
static void
|
||
test_vlstrings_special(void)
|
||
{
|
||
const char *wdata[SPACE1_DIM1] = {"one", "two", "", "four"};
|
||
const char *wdata2[SPACE1_DIM1] = {NULL, NULL, NULL, NULL};
|
||
char *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 */
|
||
hsize_t dims1[] = {SPACE1_DIM1};
|
||
unsigned i; /* counting variable */
|
||
herr_t ret; /* Generic return value */
|
||
|
||
/* Output message about test being performed */
|
||
MESSAGE(5, ("Testing Special VL Strings\n"));
|
||
|
||
/* Create file */
|
||
fid1 = H5Fcreate(DATAFILE, 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 = H5Tcopy (H5T_C_S1);
|
||
CHECK(tid1, FAIL, "H5Tcopy");
|
||
|
||
ret = H5Tset_size (tid1,H5T_VARIABLE);
|
||
CHECK(ret, FAIL, "H5Tset_size");
|
||
|
||
/* Create a dataset */
|
||
dataset=H5Dcreate(fid1,"Dataset3",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");
|
||
|
||
/* Read dataset from disk */
|
||
ret=H5Dread(dataset,tid1,H5S_ALL,H5S_ALL,H5P_DEFAULT,rdata);
|
||
CHECK(ret, FAIL, "H5Dread");
|
||
|
||
/* Compare data read in */
|
||
for(i=0; i<SPACE1_DIM1; i++) {
|
||
if(strlen(wdata[i])!=strlen(rdata[i])) {
|
||
num_errs++;
|
||
printf("VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(int)i,(int)strlen(wdata[i]),(int)i,(int)strlen(rdata[i]));
|
||
continue;
|
||
} /* end if */
|
||
if( strcmp(wdata[i],rdata[i]) != 0 ) {
|
||
num_errs++;
|
||
printf("VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",(int)i,wdata[i],(int)i,rdata[i]);
|
||
continue;
|
||
} /* end if */
|
||
} /* end for */
|
||
|
||
/* Reclaim the read VL data */
|
||
ret=H5Dvlen_reclaim(tid1,sid1,H5P_DEFAULT,rdata);
|
||
CHECK(ret, FAIL, "H5Dvlen_reclaim");
|
||
|
||
/* Close Dataset */
|
||
ret = H5Dclose(dataset);
|
||
CHECK(ret, FAIL, "H5Dclose");
|
||
|
||
/* Create another dataset to test nil strings */
|
||
dataset=H5Dcreate(fid1,"Dataset4",tid1,sid1,H5P_DEFAULT);
|
||
CHECK(dataset, FAIL, "H5Dcreate");
|
||
|
||
/* Try to write nil strings to disk. Should fail. */
|
||
H5E_BEGIN_TRY {
|
||
H5Dwrite(dataset,tid1,H5S_ALL,H5S_ALL,H5P_DEFAULT,wdata2);
|
||
} H5E_END_TRY;
|
||
|
||
/* 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");
|
||
|
||
/* Close file */
|
||
ret = H5Fclose(fid1);
|
||
CHECK(ret, FAIL, "H5Fclose");
|
||
}
|
||
|
||
/****************************************************************
|
||
**
|
||
** test_vlstring_type(): Test VL string type.
|
||
** Tests if VL string is treated as string.
|
||
**
|
||
****************************************************************/
|
||
static void test_vlstring_type(void)
|
||
{
|
||
hid_t fid; /* HDF5 File IDs */
|
||
hid_t tid_vlstr;
|
||
H5T_cset_t cset;
|
||
H5T_str_t pad;
|
||
herr_t ret;
|
||
|
||
/* Output message about test being performed */
|
||
MESSAGE(5, ("Testing VL String type\n"));
|
||
|
||
/* Open file */
|
||
fid = H5Fopen(DATAFILE, H5F_ACC_RDWR, H5P_DEFAULT);
|
||
CHECK(fid, FAIL, "H5Fopen");
|
||
|
||
/* Create a datatype to refer to */
|
||
tid_vlstr = H5Tcopy(H5T_C_S1);
|
||
CHECK(tid_vlstr, FAIL, "H5Tcopy");
|
||
|
||
/* Change padding and verify it */
|
||
ret = H5Tset_strpad(tid_vlstr, H5T_STR_NULLPAD);
|
||
CHECK(ret, FAIL, "H5Tset_strpad");
|
||
pad = H5Tget_strpad(tid_vlstr);
|
||
VERIFY(pad, H5T_STR_NULLPAD, "H5Tget_strpad");
|
||
|
||
/* Convert to variable-length string */
|
||
ret = H5Tset_size(tid_vlstr, H5T_VARIABLE);
|
||
CHECK(ret, FAIL, "H5Tset_size");
|
||
|
||
/* Check if datatype is VL string */
|
||
ret = H5Tget_class(tid_vlstr);
|
||
VERIFY(ret, H5T_STRING, "H5Tget_class");
|
||
ret = H5Tis_variable_str(tid_vlstr);
|
||
VERIFY(ret, TRUE, "H5Tis_variable_str");
|
||
|
||
/* Check default character set and padding */
|
||
cset = H5Tget_cset(tid_vlstr);
|
||
VERIFY(cset, H5T_CSET_ASCII, "H5Tget_cset");
|
||
pad = H5Tget_strpad(tid_vlstr);
|
||
VERIFY(pad, H5T_STR_NULLPAD, "H5Tget_strpad");
|
||
|
||
/* Commit variable-length string datatype to storage */
|
||
ret = H5Tcommit(fid, VLSTR_TYPE, tid_vlstr);
|
||
CHECK(ret, FAIL, "H5Tcommit");
|
||
|
||
/* Close datatype */
|
||
ret = H5Tclose(tid_vlstr);
|
||
CHECK(ret, FAIL, "H5Tclose");
|
||
|
||
tid_vlstr = H5Topen(fid, VLSTR_TYPE);
|
||
CHECK(tid_vlstr, FAIL, "H5Topen");
|
||
|
||
ret = H5Tclose(tid_vlstr);
|
||
CHECK(ret, FAIL, "H5Tclose");
|
||
|
||
ret = H5Fclose(fid);
|
||
CHECK(ret, FAIL, "H5Fclose");
|
||
|
||
|
||
fid = H5Fopen(DATAFILE, H5F_ACC_RDWR, H5P_DEFAULT);
|
||
CHECK(fid, FAIL, "H5Fopen");
|
||
|
||
/* Open the variable-length string datatype just created */
|
||
tid_vlstr = H5Topen(fid, VLSTR_TYPE);
|
||
CHECK(tid_vlstr, FAIL, "H5Topen");
|
||
|
||
/* Verify character set and padding */
|
||
cset = H5Tget_cset(tid_vlstr);
|
||
VERIFY(cset, H5T_CSET_ASCII, "H5Tget_cset");
|
||
pad = H5Tget_strpad(tid_vlstr);
|
||
VERIFY(pad, H5T_STR_NULLPAD, "H5Tget_strpad");
|
||
|
||
/* Close datatype and file */
|
||
ret = H5Tclose(tid_vlstr);
|
||
CHECK(ret, FAIL, "H5Tclose");
|
||
ret = H5Fclose(fid);
|
||
CHECK(ret, FAIL, "H5Fclose");
|
||
|
||
} /* end test_vlstring_type() */
|
||
|
||
/****************************************************************
|
||
**
|
||
** test_write_vl_string_attribute(): Test basic VL string code.
|
||
** Tests writing VL strings as attributes
|
||
**
|
||
****************************************************************/
|
||
static void test_write_vl_string_attribute(void)
|
||
{
|
||
hid_t file, root, dataspace, att;
|
||
hid_t type;
|
||
herr_t ret;
|
||
char *string_att_check;
|
||
|
||
/* Open the file */
|
||
file = H5Fopen(DATAFILE, H5F_ACC_RDWR, H5P_DEFAULT);
|
||
CHECK(file, FAIL, "H5Fopen");
|
||
|
||
/* Create a datatype to refer to. */
|
||
type = H5Tcopy (H5T_C_S1);
|
||
CHECK(type, FAIL, "H5Tcopy");
|
||
|
||
ret = H5Tset_size (type, H5T_VARIABLE);
|
||
CHECK(ret, FAIL, "H5Tset_size");
|
||
|
||
root = H5Gopen(file, "/");
|
||
CHECK(root, FAIL, "H5Gopen");
|
||
|
||
dataspace = H5Screate(H5S_SCALAR);
|
||
CHECK(dataspace, FAIL, "H5Screate");
|
||
|
||
/* Test creating a "normal" sized string attribute */
|
||
att = H5Acreate(root, "test_scalar", type, dataspace, H5P_DEFAULT);
|
||
CHECK(att, FAIL, "H5Acreate");
|
||
|
||
ret = H5Awrite(att, type, &string_att);
|
||
CHECK(ret, FAIL, "H5Awrite");
|
||
|
||
ret = H5Aread(att, type, &string_att_check);
|
||
CHECK(ret, FAIL, "H5Aread");
|
||
|
||
if(HDstrcmp(string_att_check,string_att)!=0) {
|
||
num_errs++;
|
||
printf("VL string attributes don't match!, string_att=%s, string_att_check=%s\n",string_att,string_att_check);
|
||
} /* end if */
|
||
|
||
HDfree(string_att_check);
|
||
|
||
ret = H5Aclose(att);
|
||
CHECK(ret, FAIL, "HAclose");
|
||
|
||
/* Test creating a "large" sized string attribute */
|
||
att = H5Acreate(root, "test_scalar_large", type, dataspace, H5P_DEFAULT);
|
||
CHECK(att, FAIL, "H5Acreate");
|
||
|
||
string_att_write = (char*)HDcalloc(8192, sizeof(char));
|
||
HDmemset(string_att_write, 'A', 8191);
|
||
|
||
ret = H5Awrite(att, type, &string_att_write);
|
||
CHECK(ret, FAIL, "H5Awrite");
|
||
|
||
ret = H5Aread(att, type, &string_att_check);
|
||
CHECK(ret, FAIL, "H5Aread");
|
||
|
||
if(HDstrcmp(string_att_check,string_att_write)!=0) {
|
||
num_errs++;
|
||
printf("VL string attributes don't match!, string_att_write=%s, string_att_check=%s\n",string_att_write,string_att_check);
|
||
} /* end if */
|
||
|
||
HDfree(string_att_check);
|
||
/* The attribute string written is freed below, in the test_read_vl_string_attribute() test */
|
||
/* HDfree(string_att_write); */
|
||
|
||
ret = H5Aclose(att);
|
||
CHECK(ret, FAIL, "HAclose");
|
||
|
||
ret = H5Gclose(root);
|
||
CHECK(ret, FAIL, "H5Gclose");
|
||
|
||
ret = H5Tclose(type);
|
||
CHECK(ret, FAIL, "H5Tclose");
|
||
|
||
ret = H5Sclose(dataspace);
|
||
CHECK(ret, FAIL, "H5Sclose");
|
||
|
||
ret = H5Fclose(file);
|
||
CHECK(ret, FAIL, "H5Fclose");
|
||
|
||
return;
|
||
}
|
||
|
||
/****************************************************************
|
||
**
|
||
** test_read_vl_string_attribute(): Test basic VL string code.
|
||
** Tests reading VL strings from attributes
|
||
**
|
||
****************************************************************/
|
||
static void test_read_vl_string_attribute(void)
|
||
{
|
||
hid_t file, root, att;
|
||
hid_t type;
|
||
herr_t ret;
|
||
char *string_att_check;
|
||
|
||
/* Open file */
|
||
file = H5Fopen(DATAFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
|
||
CHECK(file, FAIL, "H5Fopen");
|
||
|
||
/* Create a datatype to refer to. */
|
||
type = H5Tcopy (H5T_C_S1);
|
||
CHECK(type, FAIL, "H5Tcopy");
|
||
|
||
ret = H5Tset_size (type, H5T_VARIABLE);
|
||
CHECK(ret, FAIL, "H5Tset_size");
|
||
|
||
root = H5Gopen(file, "/");
|
||
CHECK(root, FAIL, "H5Gopen");
|
||
|
||
/* Test reading "normal" sized string attribute */
|
||
att = H5Aopen_name(root, "test_scalar");
|
||
CHECK(att, FAIL, "H5Aopen_name");
|
||
|
||
ret = H5Aread(att, type, &string_att_check);
|
||
CHECK(ret, FAIL, "H5Aread");
|
||
|
||
if(HDstrcmp(string_att_check,string_att)!=0) {
|
||
num_errs++;
|
||
printf("VL string attributes don't match!, string_att=%s, string_att_check=%s\n",string_att,string_att_check);
|
||
} /* end if */
|
||
|
||
HDfree(string_att_check);
|
||
|
||
ret = H5Aclose(att);
|
||
CHECK(ret, FAIL, "HAclose");
|
||
|
||
/* Test reading "large" sized string attribute */
|
||
att = H5Aopen_name(root, "test_scalar_large");
|
||
CHECK(att, FAIL, "H5Aopen_name");
|
||
|
||
ret = H5Aread(att, type, &string_att_check);
|
||
CHECK(ret, FAIL, "H5Aread");
|
||
|
||
if(HDstrcmp(string_att_check,string_att_write)!=0) {
|
||
num_errs++;
|
||
printf("VL string attributes don't match!, string_att_write=%s, string_att_check=%s\n",string_att_write,string_att_check);
|
||
} /* end if */
|
||
|
||
HDfree(string_att_check);
|
||
HDfree(string_att_write); /* Free string allocated in test_write_vl_string_attribute */
|
||
|
||
ret = H5Aclose(att);
|
||
CHECK(ret, FAIL, "HAclose");
|
||
|
||
ret = H5Tclose(type);
|
||
CHECK(ret, FAIL, "H5Tclose");
|
||
|
||
ret = H5Gclose(root);
|
||
CHECK(ret, FAIL, "H5Gclose");
|
||
|
||
ret = H5Fclose(file);
|
||
CHECK(ret, FAIL, "H5Fclose");
|
||
|
||
return;
|
||
}
|
||
|
||
/****************************************************************
|
||
**
|
||
** test_vlstrings(): Main VL string testing routine.
|
||
**
|
||
****************************************************************/
|
||
void
|
||
test_vlstrings(void)
|
||
{
|
||
/* Output message about test being performed */
|
||
MESSAGE(5, ("Testing Variable-Length Strings\n"));
|
||
|
||
/* These next tests use the same file */
|
||
/* Test basic VL string datatype */
|
||
test_vlstrings_basic();
|
||
test_vlstrings_special();
|
||
test_vlstring_type();
|
||
|
||
/* Test using VL strings in attributes */
|
||
test_write_vl_string_attribute();
|
||
test_read_vl_string_attribute();
|
||
} /* test_vlstrings() */
|
||
|
||
|
||
/*-------------------------------------------------------------------------
|
||
* Function: cleanup_vlstrings
|
||
*
|
||
* Purpose: Cleanup temporary test files
|
||
*
|
||
* Return: none
|
||
*
|
||
* Programmer: Quincey Koziol
|
||
* September 10, 1999
|
||
*
|
||
* Modifications:
|
||
*
|
||
*-------------------------------------------------------------------------
|
||
*/
|
||
void
|
||
cleanup_vlstrings(void)
|
||
{
|
||
remove(DATAFILE);
|
||
}
|
||
|