diff options
author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2019-01-31 17:47:43 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2019-01-31 17:47:43 (GMT) |
commit | 311e4ed32de7fead9d6c26d962fdfbd00222ce2b (patch) | |
tree | d4cb5c0b374a38fa66763397a4b42ea7b1f21c61 /test/vfd_swmr_remove_writer.c | |
parent | 6feabcb42d55c1b47fa011ae915746834c3984b9 (diff) | |
download | hdf5-311e4ed32de7fead9d6c26d962fdfbd00222ce2b.zip hdf5-311e4ed32de7fead9d6c26d962fdfbd00222ce2b.tar.gz hdf5-311e4ed32de7fead9d6c26d962fdfbd00222ce2b.tar.bz2 |
Modifications to the vfd swmr concurrent tests:
(1) Increase the # of records to write (Nrecords) in testvfdswmr.sh.in so as to ensure the writer
will not exit before the reader
(2) Use H5E_BEGIN_TRY/END_TRY when H5Fopen() the test file in reader tests
(3) Add "READER" or "WRITER" to debugging messages
(4) Misc cleanup
Diffstat (limited to 'test/vfd_swmr_remove_writer.c')
-rw-r--r-- | test/vfd_swmr_remove_writer.c | 87 |
1 files changed, 58 insertions, 29 deletions
diff --git a/test/vfd_swmr_remove_writer.c b/test/vfd_swmr_remove_writer.c index 200c884..658cdbf 100644 --- a/test/vfd_swmr_remove_writer.c +++ b/test/vfd_swmr_remove_writer.c @@ -73,9 +73,9 @@ static void usage(void); static hid_t open_skeleton(const char *filename, unsigned verbose, unsigned old) { - hid_t fid; /* File ID for new HDF5 file */ - hid_t fapl; /* File access property list */ - hid_t sid; /* Dataspace ID */ + hid_t fid = -1; /* File ID for new HDF5 file */ + hid_t fapl = -1; /* File access property list */ + hid_t sid = -1; /* Dataspace ID */ hsize_t dim[2]; /* Dataspace dimensions */ unsigned u, v; /* Local index variable */ H5F_vfd_swmr_config_t *config = NULL; /* Configuration for VFD SWMR */ @@ -84,11 +84,11 @@ open_skeleton(const char *filename, unsigned verbose, unsigned old) /* Create file access property list */ if((fapl = h5_fileaccess()) < 0) - return -1; + goto error; /* FOR NOW: set to use latest format, the "old" parameter is not used */ if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) - return -1; + goto error; #ifdef QAK /* Increase the initial size of the metadata cache */ @@ -116,11 +116,11 @@ open_skeleton(const char *filename, unsigned verbose, unsigned old) /* Enable page buffering */ if(H5Pset_page_buffer_size(fapl, 4096, 0, 0) < 0) - return -1; + goto error; /* Allocate memory for the configuration structure */ if((config = (H5F_vfd_swmr_config_t *)HDmalloc(sizeof(H5F_vfd_swmr_config_t))) == NULL) - return -1; + goto error; config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION; config->tick_len = 4; @@ -131,38 +131,57 @@ open_skeleton(const char *filename, unsigned verbose, unsigned old) /* Enable VFD SWMR configuration */ if(H5Pset_vfd_swmr_config(fapl, config) < 0) - return -1; + goto error; /* Open the file */ if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) - return -1; + goto error; /* Close file access property list */ if(H5Pclose(fapl) < 0) - return -1; + goto error; if(config) HDfree(config); /* Emit informational message */ if(verbose) - HDfprintf(stderr, "Opening datasets\n"); + HDfprintf(stderr, "WRITER: Opening datasets\n"); /* Open the datasets */ for(u = 0; u < NLEVELS; u++) for(v = 0; v < symbol_count[u]; v++) { if((symbol_info[u][v].dsid = H5Dopen2(fid, symbol_info[u][v].name, H5P_DEFAULT)) < 0) - return -1; + goto error; if((sid = H5Dget_space(symbol_info[u][v].dsid)) < 0) - return -1; + goto error; if(2 != H5Sget_simple_extent_ndims(sid)) - return -1; + goto error; if(H5Sget_simple_extent_dims(sid, dim, NULL) < 0) - return -1; + goto error; symbol_info[u][v].nrecords = dim[1]; + + if(H5Sclose(sid) < 0) + goto error; } /* end for */ return fid; + +error: + if(config) + HDfree(config); + + H5E_BEGIN_TRY { + for(u = 0; u < NLEVELS; u++) + for(v = 0; v < symbol_count[u]; v++) + H5Dclose(symbol_info[u][v].dsid); + H5Sclose(sid); + H5Pclose(fapl); + H5Fclose(fid); + } H5E_END_TRY; + + return -1; + } /* open_skeleton() */ @@ -215,7 +234,7 @@ remove_records(hid_t fid, unsigned verbose, unsigned long nshrinks, unsigned lon symbol->nrecords -= remove_size; dim[1] = symbol->nrecords; if(H5Dset_extent(symbol->dsid, dim) < 0) - return -1; + goto error; /* Check for flushing file */ if(flush_count > 0) { @@ -238,15 +257,25 @@ remove_records(hid_t fid, unsigned verbose, unsigned long nshrinks, unsigned lon /* Emit informational message */ if(verbose) - HDfprintf(stderr, "Closing datasets\n"); + HDfprintf(stderr, "WRITER: Closing datasets\n"); /* Close the datasets */ for(u = 0; u < NLEVELS; u++) for(v = 0; v < symbol_count[u]; v++) if(H5Dclose(symbol_info[u][v].dsid) < 0) - return -1; + goto error; return 0; + +error: + H5E_BEGIN_TRY { + for(u = 0; u < NLEVELS; u++) + for(v = 0; v < symbol_count[u]; v++) + H5Dclose(symbol_info[u][v].dsid); + + } H5E_END_TRY; + + return -1; } /* remove_records() */ static void @@ -337,7 +366,7 @@ int main(int argc, const char *argv[]) /* Emit informational message */ if(verbose) { - HDfprintf(stderr, "Parameters:\n"); + HDfprintf(stderr, "WRITER: Parameters:\n"); HDfprintf(stderr, "\t# of shrinks between flushes = %ld\n", flush_count); HDfprintf(stderr, "\t# of shrinks = %ld\n", nshrinks); } /* end if */ @@ -350,11 +379,11 @@ int main(int argc, const char *argv[]) } /* end if */ HDsrandom(random_seed); /* ALWAYS emit the random seed for possible debugging */ - HDfprintf(stderr, "Using writer random seed: %u\n", random_seed); + HDfprintf(stderr, "WRITER: Using writer random seed: %u\n", random_seed); /* Emit informational message */ if(verbose) - HDfprintf(stderr, "Generating symbol names\n"); + HDfprintf(stderr, "WRITER: Generating symbol names\n"); /* Generate dataset names */ if(generate_symbols() < 0) @@ -362,11 +391,11 @@ int main(int argc, const char *argv[]) /* Emit informational message */ if(verbose) - HDfprintf(stderr, "Opening skeleton file: %s\n", FILENAME); + HDfprintf(stderr, "WRITER: Opening skeleton file: %s\n", FILENAME); /* Open file skeleton */ if((fid = open_skeleton(FILENAME, verbose, old)) < 0) { - HDfprintf(stderr, "Error opening skeleton file!\n"); + HDfprintf(stderr, "WRITER: Error opening skeleton file!\n"); HDexit(1); } /* end if */ @@ -375,31 +404,31 @@ int main(int argc, const char *argv[]) /* Emit informational message */ if(verbose) - HDfprintf(stderr, "Removing records\n"); + HDfprintf(stderr, "WRITER: Removing records\n"); /* Remove records from datasets */ if(remove_records(fid, verbose, (unsigned long)nshrinks, (unsigned long)flush_count) < 0) { - HDfprintf(stderr, "Error removing records from datasets!\n"); + HDfprintf(stderr, "WRITER: Error removing records from datasets!\n"); HDexit(1); } /* end if */ /* Emit informational message */ if(verbose) - HDfprintf(stderr, "Releasing symbols\n"); + HDfprintf(stderr, "WRITER: Releasing symbols\n"); /* Clean up the symbols */ if(shutdown_symbols() < 0) { - HDfprintf(stderr, "Error releasing symbols!\n"); + HDfprintf(stderr, "WRITER: Error releasing symbols!\n"); HDexit(1); } /* end if */ /* Emit informational message */ if(verbose) - HDfprintf(stderr, "Closing objects\n"); + HDfprintf(stderr, "WRITER: Closing objects\n"); /* Close objects opened */ if(H5Fclose(fid) < 0) { - HDfprintf(stderr, "Error closing file!\n"); + HDfprintf(stderr, "WRITER: Error closing file!\n"); HDexit(1); } /* end if */ |