philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r29080] merge from trunk.

Browse Source
This commit is contained in:
Mohamad Chaarawi
2016-02-10 13:36:23 -05:00
parent 25f271d84b 4da0790886
commit 557a3972ac
3 changed files with 369 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fortran/src/H5Sff.F90
View File

@@ -1784,7 +1784,7 @@ CONTAINS
INTEGER, INTENT(OUT) :: hdferr
!*****
TYPE(C_PTR) :: start_c, stride_c, count_c, block_c
INTEGER(C_INT) :: n
INTEGER :: n
INTERFACE
INTEGER FUNCTION h5sget_regular_hyperslab(space_id, start, stride, count, block) BIND(C,NAME='H5Sget_regular_hyperslab')

2
test/Makefile.am
View File

@@ -129,7 +129,7 @@ CHECK_CLEANFILES+=accum.h5 cmpd_dset.h5 compact_dataset.h5 dataset.h5 dset_offse
huge_chunks.h5 chunk_cache.h5 big_chunk.h5 chunk_expand.h5 \
copy_dcpl_newfile.h5 extend.h5 istore.h5 extlinks*.h5 frspace.h5 links*.h5 \
sys_file1 tfile[1-7].h5 th5s[1-4].h5 lheap.h5 fheap.h5 ohdr.h5 \
stab.h5 extern_[1-4].h5 extern_[1-4][rw].raw gheap[0-4].h5 \
stab.h5 extern_[1-4].h5 extern_[1-4][rw].raw gheap[0-5].h5 \
dt_arith[1-2] links.h5 links[0-6]*.h5 extlinks[0-15].h5 tmp \
big.data big[0-9][0-9][0-9][0-9][0-9].h5 \
stdio.h5 sec2.h5 dtypes[0-9].h5 dtypes1[0].h5 dt_arith[1-2].h5 tattr.h5 \

666
test/gheap.c
View File

