diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2021-03-25 00:39:37 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2021-03-25 00:39:37 (GMT) |
commit | feb20aac304b39e18c70f88cae2f7cf7d5c82db2 (patch) | |
tree | e15d7e751af4e3c42e77ea955d91db4cf27a71cf /test/vfd_swmr_addrem_writer.c | |
parent | bdac2ecdbff2c389a222b3d93ff1eb1d23ec6b23 (diff) | |
download | hdf5-feb20aac304b39e18c70f88cae2f7cf7d5c82db2.zip hdf5-feb20aac304b39e18c70f88cae2f7cf7d5c82db2.tar.gz hdf5-feb20aac304b39e18c70f88cae2f7cf7d5c82db2.tar.bz2 |
Formats the source and updates the gcc warning pragmas
Diffstat (limited to 'test/vfd_swmr_addrem_writer.c')
-rw-r--r-- | test/vfd_swmr_addrem_writer.c | 221 |
1 files changed, 109 insertions, 112 deletions
diff --git a/test/vfd_swmr_addrem_writer.c b/test/vfd_swmr_addrem_writer.c index 9af54cc..5b153e1 100644 --- a/test/vfd_swmr_addrem_writer.c +++ b/test/vfd_swmr_addrem_writer.c @@ -32,8 +32,6 @@ /* Headers */ /***********/ - - #include "h5test.h" #include "vfd_swmr_common.h" #include "swmr_common.h" @@ -51,11 +49,9 @@ #include <err.h> /* errx(3) */ static hid_t open_skeleton(const char *filename, unsigned verbose); -static int addrem_records(hid_t fid, unsigned verbose, unsigned long nops, - unsigned long flush_count); -static void usage(void); +static int addrem_records(hid_t fid, unsigned verbose, unsigned long nops, unsigned long flush_count); +static void usage(void); - /*------------------------------------------------------------------------- * Function: open_skeleton * @@ -77,92 +73,92 @@ static void usage(void); static hid_t open_skeleton(const char *filename, unsigned verbose) { - hid_t dapl = H5I_INVALID_HID; - 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 dimension */ - unsigned u, v; /* Local index variable */ - H5F_vfd_swmr_config_t *config = NULL; /* Configuration for VFD SWMR */ + hid_t dapl = H5I_INVALID_HID; + 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 dimension */ + unsigned u, v; /* Local index variable */ + H5F_vfd_swmr_config_t *config = NULL; /* Configuration for VFD SWMR */ HDassert(filename); if ((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0) errx(EXIT_FAILURE, "%s.%d: H5Pcreate failed", __func__, __LINE__); - if (H5Pset_chunk_cache(dapl, H5D_CHUNK_CACHE_NSLOTS_DEFAULT, 0, - H5D_CHUNK_CACHE_W0_DEFAULT) < 0) + if (H5Pset_chunk_cache(dapl, H5D_CHUNK_CACHE_NSLOTS_DEFAULT, 0, H5D_CHUNK_CACHE_W0_DEFAULT) < 0) errx(EXIT_FAILURE, "H5Pset_chunk_cache failed"); - /* Allocate memory for the configuration structure */ - if((config = calloc(1, sizeof(*config))) == NULL) + /* Allocate memory for the configuration structure */ + if ((config = calloc(1, sizeof(*config))) == NULL) goto error; /* config, tick_len, max_lag, writer, flush_raw_data, md_pages_reserved, md_file_path */ - init_vfd_swmr_config(config, 4, 5 , TRUE, FALSE, 128, "./rw-shadow"); + init_vfd_swmr_config(config, 4, 5, TRUE, FALSE, 128, "./rw-shadow"); /* use_latest_format, use_vfd_swmr, only_meta_page, config */ - if((fapl = vfd_swmr_create_fapl(TRUE, TRUE, FALSE, config)) < 0) + if ((fapl = vfd_swmr_create_fapl(TRUE, TRUE, FALSE, config)) < 0) goto error; /* Open the file */ - if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) goto error; /* Close file access property list */ - if(H5Pclose(fapl) < 0) + if (H5Pclose(fapl) < 0) goto error; - if(config) + if (config) HDfree(config); /* Emit informational message */ - if(verbose) + if (verbose) HDfprintf(stderr, "WRITER: Opening datasets\n"); /* Open the datasets */ - for(u = 0; u < NLEVELS; u++) - for(v = 0; v < symbol_count[u]; v++) { + for (u = 0; u < NLEVELS; u++) + for (v = 0; v < symbol_count[u]; v++) { hid_t dsid; - if((dsid = H5Dopen2(fid, symbol_info[u][v].name, dapl)) < 0) + if ((dsid = H5Dopen2(fid, symbol_info[u][v].name, dapl)) < 0) goto error; symbol_info[u][v].dsid = dsid; - if((sid = H5Dget_space(symbol_info[u][v].dsid)) < 0) + if ((sid = H5Dget_space(symbol_info[u][v].dsid)) < 0) goto error; - if(2 != H5Sget_simple_extent_ndims(sid)) + if (2 != H5Sget_simple_extent_ndims(sid)) goto error; - if(H5Sget_simple_extent_dims(sid, dim, NULL) < 0) + if (H5Sget_simple_extent_dims(sid, dim, NULL) < 0) goto error; symbol_info[u][v].nrecords = dim[1]; - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) goto error; } /* end for */ return fid; error: - if(config) + if (config) HDfree(config); - H5E_BEGIN_TRY { - for(u = 0; u < NLEVELS; u++) - for(v = 0; v < symbol_count[u]; v++) + 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); H5Pclose(dapl); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } /* open_skeleton() */ - /*------------------------------------------------------------------------- * Function: addrem_records * @@ -189,14 +185,14 @@ error: static int addrem_records(hid_t fid, unsigned verbose, unsigned long nops, unsigned long flush_count) { - hid_t tid = -1; /* Datatype ID for records */ - hid_t mem_sid = -1; /* Memory dataspace ID */ - hid_t file_sid = -1; /* Dataset's space ID */ - hsize_t start[2] = {0, 0}, count[2] = {1, 1}; /* Hyperslab selection values */ - hsize_t dim[2] = {1, 0}; /* Dataspace dimensions */ - symbol_t buf[MAX_SIZE_CHANGE]; /* Write buffer */ - unsigned long op_to_flush; /* # of operations before flush */ - unsigned long u, v; /* Local index variables */ + hid_t tid = -1; /* Datatype ID for records */ + hid_t mem_sid = -1; /* Memory dataspace ID */ + hid_t file_sid = -1; /* Dataset's space ID */ + hsize_t start[2] = {0, 0}, count[2] = {1, 1}; /* Hyperslab selection values */ + hsize_t dim[2] = {1, 0}; /* Dataspace dimensions */ + symbol_t buf[MAX_SIZE_CHANGE]; /* Write buffer */ + unsigned long op_to_flush; /* # of operations before flush */ + unsigned long u, v; /* Local index variables */ HDassert(fid > 0); @@ -204,18 +200,18 @@ addrem_records(hid_t fid, unsigned verbose, unsigned long nops, unsigned long fl HDmemset(&buf, 0, sizeof(buf)); /* Create a dataspace for the record to add */ - if((mem_sid = H5Screate_simple(2, count, NULL)) < 0) + if ((mem_sid = H5Screate_simple(2, count, NULL)) < 0) goto error; /* Create datatype for appending records */ - if((tid = create_symbol_datatype()) < 0) + if ((tid = create_symbol_datatype()) < 0) goto error; /* Add and remove records to random datasets, according to frequency * distribution */ op_to_flush = flush_count; - for(u=0; u<nops; u++) { - symbol_info_t *symbol; /* Symbol to write record to */ + for (u = 0; u < nops; u++) { + symbol_info_t *symbol; /* Symbol to write record to */ /* Get a random dataset, according to the symbol distribution */ symbol = choose_dataset(NULL, NULL); @@ -223,93 +219,94 @@ addrem_records(hid_t fid, unsigned verbose, unsigned long nops, unsigned long fl /* Decide whether to shrink or expand, and by how much */ count[1] = (hsize_t)HDrandom() % (MAX_SIZE_CHANGE * 2) + 1; - if(count[1] > MAX_SIZE_CHANGE) { + if (count[1] > MAX_SIZE_CHANGE) { /* Add records */ count[1] -= MAX_SIZE_CHANGE; /* Set the buffer's IDs (equal to its position) */ - for(v=0; v<count[1]; v++) + for (v = 0; v < count[1]; v++) buf[v].rec_id = (uint64_t)symbol->nrecords + (uint64_t)v; /* Set the memory space to the correct size */ - if(H5Sset_extent_simple(mem_sid, 2, count, NULL) < 0) + if (H5Sset_extent_simple(mem_sid, 2, count, NULL) < 0) goto error; /* Get the coordinates to write */ start[1] = symbol->nrecords; - /* Extend the dataset's dataspace to hold the new record */ - symbol->nrecords+= count[1]; + /* Extend the dataset's dataspace to hold the new record */ + symbol->nrecords += count[1]; dim[1] = symbol->nrecords; - if(H5Dset_extent(symbol->dsid, dim) < 0) + if (H5Dset_extent(symbol->dsid, dim) < 0) goto error; /* Get the dataset's dataspace */ - if((file_sid = H5Dget_space(symbol->dsid)) < 0) + if ((file_sid = H5Dget_space(symbol->dsid)) < 0) goto error; /* Choose the last record in the dataset */ - if(H5Sselect_hyperslab(file_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0) + if (H5Sselect_hyperslab(file_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0) goto error; /* Write record to the dataset */ - if(H5Dwrite(symbol->dsid, tid, mem_sid, file_sid, H5P_DEFAULT, &buf) < 0) + if (H5Dwrite(symbol->dsid, tid, mem_sid, file_sid, H5P_DEFAULT, &buf) < 0) goto error; - if(H5Dflush(symbol->dsid) < 0) + if (H5Dflush(symbol->dsid) < 0) goto error; /* Close the dataset's dataspace */ - if(H5Sclose(file_sid) < 0) + if (H5Sclose(file_sid) < 0) goto error; } /* end if */ else { /* Shrink the dataset's dataspace */ - if(count[1] > symbol->nrecords) + if (count[1] > symbol->nrecords) symbol->nrecords = 0; else symbol->nrecords -= count[1]; dim[1] = symbol->nrecords; - if(H5Dset_extent(symbol->dsid, dim) < 0) + if (H5Dset_extent(symbol->dsid, dim) < 0) goto error; } /* end else */ /* Check for flushing file */ - if(flush_count > 0) { + if (flush_count > 0) { /* Decrement count of records to write before flushing */ op_to_flush--; /* Check for counter being reached */ - if(0 == op_to_flush) { + if (0 == op_to_flush) { /* Reset flush counter */ op_to_flush = flush_count; } /* end if */ - } /* end if */ - } /* end for */ + } /* end if */ + } /* end for */ /* Emit informational message */ - if(verbose) + if (verbose) 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) + for (u = 0; u < NLEVELS; u++) + for (v = 0; v < symbol_count[u]; v++) + if (H5Dclose(symbol_info[u][v].dsid) < 0) return -1; return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(mem_sid); H5Sclose(file_sid); H5Tclose(tid); - for(u = 0; u < NLEVELS; u++) - for(v = 0; v < symbol_count[u]; v++) + for (u = 0; u < NLEVELS; u++) + for (v = 0; v < symbol_count[u]; v++) H5Dclose(symbol_info[u][v].dsid); - - } H5E_END_TRY; + } + H5E_END_TRY; return -1; @@ -335,32 +332,33 @@ usage(void) HDexit(1); } /* usage() */ -int main(int argc, const char *argv[]) +int +main(int argc, const char *argv[]) { sigset_t oldset; - hid_t fid; /* File ID for file opened */ - long nops = 0; /* # of times to grow or shrink the dataset */ - long flush_count = 1000; /* # of records to write between flushing file */ - unsigned verbose = 1; /* Whether to emit some informational messages */ - unsigned use_seed = 0; /* Set to 1 if a seed was set on the command line */ - unsigned random_seed = 0; /* Random # seed */ - unsigned u; /* Local index variable */ - int temp; + hid_t fid; /* File ID for file opened */ + long nops = 0; /* # of times to grow or shrink the dataset */ + long flush_count = 1000; /* # of records to write between flushing file */ + unsigned verbose = 1; /* Whether to emit some informational messages */ + unsigned use_seed = 0; /* Set to 1 if a seed was set on the command line */ + unsigned random_seed = 0; /* Random # seed */ + unsigned u; /* Local index variable */ + int temp; block_signals(&oldset); /* Parse command line options */ - if(argc < 2) + if (argc < 2) usage(); - if(argc > 1) { + if (argc > 1) { u = 1; - while(u < (unsigned)argc) { - if(argv[u][0] == '-') { - switch(argv[u][1]) { + while (u < (unsigned)argc) { + if (argv[u][0] == '-') { + switch (argv[u][1]) { /* # of records to write between flushing file */ case 'f': flush_count = HDatol(argv[u + 1]); - if(flush_count < 0) + if (flush_count < 0) usage(); u += 2; break; @@ -370,12 +368,12 @@ int main(int argc, const char *argv[]) verbose = 0; u++; break; - + /* Random # seed */ case 'r': use_seed = 1; - temp = HDatoi(argv[u + 1]); - if(temp < 0) + temp = HDatoi(argv[u + 1]); + if (temp < 0) usage(); else random_seed = (unsigned)temp; @@ -386,31 +384,31 @@ int main(int argc, const char *argv[]) usage(); break; } /* end switch */ - } /* end if */ + } /* end if */ else { /* Get the number of records to append */ nops = HDatol(argv[u]); - if(nops <= 0) + if (nops <= 0) usage(); u++; } /* end else */ - } /* end while */ - } /* end if */ - if(nops <= 0) + } /* end while */ + } /* end if */ + if (nops <= 0) usage(); - if(flush_count >= nops) + if (flush_count >= nops) usage(); /* Emit informational message */ - if(verbose) { + if (verbose) { HDfprintf(stderr, "WRITER: Parameters:\n"); HDfprintf(stderr, "\t# of operations between flushes = %ld\n", flush_count); HDfprintf(stderr, "\t# of operations = %ld\n", nops); } /* end if */ /* Set the random seed */ - if(0 == use_seed) { + if (0 == use_seed) { struct timeval t; HDgettimeofday(&t, NULL); random_seed = (unsigned)(t.tv_usec); @@ -420,21 +418,20 @@ int main(int argc, const char *argv[]) HDfprintf(stderr, "WRITER: Using writer random seed: %u\n", random_seed); /* Emit informational message */ - if(verbose) + if (verbose) HDfprintf(stderr, "WRITER: Generating symbol names\n"); /* Generate dataset names */ - if(generate_symbols() < 0) + if (generate_symbols() < 0) return -1; /* Emit informational message */ - if(verbose) { - HDfprintf(stderr, "WRITER: Opening skeleton file: %s\n", - VFD_SWMR_FILENAME); + if (verbose) { + HDfprintf(stderr, "WRITER: Opening skeleton file: %s\n", VFD_SWMR_FILENAME); } /* Open file skeleton */ - if((fid = open_skeleton(VFD_SWMR_FILENAME, verbose)) < 0) { + if ((fid = open_skeleton(VFD_SWMR_FILENAME, verbose)) < 0) { HDfprintf(stderr, "WRITER: Error opening skeleton file!\n"); HDexit(1); } /* end if */ @@ -443,21 +440,21 @@ int main(int argc, const char *argv[]) h5_send_message(VFD_SWMR_WRITER_MESSAGE, NULL, NULL); /* Emit informational message */ - if(verbose) + if (verbose) HDfprintf(stderr, "WRITER: Adding and removing records\n"); /* Grow and shrink datasets */ - if(addrem_records(fid, verbose, (unsigned long)nops, (unsigned long)flush_count) < 0) { + if (addrem_records(fid, verbose, (unsigned long)nops, (unsigned long)flush_count) < 0) { HDfprintf(stderr, "WRITER: Error adding and removing records from datasets!\n"); HDexit(1); } /* end if */ /* Emit informational message */ - if(verbose) + if (verbose) HDfprintf(stderr, "WRITER: Releasing symbols\n"); /* Clean up the symbols */ - if(shutdown_symbols() < 0) { + if (shutdown_symbols() < 0) { HDfprintf(stderr, "WRITER: Error releasing symbols!\n"); HDexit(1); } /* end if */ @@ -467,11 +464,11 @@ int main(int argc, const char *argv[]) restore_signals(&oldset); /* Emit informational message */ - if(verbose) + if (verbose) HDfprintf(stderr, "WRITER: Closing objects\n"); /* Close objects opened */ - if(H5Fclose(fid) < 0) { + if (H5Fclose(fid) < 0) { HDfprintf(stderr, "WRITER: Error closing file!\n"); HDexit(1); } /* end if */ |