diff options
author | github-actions <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-03 22:02:43 (GMT) |
---|---|---|
committer | github-actions <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-03 22:02:43 (GMT) |
commit | 0ca65235b7476e1a09f371afaa1407d127da29fe (patch) | |
tree | 3e9628ea03e6c5c95e38b6f507a3cd8ef9e4ea2e /test/vfd_swmr_attrdset_writer.c | |
parent | 20c328e2d578570c5123fe222b41eb8a85814673 (diff) | |
download | hdf5-0ca65235b7476e1a09f371afaa1407d127da29fe.zip hdf5-0ca65235b7476e1a09f371afaa1407d127da29fe.tar.gz hdf5-0ca65235b7476e1a09f371afaa1407d127da29fe.tar.bz2 |
Committing clang-format changes
Diffstat (limited to 'test/vfd_swmr_attrdset_writer.c')
-rw-r--r-- | test/vfd_swmr_attrdset_writer.c | 1059 |
1 files changed, 535 insertions, 524 deletions
diff --git a/test/vfd_swmr_attrdset_writer.c b/test/vfd_swmr_attrdset_writer.c index 7800727..dea5841 100644 --- a/test/vfd_swmr_attrdset_writer.c +++ b/test/vfd_swmr_attrdset_writer.c @@ -16,14 +16,14 @@ * Dataset types: * --dataset with compact layout * --dataset with contiguous layout - * --dataset with chunked layout: + * --dataset with chunked layout: * 1. single indexing type * 2. implicit indexing type * 3. fixed array indexing type * 4. extensible array indexing type * 5. version btree 2 indexing type * Attribute handling: - * -- Add attribute + * -- Add attribute * -- Delete attribute * -- Modify attribute * -- Add variable length attribute @@ -48,119 +48,106 @@ #ifndef H5_HAVE_WIN32_API -#define READER_WAIT_TICKS 4 +#define READER_WAIT_TICKS 4 /* Structure to hold info for options specified */ typedef struct { - hid_t file; /* File ID */ - hid_t filetype; /* ID for default datatype */ - hid_t one_by_one_sid; /* ID for default dataspace */ - char filename[PATH_MAX]; /* File name */ - char progname[PATH_MAX]; /* Program name */ - unsigned int update_interval; /* For -u option */ - unsigned int asteps; /* For -a <nattrs> option */ - unsigned int csteps; /* For -c <csteps> option */ - unsigned int dattrs; /* For -d <dattrs> option */ - bool compact; /* For -p option */ - bool contig; /* For -g option */ - bool chunked; /* For -k option */ - bool vl_attr; /* For -v option */ - bool mod_attr; /* For -m option */ - bool use_np; /* For -N option */ - bool use_vfd_swmr; /* For -S option */ + hid_t file; /* File ID */ + hid_t filetype; /* ID for default datatype */ + hid_t one_by_one_sid; /* ID for default dataspace */ + char filename[PATH_MAX]; /* File name */ + char progname[PATH_MAX]; /* Program name */ + unsigned int update_interval; /* For -u option */ + unsigned int asteps; /* For -a <nattrs> option */ + unsigned int csteps; /* For -c <csteps> option */ + unsigned int dattrs; /* For -d <dattrs> option */ + bool compact; /* For -p option */ + bool contig; /* For -g option */ + bool chunked; /* For -k option */ + bool vl_attr; /* For -v option */ + bool mod_attr; /* For -m option */ + bool use_np; /* For -N option */ + bool use_vfd_swmr; /* For -S option */ } state_t; /* Initializations for state_t */ -#define ALL_HID_INITIALIZER (state_t) { \ - .file = H5I_INVALID_HID \ - , .one_by_one_sid = H5I_INVALID_HID \ - , .filename = "" \ - , .filetype = H5T_NATIVE_UINT32 \ - , .asteps = 0 \ - , .csteps = 1 \ - , .dattrs = 0 \ - , .use_np = true \ - , .use_vfd_swmr = true \ - , .compact = false \ - , .contig = false \ - , .chunked = false \ - , .vl_attr = false \ - , .mod_attr = false \ - , .update_interval = READER_WAIT_TICKS } +#define ALL_HID_INITIALIZER \ + (state_t) \ + { \ + .file = H5I_INVALID_HID, .one_by_one_sid = H5I_INVALID_HID, .filename = "", \ + .filetype = H5T_NATIVE_UINT32, .asteps = 0, .csteps = 1, .dattrs = 0, .use_np = true, \ + .use_vfd_swmr = true, .compact = false, .contig = false, .chunked = false, .vl_attr = false, \ + .mod_attr = false, .update_interval = READER_WAIT_TICKS \ + } /* Structure to hold info for different dataset types */ typedef struct { - hid_t compact_did; /* ID for compact dataset */ - hid_t contig_did; /* ID for contiguous dataset */ - hid_t single_did; /* ID for chunked dataset: single index */ - hid_t implicit_did; /* ID for chunked dataset: implicit index */ - hid_t fa_did; /* ID for chunked dataset: fixed array index */ - hid_t ea_did; /* ID for chunked dataset: extensible array index */ - hid_t bt2_did; /* ID for chunked dataset: version 2 btree index */ - unsigned p_max_compact; /* Value of max_compact storage for -p */ - unsigned g_max_compact; /* Value of max_compact storage for -g */ - unsigned single_max_compact; /* Value of max_compact storage for -k: single index */ - unsigned implicit_max_compact; /* Value of max_compact storage for -k: implicit index */ - unsigned fa_max_compact; /* Value of max_compact storage for -k: fixed array index */ - unsigned ea_max_compact; /* Value of max_compact storage for -k: extensible array index */ - unsigned bt2_max_compact; /* Value of max_compact storage for -k: version 2 btree index */ - unsigned p_min_dense; /* Value of min_dense storage for -p */ - unsigned g_min_dense; /* Value of min_dense storage for -g */ - unsigned single_min_dense; /* Value of min_dense storage for -k: single index */ - unsigned implicit_min_dense; /* Value of min_dense storage for -k: implicit index */ - unsigned fa_min_dense; /* Value of min_dense storage for -k: fixed array index */ - unsigned ea_min_dense; /* Value of min_dense storage for -k: extensible array index */ - unsigned bt2_min_dense; /* Value of min_dense storage for -k: version 2 btree index */ + hid_t compact_did; /* ID for compact dataset */ + hid_t contig_did; /* ID for contiguous dataset */ + hid_t single_did; /* ID for chunked dataset: single index */ + hid_t implicit_did; /* ID for chunked dataset: implicit index */ + hid_t fa_did; /* ID for chunked dataset: fixed array index */ + hid_t ea_did; /* ID for chunked dataset: extensible array index */ + hid_t bt2_did; /* ID for chunked dataset: version 2 btree index */ + unsigned p_max_compact; /* Value of max_compact storage for -p */ + unsigned g_max_compact; /* Value of max_compact storage for -g */ + unsigned single_max_compact; /* Value of max_compact storage for -k: single index */ + unsigned implicit_max_compact; /* Value of max_compact storage for -k: implicit index */ + unsigned fa_max_compact; /* Value of max_compact storage for -k: fixed array index */ + unsigned ea_max_compact; /* Value of max_compact storage for -k: extensible array index */ + unsigned bt2_max_compact; /* Value of max_compact storage for -k: version 2 btree index */ + unsigned p_min_dense; /* Value of min_dense storage for -p */ + unsigned g_min_dense; /* Value of min_dense storage for -g */ + unsigned single_min_dense; /* Value of min_dense storage for -k: single index */ + unsigned implicit_min_dense; /* Value of min_dense storage for -k: implicit index */ + unsigned fa_min_dense; /* Value of min_dense storage for -k: fixed array index */ + unsigned ea_min_dense; /* Value of min_dense storage for -k: extensible array index */ + unsigned bt2_min_dense; /* Value of min_dense storage for -k: version 2 btree index */ } dsets_state_t; /* Initializations for dsets_state_t */ -#define DSETS_INITIALIZER (dsets_state_t) { \ - .compact_did = H5I_INVALID_HID \ - , .contig_did = H5I_INVALID_HID \ - , .single_did = H5I_INVALID_HID \ - , .implicit_did = H5I_INVALID_HID \ - , .fa_did = H5I_INVALID_HID \ - , .ea_did = H5I_INVALID_HID \ - , .bt2_did = H5I_INVALID_HID \ - , .p_max_compact = 0 \ - , .g_max_compact = 0 \ - , .single_max_compact = 0 \ - , .implicit_max_compact = 0 \ - , .fa_max_compact = 0 \ - , .ea_max_compact = 0 \ - , .bt2_max_compact = 0 } +#define DSETS_INITIALIZER \ + (dsets_state_t) \ + { \ + .compact_did = H5I_INVALID_HID, .contig_did = H5I_INVALID_HID, .single_did = H5I_INVALID_HID, \ + .implicit_did = H5I_INVALID_HID, .fa_did = H5I_INVALID_HID, .ea_did = H5I_INVALID_HID, \ + .bt2_did = H5I_INVALID_HID, .p_max_compact = 0, .g_max_compact = 0, .single_max_compact = 0, \ + .implicit_max_compact = 0, .fa_max_compact = 0, .ea_max_compact = 0, .bt2_max_compact = 0 \ + } /* Structure to hold info for named pipes */ typedef struct { - const char *fifo_writer_to_reader; /* Name of fifo for writer to reader */ - const char *fifo_reader_to_writer; /* Name of fifo for reader to writer */ - int fd_writer_to_reader; /* File ID for fifo from writer to reader */ - int fd_reader_to_writer; /* File ID for fifo from reader to writer */ - int notify; /* Value to notify between writer and reader */ - int verify; /* Value to verify between writer and reader */ + const char *fifo_writer_to_reader; /* Name of fifo for writer to reader */ + const char *fifo_reader_to_writer; /* Name of fifo for reader to writer */ + int fd_writer_to_reader; /* File ID for fifo from writer to reader */ + int fd_reader_to_writer; /* File ID for fifo from reader to writer */ + int notify; /* Value to notify between writer and reader */ + int verify; /* Value to verify between writer and reader */ } np_state_t; /* Initializations for np_state_t */ -#define NP_INITIALIZER (np_state_t) { \ - .fifo_writer_to_reader = "./fifo_attrdset_writer_to_reader" \ - , .fifo_reader_to_writer = "./fifo_attrdset_reader_to_writer" \ - , .fd_writer_to_reader = -1 \ - , .fd_reader_to_writer = -1 \ - , .notify = 0 \ - , .verify = 0 } +#define NP_INITIALIZER \ + (np_state_t) \ + { \ + .fifo_writer_to_reader = "./fifo_attrdset_writer_to_reader", \ + .fifo_reader_to_writer = "./fifo_attrdset_reader_to_writer", .fd_writer_to_reader = -1, \ + .fd_reader_to_writer = -1, .notify = 0, .verify = 0 \ + } static bool state_init(state_t *, int, char **); static bool np_init(np_state_t *np, bool writer); static bool np_close(np_state_t *np, bool writer); -static bool np_writer(bool result, unsigned step, const state_t *s, np_state_t *np, H5F_vfd_swmr_config_t *config); +static bool np_writer(bool result, unsigned step, const state_t *s, np_state_t *np, + H5F_vfd_swmr_config_t *config); static bool np_reader(bool result, unsigned step, const state_t *s, np_state_t *np); static bool np_confirm_verify_notify(int fd, unsigned step, const state_t *s, np_state_t *np); -static bool np_reader_no_verification(const state_t *s, np_state_t *np, H5F_vfd_swmr_config_t *config); +static bool np_reader_no_verification(const state_t *s, np_state_t *np, H5F_vfd_swmr_config_t *config); static bool create_dsets(const state_t *s, dsets_state_t *ds); static bool open_dsets(const state_t *s, dsets_state_t *ds); -static bool open_dset_real(hid_t fid, hid_t *did, const char *name, unsigned *max_compact, unsigned *min_dense); +static bool open_dset_real(hid_t fid, hid_t *did, const char *name, unsigned *max_compact, + unsigned *min_dense); static bool close_dsets(const dsets_state_t *ds); static bool attr_dsets_action(unsigned action, const state_t *s, const dsets_state_t *ds, unsigned which); @@ -169,59 +156,62 @@ static bool add_attr(const state_t *s, hid_t did, unsigned int which); static bool modify_attr(const state_t *s, hid_t did, unsigned int which); static bool delete_attr(hid_t did, unsigned int which); -static bool verify_attr_dsets_action(unsigned action, const state_t *s, const dsets_state_t *ds, unsigned which); +static bool verify_attr_dsets_action(unsigned action, const state_t *s, const dsets_state_t *ds, + unsigned which); static bool verify_attr_action(unsigned action, hid_t did, unsigned which); static bool verify_add_or_modify_attr(unsigned action, hid_t did, char *attr_name, unsigned int which); static bool verify_delete_attr(hid_t did, char *attr_name); -static bool verify_storage_cont(unsigned action, hid_t did, unsigned int which, unsigned max_compact, unsigned min_dense, unsigned asteps); +static bool verify_storage_cont(unsigned action, hid_t did, unsigned int which, unsigned max_compact, + unsigned min_dense, unsigned asteps); static bool verify_storage_cont_real(hid_t did, unsigned int which, unsigned cut_point); static const hid_t badhid = H5I_INVALID_HID; /* Names for datasets */ -#define DSET_COMPACT_NAME "compact_dset" -#define DSET_CONTIG_NAME "contig_dset" -#define DSET_SINGLE_NAME "chunked_single" -#define DSET_IMPLICIT_NAME "chunked_implicit" -#define DSET_FA_NAME "chunked_fa" -#define DSET_EA_NAME "chunked_ea" -#define DSET_BT2_NAME "chunked_bt2" +#define DSET_COMPACT_NAME "compact_dset" +#define DSET_CONTIG_NAME "contig_dset" +#define DSET_SINGLE_NAME "chunked_single" +#define DSET_IMPLICIT_NAME "chunked_implicit" +#define DSET_FA_NAME "chunked_fa" +#define DSET_EA_NAME "chunked_ea" +#define DSET_BT2_NAME "chunked_bt2" /* Action for attribute handling */ -#define ADD_ATTR 1 -#define MODIFY_ATTR 2 -#define DELETE_ATTR 3 +#define ADD_ATTR 1 +#define MODIFY_ATTR 2 +#define DELETE_ATTR 3 /* Test program usage info */ static void usage(const char *progname) { - fprintf(stderr, "usage: %s -a nattrs [-p] [-g] [-k] [-v] [-m]\n" - " [-d dattrs] [-u nticks] [-c csteps] [-S] [-N]\n" - "\n" - "-p: create a dataset with compact layout\n" - "-g: create a dataset with contiguous layout\n" - "-k: create datasets with chunked layout for the 5 indexing types\n" - "-m: modify attributes to all datasets after addition\n" - "-v: add variable length attribute to datasets\n" - " (default is H5T_NATIVE_UINT32)\n" - "-a nattrs: add `nattrs` attributes to all datasets\n" - "-d dattrs: delete `dattrs` attributes to all datasets after addition\n" - "-u nticks: `nticks` ticks for the reader to wait before verification\n" - " (default is 4)\n" - "-c csteps: `csteps` steps communication interval between reader and writer\n" - " (default is 1)\n" - "-S: do not use VFD SWMR\n" - "-N: do not use named pipes for test synchronization\n" - "-b: write data in big-endian byte order if no -v option\n" - " (default is H5T_NATIVE_UINT32)\n\n" - "Note:\n" - "1. Require to specify at least -p, -g or -k option\n" - "2. -c <csteps> option cannot exceed -a <nattrs> option\n" - "3. -d <dattrs> option cannot exceed -a <nattrs> option\n" - "\n", - progname); - exit(EXIT_FAILURE); + fprintf(stderr, + "usage: %s -a nattrs [-p] [-g] [-k] [-v] [-m]\n" + " [-d dattrs] [-u nticks] [-c csteps] [-S] [-N]\n" + "\n" + "-p: create a dataset with compact layout\n" + "-g: create a dataset with contiguous layout\n" + "-k: create datasets with chunked layout for the 5 indexing types\n" + "-m: modify attributes to all datasets after addition\n" + "-v: add variable length attribute to datasets\n" + " (default is H5T_NATIVE_UINT32)\n" + "-a nattrs: add `nattrs` attributes to all datasets\n" + "-d dattrs: delete `dattrs` attributes to all datasets after addition\n" + "-u nticks: `nticks` ticks for the reader to wait before verification\n" + " (default is 4)\n" + "-c csteps: `csteps` steps communication interval between reader and writer\n" + " (default is 1)\n" + "-S: do not use VFD SWMR\n" + "-N: do not use named pipes for test synchronization\n" + "-b: write data in big-endian byte order if no -v option\n" + " (default is H5T_NATIVE_UINT32)\n\n" + "Note:\n" + "1. Require to specify at least -p, -g or -k option\n" + "2. -c <csteps> option cannot exceed -a <nattrs> option\n" + "3. -d <dattrs> option cannot exceed -a <nattrs> option\n" + "\n", + progname); + exit(EXIT_FAILURE); } /* usage() */ /* @@ -231,10 +221,10 @@ static bool state_init(state_t *s, int argc, char **argv) { unsigned long tmp; - int ch; + int ch; const hsize_t dims = 1; - char tfile[PATH_MAX]; - char *end; + char tfile[PATH_MAX]; + char * end; *s = ALL_HID_INITIALIZER; esnprintf(tfile, sizeof(tfile), "%s", argv[0]); @@ -243,94 +233,96 @@ state_init(state_t *s, int argc, char **argv) while ((ch = getopt(argc, argv, "pgkvmbqSNa:d:u:c:")) != -1) { switch (ch) { - case 'p': - s->compact = true; - break; - - case 'g': - s->contig = true; - break; - - case 'k': - s->chunked = true; - break; - - case 'v': - s->vl_attr = true; - break; - - case 'm': - s->mod_attr = true; - break; - case 'b': - s->filetype = H5T_STD_U32BE; - break; - case 'q': - verbosity = 0; - break; - case 'S': - s->use_vfd_swmr = false; - break; - case 'N': - s->use_np = false; - break; - case 'a': - case 'd': - case 'u': - case 'c': - errno = 0; - tmp = strtoul(optarg, &end, 0); - if (end == optarg || *end != '\0') { - printf("couldn't parse `-%c` argument `%s`\n", ch, optarg); - TEST_ERROR; - } else if (errno != 0) { - printf("couldn't parse `-%c` argument `%s`\n", ch, optarg); - TEST_ERROR; - } else if (tmp > UINT_MAX) { - printf("`-%c` argument `%lu` too large\n", ch, tmp); - TEST_ERROR; - } + case 'p': + s->compact = true; + break; + + case 'g': + s->contig = true; + break; + + case 'k': + s->chunked = true; + break; + + case 'v': + s->vl_attr = true; + break; + + case 'm': + s->mod_attr = true; + break; + case 'b': + s->filetype = H5T_STD_U32BE; + break; + case 'q': + verbosity = 0; + break; + case 'S': + s->use_vfd_swmr = false; + break; + case 'N': + s->use_np = false; + break; + case 'a': + case 'd': + case 'u': + case 'c': + errno = 0; + tmp = strtoul(optarg, &end, 0); + if (end == optarg || *end != '\0') { + printf("couldn't parse `-%c` argument `%s`\n", ch, optarg); + TEST_ERROR; + } + else if (errno != 0) { + printf("couldn't parse `-%c` argument `%s`\n", ch, optarg); + TEST_ERROR; + } + else if (tmp > UINT_MAX) { + printf("`-%c` argument `%lu` too large\n", ch, tmp); + TEST_ERROR; + } - if (ch == 'a') - s->asteps = (unsigned)tmp; - else if (ch == 'd') - s->dattrs = (unsigned)tmp; - else if (ch == 'u') - s->update_interval = (unsigned)tmp; - else if (ch == 'c') - s->csteps = (unsigned)tmp; - break; + if (ch == 'a') + s->asteps = (unsigned)tmp; + else if (ch == 'd') + s->dattrs = (unsigned)tmp; + else if (ch == 'u') + s->update_interval = (unsigned)tmp; + else if (ch == 'c') + s->csteps = (unsigned)tmp; + break; - case '?': - default: - usage(s->progname); - break; + case '?': + default: + usage(s->progname); + break; } } argc -= optind; argv += optind; /* Require to specify at least -p, -g or -k option */ - if(!s->compact && !s->contig && !s->chunked) { + if (!s->compact && !s->contig && !s->chunked) { printf("Require to specify at least -p, -g or -k option\n"); usage(s->progname); goto error; } /* -c <csteps> cannot be zero */ - if(!s->csteps) { + if (!s->csteps) { printf("communication interval cannot be zero\n"); TEST_ERROR; } /* -c <csteps> and -a <nattrs> options */ - if(s->asteps && s->csteps > s->asteps) { + if (s->asteps && s->csteps > s->asteps) { printf("communication interval is out of bounds\n"); TEST_ERROR; } /* -d and -a */ - if(s->dattrs > s->asteps) { + if (s->dattrs > s->asteps) { printf("# of attributes to be deleted exceeds # of attributes created\n"); TEST_ERROR; } @@ -358,152 +350,152 @@ error: static bool create_dsets(const state_t *s, dsets_state_t *ds) { - hid_t dcpl = badhid; - hid_t dtid = badhid; - hid_t tmp_did = badhid; - hid_t cmpd_tid = badhid; + hid_t dcpl = badhid; + hid_t dtid = badhid; + hid_t tmp_did = badhid; + hid_t cmpd_tid = badhid; hid_t array_tid = badhid; - hid_t vl_tid = badhid; - hid_t sid = badhid; + hid_t vl_tid = badhid; + hid_t sid = badhid; *ds = DSETS_INITIALIZER; /* Dataset with compact layout, compound datatype */ - if(s->compact) { + if (s->compact) { const hsize_t dims = 2; - typedef struct { + typedef struct { int a; int b[2]; } cmpd; - cmpd wdata; /* Data for compact dataset */ + cmpd wdata; /* Data for compact dataset */ - wdata.a = 1; + wdata.a = 1; wdata.b[0] = 2; wdata.b[1] = 3; - if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { + if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { printf("H5Pcreate failed\n"); TEST_ERROR; } - if(H5Pset_layout(dcpl, H5D_COMPACT) < 0) { + if (H5Pset_layout(dcpl, H5D_COMPACT) < 0) { printf("H5Pset_layout failed\n"); TEST_ERROR; } /* Create compound datatype */ - if((cmpd_tid = H5Tcreate(H5T_COMPOUND, sizeof(cmpd))) < 0) { + if ((cmpd_tid = H5Tcreate(H5T_COMPOUND, sizeof(cmpd))) < 0) { printf("H5Tcreate failed\n"); TEST_ERROR; } /* Create the array for the second element in the compound type */ - if((array_tid = H5Tarray_create2(H5T_NATIVE_INT, 1, &dims)) < 0) { + if ((array_tid = H5Tarray_create2(H5T_NATIVE_INT, 1, &dims)) < 0) { printf("H5Tarray_create2 failed\n"); TEST_ERROR; } /* First element in the compound type */ - if(H5Tinsert(cmpd_tid, "a", HOFFSET(cmpd, a), H5T_NATIVE_INT) < 0) { + if (H5Tinsert(cmpd_tid, "a", HOFFSET(cmpd, a), H5T_NATIVE_INT) < 0) { printf("H5Tinsert failed\n"); TEST_ERROR; } /* Second element in the compound type */ - if(H5Tinsert(cmpd_tid, "b", HOFFSET(cmpd, b), array_tid) < 0) { + if (H5Tinsert(cmpd_tid, "b", HOFFSET(cmpd, b), array_tid) < 0) { printf("H5Tinsert failed\n"); TEST_ERROR; } /* Create the compact dataset with compound datatype */ - if((ds->compact_did = H5Dcreate2(s->file, DSET_COMPACT_NAME, cmpd_tid, - s->one_by_one_sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { + if ((ds->compact_did = H5Dcreate2(s->file, DSET_COMPACT_NAME, cmpd_tid, s->one_by_one_sid, + H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { printf("H5Dcreate2 compact dataset failed\n"); TEST_ERROR; } /* Write data to the dataset */ - if(H5Dwrite(ds->compact_did, cmpd_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata) < 0) { + if (H5Dwrite(ds->compact_did, cmpd_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata) < 0) { printf("H5Dwrite to compact dataset failed\n"); TEST_ERROR; } /* In order to trigger continuation block if -p is used alone by itself */ - if((tmp_did = H5Dcreate2(s->file, "JUNK_IGNORE", cmpd_tid, - s->one_by_one_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { + if ((tmp_did = H5Dcreate2(s->file, "JUNK_IGNORE", cmpd_tid, s->one_by_one_sid, H5P_DEFAULT, + H5P_DEFAULT, H5P_DEFAULT)) < 0) { printf("H5Dcreate2 failed\n"); TEST_ERROR; } - if(H5Dclose(tmp_did) < 0) { + if (H5Dclose(tmp_did) < 0) { printf("H5Dclose failed\n"); TEST_ERROR; } - if(H5Pclose(dcpl) < 0) { + if (H5Pclose(dcpl) < 0) { printf("H5Pclose failed\n"); TEST_ERROR; } } /* Dataset with contiguous layout, early allocation, non-default attr phase change, named datatype */ - if(s->contig) { - int wdata1 = 9; /* Data for contiguous dataset */ + if (s->contig) { + int wdata1 = 9; /* Data for contiguous dataset */ unsigned def_max_compact = 0; - unsigned def_min_dense = 0; + unsigned def_min_dense = 0; - if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { + if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { printf("H5Pcreate failed\n"); TEST_ERROR; } - if(H5Pset_layout(dcpl, H5D_CONTIGUOUS) < 0) { + if (H5Pset_layout(dcpl, H5D_CONTIGUOUS) < 0) { printf("H5Pset_layout failed\n"); TEST_ERROR; } - if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) { + if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) { printf("H5Pset_alloc_time failed\n"); TEST_ERROR; } - if(H5Pget_attr_phase_change(dcpl, &def_max_compact, &def_min_dense) < 0) { + if (H5Pget_attr_phase_change(dcpl, &def_max_compact, &def_min_dense) < 0) { printf("H5Pget_attr_phase_change failed\n"); TEST_ERROR; } - if(H5Pset_attr_phase_change(dcpl, def_max_compact+2, def_min_dense+2) < 0) { + if (H5Pset_attr_phase_change(dcpl, def_max_compact + 2, def_min_dense + 2) < 0) { printf("H5Pset_attr_phase_change failed\n"); TEST_ERROR; } /* Create the named datatype */ - if((dtid = H5Tcopy(H5T_NATIVE_INT)) < 0) { + if ((dtid = H5Tcopy(H5T_NATIVE_INT)) < 0) { printf("H5Tcopy failed\n"); TEST_ERROR; } - if(H5Tcommit2(s->file, "named_dtype", dtid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { + if (H5Tcommit2(s->file, "named_dtype", dtid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { printf("H5Tcommit2 failed\n"); TEST_ERROR; } - + /* Create the contiguous dataset with the named datatype */ - if((ds->contig_did = H5Dcreate2(s->file, DSET_CONTIG_NAME, dtid, - s->one_by_one_sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { + if ((ds->contig_did = H5Dcreate2(s->file, DSET_CONTIG_NAME, dtid, s->one_by_one_sid, H5P_DEFAULT, + dcpl, H5P_DEFAULT)) < 0) { printf("H5Dcreate2 contiguous dataset failed\n"); TEST_ERROR; } /* Write to the dataset */ - if(H5Dwrite(ds->contig_did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) { + if (H5Dwrite(ds->contig_did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) { printf("H5Dwrite to contiguous dataset failed\n"); TEST_ERROR; } - if(H5Pclose(dcpl) < 0) { + if (H5Pclose(dcpl) < 0) { printf("H5Pclose failed\n"); TEST_ERROR; } - if(H5Tclose(dtid) < 0) { + if (H5Tclose(dtid) < 0) { printf("H5Tclose failed\n"); TEST_ERROR; } @@ -511,29 +503,28 @@ create_dsets(const state_t *s, dsets_state_t *ds) /* Datasets with the 5 indexes: single, implicit, fa, ea, bt2 */ /* All with variable length datatype */ - if(s->chunked) { - + if (s->chunked) { + /* For index: single, implicit and fa */ - hsize_t dims1[1] = {5}; - hsize_t max_dims1[1] = {100}; + hsize_t dims1[1] = {5}; + hsize_t max_dims1[1] = {100}; hsize_t chunk_dims1[1] = {2}; /* The variable length data */ - const char *vdata[5] = {"one", "two", "three", "four", "five" }; - + const char *vdata[5] = {"one", "two", "three", "four", "five"}; + /* For index: ea and bt2 */ - hsize_t dims2[2] = {5, 5}; - hsize_t max_dims2[2] = {100, H5S_UNLIMITED}; - hsize_t chunk_dims2[2] = {2, 2}; - const char *vdata2[5][5] = { - { "one", "two", "three", "four", "five" }, - { "two", "three", "four", "five", "six" }, - { "three", "four", "five", "six", "seven" }, - { "four", "five", "six", "seven", "eight" }, - { "five", "six", "seven", "eight", "nine" } }; + hsize_t dims2[2] = {5, 5}; + hsize_t max_dims2[2] = {100, H5S_UNLIMITED}; + hsize_t chunk_dims2[2] = {2, 2}; + const char *vdata2[5][5] = {{"one", "two", "three", "four", "five"}, + {"two", "three", "four", "five", "six"}, + {"three", "four", "five", "six", "seven"}, + {"four", "five", "six", "seven", "eight"}, + {"five", "six", "seven", "eight", "nine"}}; /* Create variable length datatype */ - if((vl_tid = H5Tcopy(H5T_C_S1)) < 0) { + if ((vl_tid = H5Tcopy(H5T_C_S1)) < 0) { printf("H5Tcopy failed\n"); TEST_ERROR; } @@ -543,36 +534,36 @@ create_dsets(const state_t *s, dsets_state_t *ds) TEST_ERROR; } - if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { + if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { printf("H5Pcreate failed\n"); TEST_ERROR; } - if(H5Pset_layout(dcpl, H5D_CHUNKED) < 0) { + if (H5Pset_layout(dcpl, H5D_CHUNKED) < 0) { printf("H5Pset_layout failed\n"); TEST_ERROR; } - if(H5Pset_chunk(dcpl, 1, dims1) < 0) { + if (H5Pset_chunk(dcpl, 1, dims1) < 0) { printf("H5Pset_chunk failed\n"); TEST_ERROR; } - + /* Create 1-D chunked dataset with single index */ /* Chunked, dims=max_dims=chunk_dims */ - if((sid = H5Screate_simple(1, dims1, dims1)) < 0) { + if ((sid = H5Screate_simple(1, dims1, dims1)) < 0) { printf("H5Screate_simple failed\n"); TEST_ERROR; } - if((ds->single_did = H5Dcreate2(s->file, DSET_SINGLE_NAME, vl_tid, - sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { + if ((ds->single_did = + H5Dcreate2(s->file, DSET_SINGLE_NAME, vl_tid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { printf("H5Dcreate2 chunked dataset: single index failed\n"); TEST_ERROR; } - if(H5Dwrite(ds->single_did, vl_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &vdata) < 0) { + if (H5Dwrite(ds->single_did, vl_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &vdata) < 0) { printf("H5Dwrite to chunked dataset: single index failed\n"); TEST_ERROR; } @@ -580,33 +571,33 @@ create_dsets(const state_t *s, dsets_state_t *ds) /* Create 1-D chunked dataset with implicit index */ /* Chunked, dims=max_dims, early allocation */ - if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) { + if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) { printf("H5Pset_alloc_time\n"); TEST_ERROR; } - if(H5Pset_chunk(dcpl, 1, chunk_dims1) < 0) { + if (H5Pset_chunk(dcpl, 1, chunk_dims1) < 0) { printf("H5Pset_chunk failed\n"); TEST_ERROR; } - if((ds->implicit_did = H5Dcreate2(s->file, DSET_IMPLICIT_NAME, vl_tid, - sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { + if ((ds->implicit_did = + H5Dcreate2(s->file, DSET_IMPLICIT_NAME, vl_tid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { printf("H5Dcreate2 chunked dataset: implicit index failed\n"); TEST_ERROR; } - if(H5Dwrite(ds->implicit_did, vl_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &vdata) < 0) { + if (H5Dwrite(ds->implicit_did, vl_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &vdata) < 0) { printf("H5Dwrite to chunked dataset: implicit index failed\n"); TEST_ERROR; } - if(H5Pclose(dcpl) < 0) { + if (H5Pclose(dcpl) < 0) { printf("H5Pclose failed\n"); TEST_ERROR; } - if(H5Sclose(sid) < 0) { + if (H5Sclose(sid) < 0) { printf("H5Sclose failed\n"); TEST_ERROR; } @@ -614,38 +605,38 @@ create_dsets(const state_t *s, dsets_state_t *ds) /* Create 1-D chunked dataset with fixed array index */ /* Chunked, fixed max_dims */ - if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { + if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { printf("H5Pcreate failed\n"); TEST_ERROR; } - if(H5Pset_chunk(dcpl, 1, chunk_dims1) < 0) { + if (H5Pset_chunk(dcpl, 1, chunk_dims1) < 0) { printf("H5Pset_chunk failed\n"); TEST_ERROR; } - if((sid = H5Screate_simple(1, dims1, max_dims1)) < 0) { + if ((sid = H5Screate_simple(1, dims1, max_dims1)) < 0) { printf("H5Screate_simple failed\n"); TEST_ERROR; } - if((ds->fa_did = H5Dcreate2(s->file, DSET_FA_NAME, vl_tid, - sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { + if ((ds->fa_did = H5Dcreate2(s->file, DSET_FA_NAME, vl_tid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < + 0) { printf("H5Dcreaet2 chunked dataset: fa index failed\n"); TEST_ERROR; } - if(H5Dwrite(ds->fa_did, vl_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &vdata) < 0) { + if (H5Dwrite(ds->fa_did, vl_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &vdata) < 0) { printf("H5Dwrite to chunked dataset: fa index failed\n"); TEST_ERROR; } - if(H5Pclose(dcpl) < 0) { + if (H5Pclose(dcpl) < 0) { printf("H5Pclose failed\n"); TEST_ERROR; } - if(H5Sclose(sid) < 0) { + if (H5Sclose(sid) < 0) { printf("H5Sclose failed\n"); TEST_ERROR; } @@ -653,64 +644,63 @@ create_dsets(const state_t *s, dsets_state_t *ds) /* Create 2-D chunked dataset with extensible array index */ /* Chunked, 1 unlimited max_dims */ - if((sid = H5Screate_simple(2, dims2, max_dims2)) < 0) { + if ((sid = H5Screate_simple(2, dims2, max_dims2)) < 0) { printf("H5Screate_simple failed\n"); TEST_ERROR; } - if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { + if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { printf("H5Pcreate failed\n"); TEST_ERROR; } - if(H5Pset_chunk(dcpl, 2, chunk_dims2) < 0) { + if (H5Pset_chunk(dcpl, 2, chunk_dims2) < 0) { printf("H5Pset_chunk failed\n"); TEST_ERROR; } - if((ds->ea_did = H5Dcreate2(s->file, DSET_EA_NAME, vl_tid, - sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { + if ((ds->ea_did = H5Dcreate2(s->file, DSET_EA_NAME, vl_tid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < + 0) { printf("H5Dcreate2 chunked dataset: ea index failed\n"); TEST_ERROR; } - if(H5Dwrite(ds->ea_did, vl_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &vdata2) < 0) { + if (H5Dwrite(ds->ea_did, vl_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &vdata2) < 0) { printf("H5Dwrite to chunked dataset: ea index failed\n"); TEST_ERROR; } - /* Create 2-D chunked dataset with bt2 index */ /* Chunked, 2 unlimited max_dims */ max_dims2[0] = H5S_UNLIMITED; - if((sid = H5Screate_simple(2, dims2, max_dims2)) < 0) { + if ((sid = H5Screate_simple(2, dims2, max_dims2)) < 0) { printf("H5Screate_simple failed\n"); TEST_ERROR; } - if((ds->bt2_did = H5Dcreate2(s->file, DSET_BT2_NAME, vl_tid, - sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { + if ((ds->bt2_did = H5Dcreate2(s->file, DSET_BT2_NAME, vl_tid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < + 0) { printf("H5Dcreate2 chunked dataset: bt2 index failed\n"); TEST_ERROR; } - if(H5Dwrite(ds->bt2_did, vl_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &vdata2) < 0) { + if (H5Dwrite(ds->bt2_did, vl_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &vdata2) < 0) { printf("H5Dwrite to chunked dataset: bt2 index failed\n"); TEST_ERROR; } - if(H5Pclose(dcpl) < 0) { + if (H5Pclose(dcpl) < 0) { printf("H5Pclose failed\n"); TEST_ERROR; } - if(H5Sclose(sid) < 0) { + if (H5Sclose(sid) < 0) { printf("H5Sclose failed\n"); TEST_ERROR; } - if(H5Tclose(vl_tid) < 0) { + if (H5Tclose(vl_tid) < 0) { printf("H5Tclose failed\n"); TEST_ERROR; } @@ -719,7 +709,8 @@ create_dsets(const state_t *s, dsets_state_t *ds) return true; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Pclose(dcpl); H5Tclose(cmpd_tid); H5Tclose(array_tid); @@ -734,14 +725,14 @@ error: H5Dclose(ds->fa_did); H5Dclose(ds->ea_did); H5Dclose(ds->bt2_did); - } H5E_END_TRY; + } + H5E_END_TRY; return false; } /* create_dsets() */ - -/* +/* * Open the datasets as specified. */ static bool @@ -749,47 +740,44 @@ open_dsets(const state_t *s, dsets_state_t *ds) { *ds = DSETS_INITIALIZER; - if(s->compact) { - if(!open_dset_real(s->file, &ds->compact_did, DSET_COMPACT_NAME, - &ds->p_max_compact, &ds->p_min_dense)) { + if (s->compact) { + if (!open_dset_real(s->file, &ds->compact_did, DSET_COMPACT_NAME, &ds->p_max_compact, + &ds->p_min_dense)) { printf("open_dset_real() for compact dataset failed\n"); TEST_ERROR; } } - if(s->contig) { - if(!open_dset_real(s->file, &ds->contig_did, DSET_CONTIG_NAME, - &ds->g_max_compact, &ds->g_min_dense)) { + if (s->contig) { + if (!open_dset_real(s->file, &ds->contig_did, DSET_CONTIG_NAME, &ds->g_max_compact, + &ds->g_min_dense)) { printf("open_dset_real() for contiguous dataset failed\n"); TEST_ERROR; } } - if(s->chunked) { - if(!open_dset_real(s->file, &ds->single_did, DSET_SINGLE_NAME, - &ds->single_max_compact, &ds->single_min_dense)) { + if (s->chunked) { + if (!open_dset_real(s->file, &ds->single_did, DSET_SINGLE_NAME, &ds->single_max_compact, + &ds->single_min_dense)) { printf("open_dset_real() for chunked dataset: single failed\n"); TEST_ERROR; } - if(!open_dset_real(s->file, &ds->implicit_did, DSET_IMPLICIT_NAME, - &ds->implicit_max_compact, &ds->implicit_min_dense)) { + if (!open_dset_real(s->file, &ds->implicit_did, DSET_IMPLICIT_NAME, &ds->implicit_max_compact, + &ds->implicit_min_dense)) { printf("open_dset_real() for chunked dataset: implicit failed\n"); TEST_ERROR; } - if(!open_dset_real(s->file, &ds->fa_did, DSET_FA_NAME, - &ds->fa_max_compact, &ds->fa_min_dense)) { + if (!open_dset_real(s->file, &ds->fa_did, DSET_FA_NAME, &ds->fa_max_compact, &ds->fa_min_dense)) { printf("open_dset_real() for chunked dataset: fa failed\n"); TEST_ERROR; } - if(!open_dset_real(s->file, &ds->ea_did, DSET_FA_NAME, - &ds->ea_max_compact, &ds->ea_min_dense)) { + if (!open_dset_real(s->file, &ds->ea_did, DSET_FA_NAME, &ds->ea_max_compact, &ds->ea_min_dense)) { printf("open_dset_real() for chunked dataset: ea failed\n"); TEST_ERROR; } - if(!open_dset_real(s->file, &ds->bt2_did, DSET_BT2_NAME, - &ds->bt2_max_compact, &ds->bt2_min_dense)) { + if (!open_dset_real(s->file, &ds->bt2_did, DSET_BT2_NAME, &ds->bt2_max_compact, &ds->bt2_min_dense)) { printf("open_dset_real() for chunked dataset: bt2 failed\n"); TEST_ERROR; } @@ -811,22 +799,22 @@ open_dset_real(hid_t fid, hid_t *did, const char *name, unsigned *max_compact, u { hid_t dcpl = badhid; - if((*did = H5Dopen2(fid, name, H5P_DEFAULT)) < 0) { + if ((*did = H5Dopen2(fid, name, H5P_DEFAULT)) < 0) { printf("H5Dopen dataset failed\n"); TEST_ERROR; } - if((dcpl = H5Dget_create_plist(*did)) < 0) { + if ((dcpl = H5Dget_create_plist(*did)) < 0) { printf("H5Dget_create_plist failed\n"); TEST_ERROR; } - if(H5Pget_attr_phase_change(dcpl, max_compact, min_dense) < 0) { + if (H5Pget_attr_phase_change(dcpl, max_compact, min_dense) < 0) { printf("H5Dget_attr_phase_change failed\n"); TEST_ERROR; } - if(H5Pclose(dcpl) < 0) { + if (H5Pclose(dcpl) < 0) { printf("H5Pclose failed\n"); TEST_ERROR; } @@ -834,10 +822,12 @@ open_dset_real(hid_t fid, hid_t *did, const char *name, unsigned *max_compact, u return true; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Dclose(*did); H5Pclose(dcpl); - } H5E_END_TRY; + } + H5E_END_TRY; return false; } /* open_dset_real() */ @@ -848,37 +838,37 @@ error: static bool close_dsets(const dsets_state_t *ds) { - if(ds->compact_did != badhid && H5Dclose(ds->compact_did) < 0) { + if (ds->compact_did != badhid && H5Dclose(ds->compact_did) < 0) { printf("H5Dclose compact dataset failed\n"); TEST_ERROR; } - if(ds->contig_did != badhid && H5Dclose(ds->contig_did) < 0) { + if (ds->contig_did != badhid && H5Dclose(ds->contig_did) < 0) { printf("H5Dclose contig dataset failed\n"); TEST_ERROR; } - if(ds->single_did != badhid && H5Dclose(ds->single_did) < 0) { + if (ds->single_did != badhid && H5Dclose(ds->single_did) < 0) { printf("H5Dclose chunked dataset: single index failed\n"); TEST_ERROR; } - if(ds->implicit_did != badhid && H5Dclose(ds->implicit_did) < 0) { + if (ds->implicit_did != badhid && H5Dclose(ds->implicit_did) < 0) { printf("H5Dclose chunked dataset: implicit index failed\n"); TEST_ERROR; } - if(ds->fa_did >= 0 && H5Dclose(ds->fa_did) < 0) { + if (ds->fa_did >= 0 && H5Dclose(ds->fa_did) < 0) { printf("H5Dclose chunked dataset: fa index failed\n"); TEST_ERROR; } - if(ds->ea_did >= 0 && H5Dclose(ds->ea_did) < 0) { + if (ds->ea_did >= 0 && H5Dclose(ds->ea_did) < 0) { printf("H5Dclose chunked dataset: ea index failed\n"); TEST_ERROR; } - if(ds->bt2_did >= 0 && H5Dclose(ds->bt2_did) < 0) { + if (ds->bt2_did >= 0 && H5Dclose(ds->bt2_did) < 0) { printf("H5Dclose chunked dataset: bt2 index failed\n"); TEST_ERROR; } @@ -886,7 +876,8 @@ close_dsets(const dsets_state_t *ds) return true; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Dclose(ds->compact_did); H5Dclose(ds->contig_did); H5Dclose(ds->single_did); @@ -894,7 +885,8 @@ error: H5Dclose(ds->fa_did); H5Dclose(ds->ea_did); H5Dclose(ds->bt2_did); - } H5E_END_TRY; + } + H5E_END_TRY; return false; } /* close_dsets() */ @@ -909,54 +901,54 @@ error: * MODIFY_ATTR : -m option * DELETE_ATTR : -d <dattrs> option */ -static bool +static bool attr_dsets_action(unsigned action, const state_t *s, const dsets_state_t *ds, unsigned which) { - int nerrors = 0; - bool ret = true; + int nerrors = 0; + bool ret = true; if (s->compact) { HDassert(ds->compact_did != badhid); dbgf(2, "to compact dataset\n"); - if(!attr_action(action, s, ds->compact_did, which)) + if (!attr_action(action, s, ds->compact_did, which)) ++nerrors; } if (s->contig) { HDassert(ds->contig_did != badhid); dbgf(2, "to contiguous dataset\n"); - if(!attr_action(action, s, ds->contig_did, which)) + if (!attr_action(action, s, ds->contig_did, which)) ++nerrors; } if (s->chunked) { HDassert(ds->single_did != badhid); dbgf(2, "to chunked dataset: single index\n"); - if(!attr_action(action, s, ds->single_did, which)) + if (!attr_action(action, s, ds->single_did, which)) ++nerrors; HDassert(ds->implicit_did != badhid); dbgf(2, "to chunked dataset: implicit index\n"); - if(!attr_action(action, s, ds->implicit_did, which)) + if (!attr_action(action, s, ds->implicit_did, which)) ++nerrors; HDassert(ds->fa_did != badhid); dbgf(2, "to chunked dataset: fixed array index\n"); - if(!attr_action(action, s, ds->fa_did, which)) + if (!attr_action(action, s, ds->fa_did, which)) ++nerrors; HDassert(ds->ea_did != badhid); dbgf(2, "to chunked dataset: extensible array index\n"); - if(!attr_action(action, s, ds->ea_did, which)) + if (!attr_action(action, s, ds->ea_did, which)) ++nerrors; HDassert(ds->bt2_did != badhid); dbgf(2, "to chunked dataset: version 2 btree index\n"); - if(!attr_action(action, s, ds->bt2_did, which)) + if (!attr_action(action, s, ds->bt2_did, which)) ++nerrors; } - if(nerrors) + if (nerrors) ret = false; return (ret); @@ -974,19 +966,19 @@ attr_action(unsigned action, const state_t *s, hid_t did, unsigned which) { bool ret; - switch(action) { - case ADD_ATTR: + switch (action) { + case ADD_ATTR: ret = add_attr(s, did, which); break; - case MODIFY_ATTR: + case MODIFY_ATTR: ret = modify_attr(s, did, which); break; - case DELETE_ATTR: + case DELETE_ATTR: ret = delete_attr(did, which); break; - + default: HDassert(0 && "Unknown action?!?"); } /* end switch */ @@ -995,36 +987,36 @@ attr_action(unsigned action, const state_t *s, hid_t did, unsigned which) } /* attr_action() */ -/* +/* * Add an attribute to the specified dataset. * The datatype can be: * variable length (-v) or - * H5T_NATIVE_UINT32 (-b) or + * H5T_NATIVE_UINT32 (-b) or * H5T_NATIVE_UINT32 (default) */ static bool add_attr(const state_t *s, hid_t did, unsigned int which) { - hid_t aid = badhid; - hid_t tid = badhid; + hid_t aid = badhid; + hid_t tid = badhid; hid_t vl_tid = badhid; - char name[sizeof("attr-9999999999")]; + char name[sizeof("attr-9999999999")]; char *val = NULL; esnprintf(name, sizeof(name), "attr-%u", which); - if(s->vl_attr) { - if((vl_tid = H5Tcopy(H5T_C_S1)) < 0) { + if (s->vl_attr) { + if ((vl_tid = H5Tcopy(H5T_C_S1)) < 0) { printf("H5Tcopy failed\n"); TEST_ERROR; } - if(H5Tset_size(vl_tid, H5T_VARIABLE) < 0) { + if (H5Tset_size(vl_tid, H5T_VARIABLE) < 0) { printf("H5Tset_size failed\n"); TEST_ERROR; } - if((val = HDmalloc(sizeof("9999999999"))) == NULL) { + if ((val = HDmalloc(sizeof("9999999999"))) == NULL) { printf("H5Dmalloc failed\n"); TEST_ERROR; } @@ -1032,18 +1024,18 @@ add_attr(const state_t *s, hid_t did, unsigned int which) HDsprintf(val, "%u", which); tid = vl_tid; - } else + } + else tid = s->filetype; /* Attach the attribute to the dataset */ - if ((aid = H5Acreate2(did, name, tid, s->one_by_one_sid, H5P_DEFAULT, - H5P_DEFAULT)) < 0) { + if ((aid = H5Acreate2(did, name, tid, s->one_by_one_sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) { printf("H5Acreate2 failed\n"); TEST_ERROR; } /* Write to the attribure */ - if (H5Awrite(aid, tid, s->vl_attr?&val:(const void *)&which) < 0) { + if (H5Awrite(aid, tid, s->vl_attr ? &val : (const void *)&which) < 0) { printf("H5Awrite failed\n"); TEST_ERROR; } @@ -1054,22 +1046,26 @@ add_attr(const state_t *s, hid_t did, unsigned int which) TEST_ERROR; } - if(vl_tid >= 0 && H5Tclose(vl_tid) < 0) { + if (vl_tid >= 0 && H5Tclose(vl_tid) < 0) { printf("H5Tclose failed\n"); TEST_ERROR; } - if(val) HDfree(val); + if (val) + HDfree(val); return true; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(vl_tid); H5Aclose(aid); - } H5E_END_TRY; + } + H5E_END_TRY; - if(val) HDfree(val); + if (val) + HDfree(val); return false; @@ -1081,27 +1077,27 @@ error: static bool modify_attr(const state_t *s, hid_t did, unsigned int which) { - hid_t aid = badhid; - hid_t tid = badhid; - hid_t vl_tid = badhid; - char name[sizeof("attr-9999999999")]; - char *val = NULL; + hid_t aid = badhid; + hid_t tid = badhid; + hid_t vl_tid = badhid; + char name[sizeof("attr-9999999999")]; + char * val = NULL; unsigned tmp_val = 0; esnprintf(name, sizeof(name), "attr-%u", which); - if(s->vl_attr) { - if((vl_tid = H5Tcopy(H5T_C_S1)) < 0) { + if (s->vl_attr) { + if ((vl_tid = H5Tcopy(H5T_C_S1)) < 0) { printf("H5Tcopy failed\n"); TEST_ERROR; } - if(H5Tset_size(vl_tid, H5T_VARIABLE) < 0) { + if (H5Tset_size(vl_tid, H5T_VARIABLE) < 0) { printf("H5Tset_size failed\n"); TEST_ERROR; } - if((val = HDmalloc(sizeof("9999999999"))) == NULL) { + if ((val = HDmalloc(sizeof("9999999999"))) == NULL) { printf("HDmalloc failed\n"); TEST_ERROR; } @@ -1109,8 +1105,9 @@ modify_attr(const state_t *s, hid_t did, unsigned int which) HDsprintf(val, "%u %c", which, 'M'); tid = vl_tid; - } else { - tid = s->filetype; + } + else { + tid = s->filetype; tmp_val = which + 1; } @@ -1121,7 +1118,7 @@ modify_attr(const state_t *s, hid_t did, unsigned int which) } /* Write to the attribure */ - if (H5Awrite(aid, tid, s->vl_attr?&val:(const void *)&tmp_val) < 0) { + if (H5Awrite(aid, tid, s->vl_attr ? &val : (const void *)&tmp_val) < 0) { printf("H5Awrite failed\n"); TEST_ERROR; } @@ -1132,21 +1129,25 @@ modify_attr(const state_t *s, hid_t did, unsigned int which) TEST_ERROR; } - if(vl_tid >= 0 && H5Tclose(vl_tid) < 0) { + if (vl_tid >= 0 && H5Tclose(vl_tid) < 0) { printf("H5Tclose failed\n"); TEST_ERROR; } - if(val) HDfree(val); + if (val) + HDfree(val); return true; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Aclose(aid); H5Tclose(vl_tid); - } H5E_END_TRY; + } + H5E_END_TRY; - if(val) HDfree(val); + if (val) + HDfree(val); return false; } /* modify_attr() */ @@ -1174,7 +1175,7 @@ error: } /* delete_attr() */ -/* +/* * Verification by the reader */ @@ -1185,22 +1186,23 @@ error: * DELETE_ATTR : -d <dattrs> option * * Also verify continuation block and compact<->dense storage if: - * --[-c <csteps>] is 1 - * --not -m option + * --[-c <csteps>] is 1 + * --not -m option */ static bool verify_attr_dsets_action(unsigned action, const state_t *s, const dsets_state_t *ds, unsigned which) { - int nerrors = 0; - bool ret = true; + int nerrors = 0; + bool ret = true; if (s->compact) { HDassert(ds->compact_did != badhid); dbgf(2, "Verifying attribute to compact dataset\n"); - if(!verify_attr_action(action, ds->compact_did, which)) + if (!verify_attr_action(action, ds->compact_did, which)) ++nerrors; - if(s->csteps == 1 && (action != MODIFY_ATTR)) { - if(!verify_storage_cont(action, ds->compact_did, which, ds->p_max_compact, ds->p_min_dense, s->asteps)) + if (s->csteps == 1 && (action != MODIFY_ATTR)) { + if (!verify_storage_cont(action, ds->compact_did, which, ds->p_max_compact, ds->p_min_dense, + s->asteps)) ++nerrors; } } @@ -1208,10 +1210,11 @@ verify_attr_dsets_action(unsigned action, const state_t *s, const dsets_state_t if (s->contig) { HDassert(ds->contig_did != badhid); dbgf(2, "Verifying attribute to contiguous dataset\n"); - if(!verify_attr_action(action, ds->contig_did, which)) + if (!verify_attr_action(action, ds->contig_did, which)) ++nerrors; - if(s->csteps == 1 && (action != MODIFY_ATTR)) { - if(!verify_storage_cont(action, ds->contig_did, which, ds->g_max_compact, ds->g_min_dense, s->asteps)) + if (s->csteps == 1 && (action != MODIFY_ATTR)) { + if (!verify_storage_cont(action, ds->contig_did, which, ds->g_max_compact, ds->g_min_dense, + s->asteps)) ++nerrors; } } @@ -1219,51 +1222,56 @@ verify_attr_dsets_action(unsigned action, const state_t *s, const dsets_state_t if (s->chunked) { HDassert(ds->single_did != badhid); dbgf(2, "Verifying attribute to chunked dataset: single indedx\n"); - if(!verify_attr_action(action, ds->single_did, which)) + if (!verify_attr_action(action, ds->single_did, which)) ++nerrors; - if(s->csteps == 1 && (action != MODIFY_ATTR)) { - if(!verify_storage_cont(action, ds->single_did, which, ds->single_max_compact, ds->single_min_dense, s->asteps)) + if (s->csteps == 1 && (action != MODIFY_ATTR)) { + if (!verify_storage_cont(action, ds->single_did, which, ds->single_max_compact, + ds->single_min_dense, s->asteps)) ++nerrors; } HDassert(ds->implicit_did != badhid); dbgf(2, "Verifying attribute to chunked dataset: implicit index\n"); - if(!verify_attr_action(action, ds->implicit_did, which)) + if (!verify_attr_action(action, ds->implicit_did, which)) ++nerrors; - if(s->csteps == 1 && (action != MODIFY_ATTR)) { - if(!verify_storage_cont(action, ds->implicit_did, which, ds->implicit_max_compact, ds->implicit_min_dense, s->asteps)) + if (s->csteps == 1 && (action != MODIFY_ATTR)) { + if (!verify_storage_cont(action, ds->implicit_did, which, ds->implicit_max_compact, + ds->implicit_min_dense, s->asteps)) ++nerrors; } HDassert(ds->fa_did != badhid); dbgf(2, "Verifying attribute to chunked dataset: fa index\n"); - if(!verify_attr_action(action, ds->fa_did, which)) + if (!verify_attr_action(action, ds->fa_did, which)) ++nerrors; - if(s->csteps == 1 && (action != MODIFY_ATTR)) { - if(!verify_storage_cont(action, ds->fa_did, which, ds->fa_max_compact, ds->fa_min_dense, s->asteps)) + if (s->csteps == 1 && (action != MODIFY_ATTR)) { + if (!verify_storage_cont(action, ds->fa_did, which, ds->fa_max_compact, ds->fa_min_dense, + s->asteps)) ++nerrors; } HDassert(ds->ea_did != badhid); dbgf(2, "Verifying attribute to chunked dataset: ea index\n"); - if(!verify_attr_action(action, ds->ea_did, which)) + if (!verify_attr_action(action, ds->ea_did, which)) ++nerrors; - if(s->csteps == 1 && (action != MODIFY_ATTR)) { - if(!verify_storage_cont(action, ds->ea_did, which, ds->ea_max_compact, ds->ea_min_dense, s->asteps)) + if (s->csteps == 1 && (action != MODIFY_ATTR)) { + if (!verify_storage_cont(action, ds->ea_did, which, ds->ea_max_compact, ds->ea_min_dense, + s->asteps)) ++nerrors; } HDassert(ds->bt2_did != badhid); dbgf(2, "Verifying attribute to chunked dataset: bt2 index\n"); - if(!verify_attr_action(action, ds->bt2_did, which)) + if (!verify_attr_action(action, ds->bt2_did, which)) ++nerrors; - if(s->csteps == 1 && (action != MODIFY_ATTR)) { - if(!verify_storage_cont(action, ds->bt2_did, which, ds->bt2_max_compact, ds->bt2_min_dense, s->asteps)) + if (s->csteps == 1 && (action != MODIFY_ATTR)) { + if (!verify_storage_cont(action, ds->bt2_did, which, ds->bt2_max_compact, ds->bt2_min_dense, + s->asteps)) ++nerrors; } } - if(nerrors) + if (nerrors) ret = false; return (ret); @@ -1281,19 +1289,19 @@ verify_attr_action(unsigned action, hid_t did, unsigned which) esnprintf(name, sizeof(name), "attr-%u", which); - switch(action) { - case ADD_ATTR: + switch (action) { + case ADD_ATTR: ret = verify_add_or_modify_attr(action, did, name, which); break; - case MODIFY_ATTR: + case MODIFY_ATTR: ret = verify_add_or_modify_attr(action, did, name, which); break; - case DELETE_ATTR: + case DELETE_ATTR: ret = verify_delete_attr(did, name); break; - + default: HDassert(0 && "Unknown action?!?"); } /* end switch */ @@ -1301,18 +1309,18 @@ verify_attr_action(unsigned action, hid_t did, unsigned which) return ret; } /* verify_attr_action() */ -/* +/* * Verify the attribute is added or modified */ static bool verify_add_or_modify_attr(unsigned action, hid_t did, char *attr_name, unsigned int which) { unsigned int read_which; - char vl_which[sizeof("attr-9999999999")]; - char *read_vl_which = NULL; - bool is_vl = false; - hid_t aid, atid; - bool ret; + char vl_which[sizeof("attr-9999999999")]; + char * read_vl_which = NULL; + bool is_vl = false; + hid_t aid, atid; + bool ret; HDassert(did != badhid); HDassert(action == ADD_ATTR || action == MODIFY_ATTR); @@ -1322,24 +1330,24 @@ verify_add_or_modify_attr(unsigned action, hid_t did, char *attr_name, unsigned TEST_ERROR; } - if((atid = H5Aget_type(aid)) < 0) { + if ((atid = H5Aget_type(aid)) < 0) { printf("H5Aget_type failed\n"); TEST_ERROR; } - if((is_vl = H5Tis_variable_str(atid))) { - if(action == ADD_ATTR) + if ((is_vl = H5Tis_variable_str(atid))) { + if (action == ADD_ATTR) HDsprintf(vl_which, "%u", which); else HDsprintf(vl_which, "%u %c", which, 'M'); - if((read_vl_which = HDmalloc(sizeof("9999999999"))) == NULL) { + if ((read_vl_which = HDmalloc(sizeof("9999999999"))) == NULL) { printf("HDmalloc failed\n"); TEST_ERROR; } } - if (H5Aread(aid, atid, is_vl? (void *)&read_vl_which : (void *)&read_which) < 0) { + if (H5Aread(aid, atid, is_vl ? (void *)&read_vl_which : (void *)&read_which) < 0) { printf("H5Aread failed\n"); TEST_ERROR; } @@ -1349,36 +1357,39 @@ verify_add_or_modify_attr(unsigned action, hid_t did, char *attr_name, unsigned TEST_ERROR; } - if(H5Tclose(atid) < 0) { + if (H5Tclose(atid) < 0) { printf("H5Tclose failed\n"); TEST_ERROR; } - if(is_vl) { - if(!HDstrcmp(vl_which, read_vl_which)) + if (is_vl) { + if (!HDstrcmp(vl_which, read_vl_which)) ret = true; - } else + } + else ret = (read_which == which); - if(read_vl_which) + if (read_vl_which) HDfree(read_vl_which); return ret; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Aclose(aid); H5Tclose(atid); - } H5E_END_TRY; + } + H5E_END_TRY; - if(read_vl_which) + if (read_vl_which) HDfree(read_vl_which); return false; } /* verify_add_or_modify_attr() */ -/* +/* * Verify the attribute does not exist. */ static bool @@ -1386,11 +1397,11 @@ verify_delete_attr(hid_t did, char *attr_name) { int ret; - if((ret = H5Aexists(did, attr_name)) < 0) { + if ((ret = H5Aexists(did, attr_name)) < 0) { printf("H5Aexists failed\n"); TEST_ERROR; - - } else if(!ret) /* attribute does not exist */ + } + else if (!ret) /* attribute does not exist */ ret = true; else /* attribute exist */ ret = false; @@ -1409,7 +1420,7 @@ error: * --`which` is 0: no continuation block * * For addition: - * For deletion but [-a <nattrs>] is not yet to dense storage: + * For deletion but [-a <nattrs>] is not yet to dense storage: * --`which` is at (max_compact - 1): compact storage, continuation block exists * --`which` is at max_compact: dense storage, no continuation block * For deletion: @@ -1417,14 +1428,15 @@ error: * --`which` is at (min_dense - 1): compact storage, continuation block exists */ static bool -verify_storage_cont(unsigned action, hid_t did, unsigned int which, unsigned max_compact, unsigned min_dense, unsigned asteps) +verify_storage_cont(unsigned action, hid_t did, unsigned int which, unsigned max_compact, unsigned min_dense, + unsigned asteps) { bool ret = true; HDassert(action == ADD_ATTR || action == DELETE_ATTR); /* Verify no cont */ - if (!which) + if (!which) ret = verify_storage_cont_real(did, which, max_compact); /* For addition: */ @@ -1432,31 +1444,31 @@ verify_storage_cont(unsigned action, hid_t did, unsigned int which, unsigned max else if (action == ADD_ATTR || (action == DELETE_ATTR && asteps <= max_compact)) { /* Verify compact storage & cont */ - if (which == (max_compact - 1)) + if (which == (max_compact - 1)) ret = verify_storage_cont_real(did, which, max_compact); /* Verify dense storage & no cont */ - else if (which == max_compact) + else if (which == max_compact) ret = verify_storage_cont_real(did, which, max_compact); - /* For deletion */ - } else if (action == DELETE_ATTR) { + /* For deletion */ + } + else if (action == DELETE_ATTR) { /* Verify compact storage & cont */ - if(which == (min_dense - 1)) + if (which == (min_dense - 1)) ret = verify_storage_cont_real(did, which, min_dense); /* Verify dense storage & no cont */ - else if(which == min_dense) + else if (which == min_dense) ret = verify_storage_cont_real(did, which, min_dense); - } return ret; } /* verify_storage_cont() */ -/* +/* * Verify the storage condition at the specific checkpoint */ static bool @@ -1465,25 +1477,24 @@ verify_storage_cont_real(hid_t did, unsigned int which, unsigned cut_point) H5O_native_info_t ninfo; /* Get the object information */ - if(H5Oget_native_info(did, &ninfo, H5O_NATIVE_INFO_HDR|H5O_NATIVE_INFO_META_SIZE) < 0) { + if (H5Oget_native_info(did, &ninfo, H5O_NATIVE_INFO_HDR | H5O_NATIVE_INFO_META_SIZE) < 0) { printf("H5Oget_native_info failed\n"); TEST_ERROR; } - if(!which) { + if (!which) { dbgf(2, "Verifying no cont\n"); - return(ninfo.hdr.nchunks == 1); - - } else if(which < cut_point) { + return (ninfo.hdr.nchunks == 1); + } + else if (which < cut_point) { dbgf(2, "Verifying storage compact & cont\n"); - return(ninfo.meta_size.attr.index_size == 0 && - ninfo.meta_size.attr.heap_size == 0 && - ninfo.hdr.nchunks > 1); - } else { + return (ninfo.meta_size.attr.index_size == 0 && ninfo.meta_size.attr.heap_size == 0 && + ninfo.hdr.nchunks > 1); + } + else { dbgf(2, "Verifying storage dense & no cont\n"); - return(ninfo.meta_size.attr.index_size != 0 && - ninfo.meta_size.attr.heap_size != 0 && - ninfo.hdr.nchunks == 1); + return (ninfo.meta_size.attr.index_size != 0 && ninfo.meta_size.attr.heap_size != 0 && + ninfo.hdr.nchunks == 1); } error: @@ -1491,7 +1502,6 @@ error: } /* verify_storage_cont_real() */ - /* * Named pipes handling */ @@ -1504,7 +1514,7 @@ np_init(np_state_t *np, bool writer) { *np = NP_INITIALIZER; - /* + /* * Use two named pipes(FIFO) to coordinate the writer and reader for * two-way communication so that the two sides can move forward together. * One is for the writer to write to the reader. @@ -1513,13 +1523,13 @@ np_init(np_state_t *np, bool writer) if (writer) { /* If the named pipes are present at the start of the test, remove them */ if (HDaccess(np->fifo_writer_to_reader, F_OK) == 0) - if(HDremove(np->fifo_writer_to_reader) != 0) { + if (HDremove(np->fifo_writer_to_reader) != 0) { printf("HDremove fifo_writer_to_reader failed\n"); TEST_ERROR; } if (HDaccess(np->fifo_reader_to_writer, F_OK) == 0) - if(HDremove(np->fifo_reader_to_writer) != 0) { + if (HDremove(np->fifo_reader_to_writer) != 0) { printf("HDremove fifo_reader_to_writer failed\n"); TEST_ERROR; } @@ -1572,13 +1582,13 @@ np_close(np_state_t *np, bool writer) } /* Reader finishes last and deletes the named pipes */ - if(!writer) { - if(HDremove(np->fifo_writer_to_reader) != 0) { + if (!writer) { + if (HDremove(np->fifo_writer_to_reader) != 0) { printf("HDremove fifo_writer_to_reader failed\n"); TEST_ERROR; } - if(HDremove(np->fifo_reader_to_writer) != 0) { + if (HDremove(np->fifo_reader_to_writer) != 0) { printf("HDremove fifo_reader_to_writer failed\n"); TEST_ERROR; } @@ -1593,14 +1603,15 @@ error: * Writer synchronization depending on the result from the attribute action performed. */ static bool -np_writer(bool result, unsigned step, const state_t *s, np_state_t *np, H5F_vfd_swmr_config_t *config) +np_writer(bool result, unsigned step, const state_t *s, np_state_t *np, H5F_vfd_swmr_config_t *config) { unsigned int i; /* The action fails */ - if(!result) { + if (!result) { printf("attribute action failed\n"); - H5_FAILED(); AT(); + H5_FAILED(); + AT(); /* At communication interval, notify the reader about the failure and quit */ if (step % s->csteps == 0) { @@ -1608,8 +1619,9 @@ np_writer(bool result, unsigned step, const state_t *s, np_state_t *np, H5F_vfd HDwrite(np->fd_writer_to_reader, &np->notify, sizeof(int)); goto error; } - /* The action succeeds */ - } else { + /* The action succeeds */ + } + else { /* At communication interval, notify the reader and wait for its response */ if (step % s->csteps == 0) { /* Bump up the value of notify to tell the reader to start reading */ @@ -1621,15 +1633,17 @@ np_writer(bool result, unsigned step, const state_t *s, np_state_t *np, H5F_vfd /* During the wait, writer makes repeated HDF5 API calls * to trigger EOT at approximately the correct time */ - for(i = 0; i < config->max_lag + 1; i++) { + for (i = 0; i < config->max_lag + 1; i++) { decisleep(config->tick_len); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Aexists(s->file, "nonexistent"); - } H5E_END_TRY; + } + H5E_END_TRY; } /* Handshake between writer and reader */ - if(!np_confirm_verify_notify(np->fd_reader_to_writer, step, s, np)) { + if (!np_confirm_verify_notify(np->fd_reader_to_writer, step, s, np)) { printf("np_confirm_verify_notify() verify/notify not in sync failed\n"); TEST_ERROR; } @@ -1650,9 +1664,10 @@ static bool np_reader(bool result, unsigned step, const state_t *s, np_state_t *np) { /* The verification fails */ - if(!result) { + if (!result) { printf("verify action failed\n"); - H5_FAILED(); AT(); + H5_FAILED(); + AT(); /* At communication interval, tell the writer about the failure and exit */ if (step % s->csteps == 0) { @@ -1660,8 +1675,9 @@ np_reader(bool result, unsigned step, const state_t *s, np_state_t *np) HDwrite(np->fd_reader_to_writer, &np->notify, sizeof(int)); goto error; } - /* The verification succeeds */ - } else { + /* The verification succeeds */ + } + else { if (step % s->csteps == 0) { /* Send back the same notify value for acknowledgement: * --inform the writer to move to the next step */ @@ -1714,9 +1730,9 @@ error: * next verification phase. */ static bool -np_reader_no_verification(const state_t *s, np_state_t *np, H5F_vfd_swmr_config_t *config) +np_reader_no_verification(const state_t *s, np_state_t *np, H5F_vfd_swmr_config_t *config) { - if(s->use_np) { + if (s->use_np) { if (!np_confirm_verify_notify(np->fd_writer_to_reader, 0, s, np)) { printf("np_confirm_verify_notify() verify/notify not in sync failed\n"); TEST_ERROR; @@ -1726,7 +1742,7 @@ np_reader_no_verification(const state_t *s, np_state_t *np, H5F_vfd_swmr_config /* Wait for a few ticks for the update to happen */ decisleep(config->tick_len * s->update_interval); - if(s->use_np) { + if (s->use_np) { /* Send back the same notify value for acknowledgement: * --inform the writer to move to the next step */ if (HDwrite(np->fd_reader_to_writer, &np->notify, sizeof(int)) < 0) { @@ -1745,29 +1761,27 @@ error: int main(int argc, char **argv) { - hid_t fapl, fcpl; - unsigned step; - bool writer; - state_t s; - const char *personality; + hid_t fapl, fcpl; + unsigned step; + bool writer; + state_t s; + const char * personality; H5F_vfd_swmr_config_t config; - np_state_t np; - dsets_state_t ds; - unsigned dd; - bool result; + np_state_t np; + dsets_state_t ds; + unsigned dd; + bool result; - if(!state_init(&s, argc, argv)) { + if (!state_init(&s, argc, argv)) { printf("state_init() failed\n"); TEST_ERROR; } personality = strstr(s.progname, "vfd_swmr_attrdset_"); - if (personality != NULL && - strcmp(personality, "vfd_swmr_attrdset_writer") == 0) + if (personality != NULL && strcmp(personality, "vfd_swmr_attrdset_writer") == 0) writer = true; - else if (personality != NULL && - strcmp(personality, "vfd_swmr_attrdset_reader") == 0) + else if (personality != NULL && strcmp(personality, "vfd_swmr_attrdset_reader") == 0) writer = false; else { printf("unknown personality, expected vfd_swmr_attrdset_{reader,writer}\n"); @@ -1778,7 +1792,7 @@ main(int argc, char **argv) init_vfd_swmr_config(&config, 4, 7, writer, FALSE, 128, "./attrdset-shadow"); /* use_latest_format, use_vfd_swmr, only_meta_page, config */ - if((fapl = vfd_swmr_create_fapl(true, s.use_vfd_swmr, true, &config)) < 0) { + if ((fapl = vfd_swmr_create_fapl(true, s.use_vfd_swmr, true, &config)) < 0) { printf("vfd_swmr_create_fapl() failed\n"); TEST_ERROR; } @@ -1788,35 +1802,35 @@ main(int argc, char **argv) TEST_ERROR; } - if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, 1) < 0) { + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, 1) < 0) { printf("H5Pset_file_space_strategy failed\n"); TEST_ERROR; } if (writer) { - if((s.file = H5Fcreate(s.filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) { + if ((s.file = H5Fcreate(s.filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) { printf("H5Fcreate failed\n"); TEST_ERROR; } - if(!create_dsets(&s, &ds)) { + if (!create_dsets(&s, &ds)) { printf("create_dsets() failed\n"); TEST_ERROR; } - - } else { - if ((s.file = H5Fopen(s.filename, H5F_ACC_RDONLY, fapl)) < 0) { + } + else { + if ((s.file = H5Fopen(s.filename, H5F_ACC_RDONLY, fapl)) < 0) { printf("H5Fopen failed\n"); TEST_ERROR; } - if(!open_dsets(&s, &ds)) { + if (!open_dsets(&s, &ds)) { printf("open_dsets() failed\n"); TEST_ERROR; } } /* Initiailze named pipes */ - if(s.use_np && !np_init(&np, writer)) { + if (s.use_np && !np_init(&np, writer)) { printf("np_init() failed\n"); TEST_ERROR; } @@ -1827,17 +1841,16 @@ main(int argc, char **argv) result = attr_dsets_action(ADD_ATTR, &s, &ds, step); - if(s.use_np && !np_writer(result, step, &s, &np, &config)) { + if (s.use_np && !np_writer(result, step, &s, &np, &config)) { printf("np_writer() for addition failed\n"); TEST_ERROR; } - } - if(s.mod_attr) { + if (s.mod_attr) { /* Need to sync up writer/reader before moving onto the next phase */ - if(s.use_np && !np_writer(true, 0, &s, &np, &config)) { + if (s.use_np && !np_writer(true, 0, &s, &np, &config)) { printf("np_writer() for modification failed\n"); TEST_ERROR; } @@ -1848,17 +1861,17 @@ main(int argc, char **argv) result = attr_dsets_action(MODIFY_ATTR, &s, &ds, step); - if(s.use_np && !np_writer(result, step, &s, &np, &config)) { + if (s.use_np && !np_writer(result, step, &s, &np, &config)) { printf("np_writer() for modification failed\n"); TEST_ERROR; } } } - if(s.dattrs) { + if (s.dattrs) { /* Need to sync up writer/reader before moving onto the next phase */ - if(s.use_np && !np_writer(true, 0, &s, &np, &config)) { + if (s.use_np && !np_writer(true, 0, &s, &np, &config)) { printf("np_writer() for deletion failed\n"); TEST_ERROR; } @@ -1869,21 +1882,20 @@ main(int argc, char **argv) result = attr_dsets_action(DELETE_ATTR, &s, &ds, step); - if(s.use_np && !np_writer(result, step, &s, &np, &config)) { + if (s.use_np && !np_writer(result, step, &s, &np, &config)) { printf("np_writer() for deletion failed\n"); TEST_ERROR; } } - } - - } else { + } + else { /* Start verifying addition */ for (step = 0; step < s.asteps; step++) { dbgf(2, "Verifying...attribute %d\n", step); - if(s.use_np && !np_confirm_verify_notify(np.fd_writer_to_reader, step, &s, &np)) { + if (s.use_np && !np_confirm_verify_notify(np.fd_writer_to_reader, step, &s, &np)) { printf("np_confirm_verify_notify() verify/notify not in sync failed\n"); TEST_ERROR; } @@ -1893,15 +1905,15 @@ main(int argc, char **argv) result = verify_attr_dsets_action(ADD_ATTR, &s, &ds, step); - if(s.use_np && !np_reader(result, step, &s, &np)) { + if (s.use_np && !np_reader(result, step, &s, &np)) { printf("np_reader() for verifying addition failed\n"); TEST_ERROR; } } - if(s.mod_attr) { + if (s.mod_attr) { /* Need to sync up writer/reader before moving onto the next phase */ - if(!np_reader_no_verification(&s, &np, &config)) { + if (!np_reader_no_verification(&s, &np, &config)) { printf("np_reader_no_verification() for verifying modification failed\n"); TEST_ERROR; } @@ -1910,7 +1922,7 @@ main(int argc, char **argv) for (step = 0; step < s.asteps; step++) { dbgf(2, "Verifying...modify attribute %d\n", step); - if(s.use_np && !np_confirm_verify_notify(np.fd_writer_to_reader, step, &s, &np)) { + if (s.use_np && !np_confirm_verify_notify(np.fd_writer_to_reader, step, &s, &np)) { printf("np_confirm_verify_notify() verify/notify not in sync failed\n"); TEST_ERROR; } @@ -1920,18 +1932,17 @@ main(int argc, char **argv) result = verify_attr_dsets_action(MODIFY_ATTR, &s, &ds, step); - if(s.use_np && !np_reader(result, step, &s, &np)) { + if (s.use_np && !np_reader(result, step, &s, &np)) { printf("np_reader() for verifying modification failed\n"); TEST_ERROR; } - } } - if(s.dattrs) { + if (s.dattrs) { /* Need to sync up writer/reader before moving onto the next phase */ - if(!np_reader_no_verification(&s, &np, &config)) { + if (!np_reader_no_verification(&s, &np, &config)) { printf("np_reader_no_verification() for verifying modification failed\n"); TEST_ERROR; } @@ -1940,7 +1951,7 @@ main(int argc, char **argv) for (dd = 0, step = s.asteps - 1; dd < s.dattrs; dd++, --step) { dbgf(2, "Verifying...delete attribute %d\n", step); - if(s.use_np && !np_confirm_verify_notify(np.fd_writer_to_reader, step, &s, &np)) { + if (s.use_np && !np_confirm_verify_notify(np.fd_writer_to_reader, step, &s, &np)) { printf("np_confirm_verify_notify() verify/notify not in sync failed\n"); TEST_ERROR; } @@ -1950,17 +1961,15 @@ main(int argc, char **argv) result = verify_attr_dsets_action(DELETE_ATTR, &s, &ds, step); - if(s.use_np && !np_reader(result, step, &s, &np)) { + if (s.use_np && !np_reader(result, step, &s, &np)) { printf("np_reader() for verifying deletion failed\n"); TEST_ERROR; } - } - } } - if(!close_dsets(&ds)) { + if (!close_dsets(&ds)) { printf("close_dsets() failed\n"); TEST_ERROR; } @@ -1985,7 +1994,7 @@ main(int argc, char **argv) TEST_ERROR; } - if(s.use_np && !np_close(&np, writer)) { + if (s.use_np && !np_close(&np, writer)) { printf("np_close() failed\n"); TEST_ERROR; } @@ -1993,12 +2002,14 @@ main(int argc, char **argv) return EXIT_SUCCESS; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Pclose(fapl); H5Pclose(fcpl); H5Fclose(s.file); H5Sclose(s.one_by_one_sid); - } H5E_END_TRY; + } + H5E_END_TRY; if (s.use_np && np.fd_writer_to_reader >= 0) HDclose(np.fd_writer_to_reader); @@ -2006,7 +2017,7 @@ error: if (s.use_np && np.fd_reader_to_writer >= 0) HDclose(np.fd_reader_to_writer); - if(s.use_np && !writer) { + if (s.use_np && !writer) { HDremove(np.fifo_writer_to_reader); HDremove(np.fifo_reader_to_writer); } |