@@ -51,412 +51,480 @@ const char *FILENAME[] = {
"gheap2",
"gheap3",
"gheap4",
"gheapooo",
"gheap5",
NULL
};
/* Number of heap objects in tests */
#define N_GHEAP_OBJS 1024
/* Size of heap object buffers */
#define OBJ_BUF_SIZE N_GHEAP_OBJS
/* Size of filename */
#define FILENAME_SIZE 1024
/*-------------------------------------------------------------------------
* Function: test_1
* Function: test_monotonic_increasing
*
* Purpose: Writes a sequence of objects to the global heap where each
* object is larger than the one before.
* Purpose: Writes a sequence of objects to the global heap where each
* object is larger than the one before.
*
* Return: Success: 0
* Return: Success: 0
* Failure: number of errors
*
* Failure: number of errors
*
* Programmer: Robb Matzke
* Programmer: Robb Matzke
* Tuesday, March 31, 1998
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static int
test_1 (hid_t fapl)
test_monotonic_increasing(hid_t fapl)
{
hid_t file = -1;
H5F_t *f = NULL;
H5HG_t obj[1024];
uint8_t out[1024];
uint8_t in[1024];
int i;
size_t size;
herr_t status;
int nerrors = 0;
char filename[1024];
char *filename = NULL; /* VFD-dependent filename */
hid_t fid = -1; /* HDF5 file ID */
H5F_t *f = NULL; /* file object pointer */
H5HG_t *obj = NULL; /* global heap objects */
uint8_t *in = NULL; /* global heap data sent */
uint8_t *out = NULL; /* global heap data received */
unsigned i; /* iterator */
size_t size; /* heap object size */
int nerrors = 0; /* # of errors encountered */
TESTING("monotonically increasing lengths");
/* Open a clean file */
h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
goto error;
if(NULL == (f = (H5F_t *)H5I_object(file))) {
H5_FAILED();
puts(" Unable to create file");
goto error;
}
/* allocate memory */
if(NULL == (filename = (char *)HDcalloc(FILENAME_SIZE, sizeof(char))))
goto error;
if(NULL == (obj = (H5HG_t *)HDcalloc(N_GHEAP_OBJS, sizeof(H5HG_t))))
goto error;
if(NULL == (in = (uint8_t *)HDcalloc(OBJ_BUF_SIZE, sizeof(uint8_t))))
goto error;
if(NULL == (out = (uint8_t *)HDcalloc(OBJ_BUF_SIZE, sizeof(uint8_t))))
goto error;
/*
* Write the objects, monotonically increasing in length. Since this is
/* Open a clean file */
h5_fixname(FILENAME[0], fapl, filename, sizeof(filename));
if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
goto error;
if(NULL == (f = (H5F_t *)H5I_object(fid))) {
H5_FAILED();
HDputs(" Unable to create file");
goto error;
} /* end if */
/* Write the objects, monotonically increasing in length. Since this is
* a clean file, the addresses allocated for the collections should also
* be monotonically increasing.
*/
for(i = 0; i < 1024; i++) {
size = i + 1;
HDmemset(out, 'A' + i % 26, size);
H5Eclear2(H5E_DEFAULT);
status = H5HG_insert(f, H5AC_dxpl_id, size, out, obj + i);
if(status < 0) {
H5_FAILED();
puts(" Unable to insert object into global heap");
nerrors++;
} else if(i && H5F_addr_gt(obj[i - 1].addr, obj[i].addr)) {
H5_FAILED();
puts(" Collection addresses are not monotonically increasing");
nerrors++;
}
}
for(i = 0; i < N_GHEAP_OBJS; i++) {
size = i + 1;
HDmemset(out, 'A' + (int)i % 26, size);
H5Eclear2(H5E_DEFAULT);
if(H5HG_insert(f, H5AC_dxpl_id, size, out, obj + i) < 0) {
H5_FAILED();
HDputs(" Unable to insert object into global heap");
nerrors++;
} else if(i && H5F_addr_gt(obj[i - 1].addr, obj[i].addr)) {
H5_FAILED();
HDputs(" Collection addresses are not monotonically increasing");
nerrors++;
} /* end if */
} /* end for */
/*
* Now try to read each object back.
*/
for(i = 0; i < 1024; i++) {
size = i + 1;
HDmemset(out, 'A' + i % 26, size);
H5Eclear2(H5E_DEFAULT);
if(NULL == H5HG_read(f, H5AC_dxpl_id, obj + i, in, NULL)) {
H5_FAILED();
puts(" Unable to read object");
nerrors++;
} else if(HDmemcmp(in, out, size)) {
H5_FAILED();
puts(" Value read doesn't match value written");
nerrors++;
}
}
/* Now try to read each object back. */
for(i = 0; i < N_GHEAP_OBJS; i++) {
size = i + 1;
HDmemset(out, 'A' + (int)i % 26, size);
H5Eclear2(H5E_DEFAULT);
if(NULL == H5HG_read(f, H5AC_dxpl_id, obj + i, in, NULL)) {
H5_FAILED();
HDputs(" Unable to read object");
nerrors++;
} else if(HDmemcmp(in, out, size)) {
H5_FAILED();
HDputs(" Value read doesn't match value written");
nerrors++;
} /* end if */
} /* end for */
if(H5Fclose(file) < 0) goto error;
if(H5Fclose(fid) < 0) goto error;
if(nerrors) goto error;
HDfree(filename);
HDfree(obj);
HDfree(in);
HDfree(out);
PASSED();
return 0;
error:
H5E_BEGIN_TRY {
H5Fclose(file);
H5Fclose(fid);
} H5E_END_TRY;
if(filename)
HDfree(filename);
if(obj)
HDfree(obj);
if(in)
HDfree(in);
if(out)
HDfree(out);
return MAX(1, nerrors);
}
} /* end test_monotonic_increasing() */
/*-------------------------------------------------------------------------
* Function: test_2
* Function: test_monotonic_decreasing
*
* Purpose: Writes a sequence of objects to the global heap where each
* object is smaller than the one before.
* Purpose: Writes a sequence of objects to the global heap where each
* object is smaller than the one before.
*
* Return: Success: 0
* Return: Success: 0
* Failure: number of errors
*
* Failure: number of errors
*
* Programmer: Robb Matzke
* Programmer: Robb Matzke
* Tuesday, March 31, 1998
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static int
test_2 (hid_t fapl)
test_monotonic_decreasing(hid_t fapl)
{
hid_t file = -1;
H5F_t *f = NULL;
H5HG_t obj[1024];
uint8_t out[1024];
uint8_t in[1024];
int i;
size_t size;
int nerrors = 0;
char filename[1024];
char *filename = NULL; /* VFD-dependent filename */
hid_t fid = -1; /* HDF5 file ID */
H5F_t *f = NULL; /* file object pointer */
H5HG_t *obj = NULL; /* global heap objects */
uint8_t *in = NULL; /* global heap data sent */
uint8_t *out = NULL; /* global heap data received */
unsigned i; /* iterator */
size_t size; /* heap object size */
int nerrors = 0; /* # of errors encountered */
TESTING("monotonically decreasing lengths");
/* allocate memory */
if(NULL == (filename = (char *)HDcalloc(FILENAME_SIZE, sizeof(char))))
goto error;
if(NULL == (obj = (H5HG_t *)HDcalloc(N_GHEAP_OBJS, sizeof(H5HG_t))))
goto error;
if(NULL == (in = (uint8_t *)HDcalloc(OBJ_BUF_SIZE, sizeof(uint8_t))))
goto error;
if(NULL == (out = (uint8_t *)HDcalloc(OBJ_BUF_SIZE, sizeof(uint8_t))))
goto error;
/* Open a clean file */
h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
goto error;
if(NULL == (f = (H5F_t *)H5I_object(file))) {
H5_FAILED();
puts(" Unable to create file");
goto error;
}
h5_fixname(FILENAME[1], fapl, filename, sizeof(filename));
if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
goto error;
if(NULL == (f = (H5F_t *)H5I_object(fid))) {
H5_FAILED();
HDputs(" Unable to create file");
goto error;
} /* end if */
/*
* Write the objects, monotonically decreasing in length.
*/
for (i=0; i<1024; i++) {
size = 1024-i;
memset (out, 'A'+i%26, size);
H5Eclear2(H5E_DEFAULT);
if (H5HG_insert (f, H5AC_dxpl_id, size, out, obj+i)<0) {
H5_FAILED();
puts(" Unable to insert object into global heap");
nerrors++;
}
}
/* Write the objects, monotonically decreasing in length. */
for(i = 0; i < N_GHEAP_OBJS; i++) {
size = N_GHEAP_OBJS - i;
HDmemset(out, 'A' + (int)i % 26, size);
H5Eclear2(H5E_DEFAULT);
if(H5HG_insert(f, H5AC_dxpl_id, size, out, obj+i) < 0) {
H5_FAILED();
HDputs(" Unable to insert object into global heap");
nerrors++;
} /* end if */
} /* end for */
/*
* Now try to read each object back.
*/
for (i=0; i<1024; i++) {
size = 1024-i;
memset (out, 'A'+i%26, size);
H5Eclear2(H5E_DEFAULT);
if (NULL==H5HG_read (f, H5AC_dxpl_id, obj+i, in, NULL)) {
H5_FAILED();
puts(" Unable to read object");
nerrors++;
} else if (memcmp (in, out, size)) {
H5_FAILED();
puts(" Value read doesn't match value written");
nerrors++;
}
}
/* Now try to read each object back. */
for(i = 0; i < N_GHEAP_OBJS; i++) {
size = N_GHEAP_OBJS - i;
HDmemset(out, 'A' + (int)i % 26, size);
H5Eclear2(H5E_DEFAULT);
if(NULL == H5HG_read(f, H5AC_dxpl_id, obj+i, in, NULL)) {
H5_FAILED();
HDputs(" Unable to read object");
nerrors++;
} else if (HDmemcmp(in, out, size)) {
H5_FAILED();
HDputs(" Value read doesn't match value written");
nerrors++;
} /* end if */
} /* end for */
if(H5Fclose(fid) < 0) goto error;
if(nerrors) goto error;
HDfree(filename);
HDfree(obj);
HDfree(in);
HDfree(out);
if (H5Fclose(file)<0) goto error;
if (nerrors) goto error;
PASSED();
return 0;
error:
H5E_BEGIN_TRY {
H5Fclose(file);
H5Fclose(fid);
} H5E_END_TRY;
if(filename)
HDfree(filename);
if(obj)
HDfree(obj);
if(in)
HDfree(in);
if(out)
HDfree(out);
return MAX(1, nerrors);
}
} /* end test_monotonic_decreasing() */
/*-------------------------------------------------------------------------
* Function: test_3
* Function: test_complete_removal
*
* Purpose: Creates a few global heap objects and then removes them all.
* The collection should also be removed.
* Purpose: Creates a few global heap objects and then removes them all.
* The collection should also be removed.
*
* Return: Success: 0
* Return: Success: 0
* Failure: number of errors
*
* Failure: number of errors
*
* Programmer: Robb Matzke
* Programmer: Robb Matzke
* Tuesday, March 31, 1998
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static int
test_3 (hid_t fapl)
test_complete_removal(hid_t fapl)
{
hid_t file = -1;
H5F_t *f = NULL;
H5HG_t obj[1024];
uint8_t out[1024];
int i;
size_t size;
herr_t status;
int nerrors = 0;
char filename[1024];
char *filename = NULL; /* VFD-dependent filename */
hid_t fid = -1; /* HDF5 file ID */
H5F_t *f = NULL; /* file object pointer */
H5HG_t *obj = NULL; /* global heap objects */
uint8_t *out = NULL; /* global heap data received */
unsigned i; /* iterator */
size_t size; /* heap object size */
int nerrors = 0; /* # of errors encountered */
TESTING("complete object removal");
/* allocate memory */
if(NULL == (filename = (char *)HDcalloc(FILENAME_SIZE, sizeof(char))))
goto error;
if(NULL == (obj = (H5HG_t *)HDcalloc(N_GHEAP_OBJS, sizeof(H5HG_t))))
goto error;
if(NULL == (out = (uint8_t *)HDcalloc(OBJ_BUF_SIZE, sizeof(uint8_t))))
goto error;
/* Open a clean file */
h5_fixname(FILENAME[2], fapl, filename, sizeof filename);
if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
goto error;
if(NULL == (f = (H5F_t *)H5I_object(file))) {
H5_FAILED();
puts(" Unable to create file");
goto error;
}
h5_fixname(FILENAME[2], fapl, filename, sizeof(filename));
if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
goto error;
if(NULL == (f = (H5F_t *)H5I_object(fid))) {
H5_FAILED();
HDputs(" Unable to create file");
goto error;
} /* end if */
/* Create some stuff */
for (i=0; i<1024; i++) {
size = i%30+100;
memset (out, 'A'+i%26, size);
H5Eclear2(H5E_DEFAULT);
status = H5HG_insert (f, H5AC_dxpl_id, size, out, obj+i);
if (status<0) {
H5_FAILED();
puts(" Unable to insert object into global heap");
nerrors++;
}
}
for(i = 0; i < N_GHEAP_OBJS; i++) {
size = i % 30 + 100;
HDmemset(out, 'A' + (int)i % 26, size);
H5Eclear2(H5E_DEFAULT);
if(H5HG_insert(f, H5AC_dxpl_id, size, out, obj+i) < 0) {
H5_FAILED();
HDputs(" Unable to insert object into global heap");
nerrors++;
} /* end if */
} /* end for */
/* Remove everything */
for (i=0; i<1024; i++) {
status = H5HG_remove (f, H5AC_dxpl_id, obj+i);
if (status<0) {
H5_FAILED();
puts(" Unable to remove object");
nerrors++;
}
}
for(i = 0; i < N_GHEAP_OBJS; i++) {
if(H5HG_remove(f, H5AC_dxpl_id, obj+i) < 0) {
H5_FAILED();
HDputs(" Unable to remove object");
nerrors++;
} /* end if */
} /* end for */
if(H5Fclose(fid) < 0) goto error;
if(nerrors) goto error;
HDfree(filename);
HDfree(obj);
HDfree(out);
if (H5Fclose(file)<0) goto error;
if (nerrors) goto error;
PASSED();
return 0;
error:
H5E_BEGIN_TRY {
H5Fclose(file);
H5Fclose(fid);
} H5E_END_TRY;
if(filename)
HDfree(filename);
if(obj)
HDfree(obj);
if(out)
HDfree(out);
return MAX(1, nerrors);
}
} /* end test_complete_removal() */
/*-------------------------------------------------------------------------
* Function: test_4
* Function: test_partial_removal
*
* Purpose: Tests the H5HG_remove() feature by writing lots of objects
* and occassionally removing some. When we're done they're all
* removed.
* Purpose: Tests the H5HG_remove() feature by writing lots of objects
* and occassionally removing some. When we're done they're all
* removed.
*
* Return: Success: 0
* Return: Success: 0
* Failure: number of errors
*
* Failure: number of errors
*
* Programmer: Robb Matzke
* Programmer: Robb Matzke
* Tuesday, March 31, 1998
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static int
test_4 (hid_t fapl)
test_partial_removal(hid_t fapl)
{
hid_t file = -1;
H5F_t *f = NULL;
H5HG_t obj[1024];
uint8_t out[1024];
int i;
size_t size;
herr_t status;
int nerrors = 0;
char filename[1024];
char *filename = NULL; /* VFD-dependent filename */
hid_t fid = -1; /* HDF5 file ID */
H5F_t *f = NULL; /* file object pointer */
H5HG_t *obj = NULL; /* global heap objects */
uint8_t *out = NULL; /* global heap data received */
unsigned i; /* iterator */
size_t size; /* heap object size */
int nerrors = 0; /* # of errors encountered */
TESTING("partial object removal");
/* allocate memory */
if(NULL == (filename = (char *)HDcalloc(FILENAME_SIZE, sizeof(char))))
goto error;
if(NULL == (obj = (H5HG_t *)HDcalloc(N_GHEAP_OBJS, sizeof(H5HG_t))))
goto error;
if(NULL == (out = (uint8_t *)HDcalloc(OBJ_BUF_SIZE, sizeof(uint8_t))))
goto error;
/* Open a clean file */
h5_fixname(FILENAME[3], fapl, filename, sizeof filename);
if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
goto error;
if(NULL == (f = (H5F_t *)H5I_object(file))) {
H5_FAILED();
puts(" Unable to create file");
goto error;
}
h5_fixname(FILENAME[3], fapl, filename, sizeof(filename));
if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
goto error;
if(NULL == (f = (H5F_t *)H5I_object(fid))) {
H5_FAILED();
HDputs(" Unable to create file");
goto error;
} /* end if */
for (i=0; i<1024; i++) {
/* Insert */
size = i%30+100;
memset (out, 'A'+i%26, size);
H5Eclear2(H5E_DEFAULT);
status = H5HG_insert (f, H5AC_dxpl_id, size, out, obj+i);
if (status<0) {
H5_FAILED();
puts(" Unable to insert object into global heap");
nerrors++;
}
for(i = 0; i < N_GHEAP_OBJS; i++) {
/*
* Remove every third one beginning with the second, but after the
* next one has already been inserted. That is, insert A, B, C;
* remove B, insert D, E, F; remove E; etc.
*/
if (1==i%3) {
H5Eclear2(H5E_DEFAULT);
status = H5HG_remove (f, H5AC_dxpl_id, obj+i-1);
if (status<0) {
H5_FAILED();
puts(" Unable to remove object");
nerrors++;
}
memset (obj+i-1, 0, sizeof *obj);
}
}
/* Insert */
size = i % 30 + 100;
HDmemset(out, 'A' + (int)i % 26, size);
H5Eclear2(H5E_DEFAULT);
if(H5HG_insert(f, H5AC_dxpl_id, size, out, obj+i) < 0) {
H5_FAILED();
HDputs(" Unable to insert object into global heap");
nerrors++;
} /* end if */
/* Remove every third one beginning with the second, but after the
* next one has already been inserted. That is, insert A, B, C;
* remove B, insert D, E, F; remove E; etc.
*/
if(1 == i % 3) {
H5Eclear2(H5E_DEFAULT);
if(H5HG_remove(f, H5AC_dxpl_id, obj+i-1) < 0) {
H5_FAILED();
HDputs(" Unable to remove object");
nerrors++;
} /* end if */
HDmemset(obj+i-1, 0, sizeof(*obj));
} /* end if */
} /* end for */
if(H5Fclose(fid) < 0) goto error;
if(nerrors) goto error;
HDfree(filename);
HDfree(obj);
HDfree(out);
if (H5Fclose(file)<0) goto error;
if (nerrors) goto error;
PASSED();
return 0;
error:
H5E_BEGIN_TRY {
H5Fclose(file);
H5Fclose(fid);
} H5E_END_TRY;
if(filename)
HDfree(filename);
if(obj)
HDfree(obj);
if(out)
HDfree(out);
return MAX(1, nerrors);
}
} /* end test_partial_removal() */
/*-------------------------------------------------------------------------
* Function: test_ooo_indices
* Function: test_ooo_indices
*
* Purpose: Tests that indices can be stored out of order. This can
* Purpose: Tests that indices can be stored out of order. This can
* happen when the indices "wrap around" due to many
* insertions and deletions (for example, from rewriting a
* VL dataset).
*
* Return: Success: 0
* Return: Success: 0
* Failure: number of errors
*
* Failure: number of errors
*
* Programmer: Neil Fortner
* Programmer: Neil Fortner
* Monday, October 26, 2009
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static int
test_ooo_indices(hid_t fapl)
{
hid_t file = -1;
H5F_t *f = NULL;
unsigned i, j;
H5HG_t *obj = NULL;
herr_t status;
int nerrors=0;
char filename[1024];
char *filename = NULL; /* VFD-dependent filename */
hid_t fid = -1; /* HDF5 file ID */
H5F_t *f = NULL; /* file object pointer */
H5HG_t *obj = NULL; /* global heap objects */
unsigned i, j; /* iterators */
int nerrors = 0; /* # of errors encountered */
TESTING("out of order indices");
/* allocate memory */
if(NULL == (filename = (char *)HDcalloc(FILENAME_SIZE, sizeof(char))))
goto error;
if(NULL == (obj = (H5HG_t *)HDmalloc(2000 * sizeof(*obj))))
goto error;
/* Open a clean file */
h5_fixname(FILENAME[4], fapl, filename, sizeof filename);
if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
h5_fixname(FILENAME[4], fapl, filename, sizeof(filename));
if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
goto error;
if(NULL == (f = (H5F_t *)H5I_object(file))) {
if(NULL == (f = (H5F_t *)H5I_object(fid))) {
H5_FAILED();
puts(" Unable to create file");
HDputs(" Unable to create file");
goto error;
} /* end if */
/* Alternately insert 1000 entries and remove the previous group of 1000
* entries, until the indices wrap around */
for(i=0; i<66; i++) {
* entries, until the indices wrap around.
*/
for(i = 0; i < 66; i++) {
/* Insert 1000 entries. The index into the obj array will alternate up
* and down by 1000 so the previous set of insertions is preserved and
* can be deleted. */
for(j=1000*((~i&1)); j<1000*((~i&1)+1); j++) {
* can be deleted.
*/
for(j = 1000 * ((~i & 1)); j < 1000 * ((~i & 1) + 1); j++) {
H5Eclear2(H5E_DEFAULT);
status = H5HG_insert(f, H5AC_dxpl_id, sizeof(j), &j, &obj[j]);
if (status<0)
if(H5HG_insert(f, H5AC_dxpl_id, sizeof(j), &j, &obj[j]) < 0)
GHEAP_REPEATED_ERR(" Unable to insert object into global heap")
/* Check that the index is as expected */
@@ -465,11 +533,10 @@ test_ooo_indices(hid_t fapl)
} /* end for */
/* Remove the previous 1000 entries */
if(i>0)
for(j=1000*(i&1); j<1000*((i&1)+1); j++) {
if(i > 0)
for(j = 1000 * (i & 1); j < 1000 * ((i & 1) + 1); j++) {
H5Eclear2(H5E_DEFAULT);
status = H5HG_remove(f, H5AC_dxpl_id, &obj[j]);
if (status<0)
if(H5HG_remove(f, H5AC_dxpl_id, &obj[j]) < 0)
GHEAP_REPEATED_ERR(" Unable to remove object from global heap");
} /* end for */
} /* end for */
@@ -479,37 +546,41 @@ test_ooo_indices(hid_t fapl)
HDassert(obj[535].idx == 1);
/* Reopen the file */
if (H5Fclose(file)<0) goto error;
if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
if(H5Fclose(fid) < 0) goto error;
if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
goto error;
if(NULL == (f = (H5F_t *)H5I_object(file))) {
if(NULL == (f = (H5F_t *)H5I_object(fid))) {
H5_FAILED();
puts(" Unable to open file");
HDputs(" Unable to open file");
goto error;
} /* end if */
/* Read the objects to make sure the heap is still readable */
for(i=0; i<1000; i++) {
for(i = 0; i < 1000; i++) {
if(NULL == H5HG_read(f, H5AC_dxpl_id, &obj[i], &j, NULL))
goto error;
if(i != j) {
H5_FAILED();
puts(" Incorrect read value");
HDputs(" Incorrect read value");
goto error;
} /* end if */
} /* end for */
if (H5Fclose(file)<0) goto error;
if (nerrors) goto error;
if(H5Fclose(fid) < 0) goto error;
if(nerrors) goto error;
HDfree(filename);
HDfree(obj);
obj = NULL;
PASSED();
return 0;
error:
error:
H5E_BEGIN_TRY {
H5Fclose(file);
H5Fclose(fid);
} H5E_END_TRY;
if(filename)
HDfree(filename);
if(obj)
HDfree(obj);
return MAX(1, nerrors);
@@ -517,46 +588,43 @@ test_ooo_indices(hid_t fapl)
/*-------------------------------------------------------------------------
* Function: main
* Function: main
*
* Purpose: Tests global heap.
* Purpose: Tests global heap
*
* Return: Success: zero
* Return: EXIT_SUCCESS/EXIT_FAILURE
*
* Failure: non-zero
*
* Programmer: Robb Matzke
* Programmer: Robb Matzke
* Tuesday, March 31, 1998
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
int
main (void)
main(void)
{
int nerrors=0;
hid_t fapl;
int nerrors = 0; /* # of errors */
hid_t fapl = -1; /* VFD-dependent fapl ID */
h5_reset();
fapl = h5_fileaccess();
nerrors += test_1(fapl);
nerrors += test_2(fapl);
nerrors += test_3(fapl);
nerrors += test_4(fapl);
nerrors += test_monotonic_increasing(fapl);
nerrors += test_monotonic_decreasing(fapl);
nerrors += test_complete_removal(fapl);
nerrors += test_partial_removal(fapl);
nerrors += test_ooo_indices(fapl);
/* Verify symbol table messages are cached */
nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
if (nerrors) goto error;
if(nerrors) goto error;
puts("All global heap tests passed.");
HDputs("All global heap tests passed.");
h5_cleanup(FILENAME, fapl);
return 0;
return EXIT_SUCCESS;
error:
HDputs("*** TESTS FAILED ***");
return EXIT_FAILURE;
} /* end main() */
error:
puts("*** TESTS FAILED ***");
return 1;
}