diff options
Diffstat (limited to 'tools')
30 files changed, 30 insertions, 312 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 1ab9236..ea268f3 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -1105,10 +1105,6 @@ done: * * Return: Number of differences found * - * Modifications: Compare the graph and make h5diff return 1 for difference if - * 1) the number of objects in file1 is not the same as in file2 - * 2) the graph does not match, i.e same names (absolute path) - * 3) objects with the same name are not of the same type *------------------------------------------------------------------------- */ hsize_t diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 078ae5a..189aafd 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -817,10 +817,11 @@ done: *------------------------------------------------------------------------- */ herr_t -h5tools_get_vfd_name(hid_t fapl_id, char *drivername, size_t drivername_size) +h5tools_get_vfd_name(hid_t fid, hid_t fapl_id, char *drivername, size_t drivername_size) { - hid_t fapl_vol_id = H5I_INVALID_HID; - herr_t ret_value = SUCCEED; + hid_t fapl_vol_id = H5I_INVALID_HID; + hbool_t is_native = FALSE; + herr_t ret_value = SUCCEED; if (fapl_id < 0) H5TOOLS_GOTO_ERROR(FAIL, "invalid FAPL"); @@ -839,9 +840,11 @@ h5tools_get_vfd_name(hid_t fapl_id, char *drivername, size_t drivername_size) if (H5Pget_vol_id(fapl_id, &fapl_vol_id) < 0) H5TOOLS_ERROR(FAIL, "failed to retrieve VOL ID from FAPL"); - /* TODO: For now, we have no way of determining if an arbitrary - * VOL connector is native-terminal. */ - if (fapl_vol_id == H5VL_NATIVE || fapl_vol_id == H5VL_PASSTHRU) { + /* Query if the file ID is native-terminal */ + if (H5VLobject_is_native(fid, &is_native) < 0) + H5TOOLS_ERROR(FAIL, "failed to determine if file ID is native-terminal"); + + if (is_native) { const char *driver_name; hid_t driver_id; @@ -1072,7 +1075,8 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec done: /* Save the driver name if using a native-terminal VOL connector */ if (drivername && drivername_size && ret_value >= 0) - if (used_fapl_id >= 0 && h5tools_get_vfd_name(used_fapl_id, drivername, drivername_size) < 0) + if (used_fapl_id >= 0 && + h5tools_get_vfd_name(ret_value, used_fapl_id, drivername, drivername_size) < 0) H5TOOLS_ERROR(H5I_INVALID_HID, "failed to retrieve name of VFD used to open file"); if (tmp_fapl_id >= 0) diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index 2082f2d..753a83b 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -667,7 +667,7 @@ H5TOOLS_DLL int h5tools_set_error_file(const char *fname, int is_bin); H5TOOLS_DLL hid_t h5tools_get_fapl(hid_t prev_fapl_id, h5tools_vol_info_t *vol_info, h5tools_vfd_info_t *vfd_info); -H5TOOLS_DLL herr_t h5tools_get_vfd_name(hid_t fapl_id, char *drivername, size_t drivername_size); +H5TOOLS_DLL herr_t h5tools_get_vfd_name(hid_t fid, hid_t fapl_id, char *drivername, size_t drivername_size); H5TOOLS_DLL hid_t h5tools_fopen(const char *fname, unsigned flags, hid_t fapl, hbool_t use_specific_driver, char *drivername, size_t drivername_size); H5TOOLS_DLL hid_t h5tools_get_little_endian_type(hid_t type); diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c index d80ef1f..435ca87 100644 --- a/tools/lib/h5tools_dump.c +++ b/tools/lib/h5tools_dump.c @@ -232,24 +232,7 @@ h5tools_dump_init(void) * Failure: FAIL * Programmer: * Robb Matzke, Monday, April 26, 1999 - * Modifications: - * Robb Matzke, 1999-06-04 - * The `container' argument is the optional dataset for reference types. * - * Robb Matzke, 1999-09-29 - * Understands the `per_line' property which indicates that every Nth - * element should begin a new line. - * - * Robb Matzke, LLNL, 2003-06-05 - * Do not dereference the memory for a variable-length string here. - * Deref in h5tools_str_sprint() instead so recursive types are - * handled correctly. - * - * Pedro Vicente Nunes, The HDF Group, 2005-10-19 - * pass to the prefix in h5tools_simple_prefix the total position - * instead of the current stripmine position i; this is necessary - * to print the array indices - * new field sm_pos in h5tools_context_t, the current stripmine element position *------------------------------------------------------------------------- */ int diff --git a/tools/lib/h5tools_ref.c b/tools/lib/h5tools_ref.c index d5c1cf9..9f12367 100644 --- a/tools/lib/h5tools_ref.c +++ b/tools/lib/h5tools_ref.c @@ -51,8 +51,6 @@ static int ref_path_table_put(const char *, const H5O_token_t *token); * * Programmer: Quincey Koziol * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -160,8 +158,6 @@ init_ref_path_table(void) * * Programmer: Quincey Koziol * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -187,8 +183,6 @@ term_ref_path_table(void) * * Programmer: REMcG * - * Modifications: - * *------------------------------------------------------------------------- */ int @@ -237,8 +231,6 @@ ref_path_table_lookup(const char *thepath, H5O_token_t *token) * * Programmer: REMcG * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -322,8 +314,6 @@ ref_path_table_gen_fake(const char *path, H5O_token_t *token) * * Programmer: REMcG * - * Modifications: - * *------------------------------------------------------------------------- */ const char * diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index d9e26e7..223eb61 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -1336,22 +1336,6 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai if (i) h5tools_str_append(str, "%s", OPT(info->vlen_sep, "," OPTIONAL_LINE_BREAK)); -#ifdef LATER - /* Need to fix so VL data breaks at correct location on end of line -QAK */ - if (info->arr_linebreak && h5tools_str_len(str) >= info->line_ncols) { - int x; - - h5tools_str_append(str, "%s", "\n"); - - /* need to indent some more here */ - if (ctx->indent_level >= 0) - h5tools_str_append(str, "%s", OPT(info->line_pre, "")); - - for (x = 0; x < ctx->indent_level + 1; x++) - h5tools_str_append(str, "%s", OPT(info->line_indent, "")); - } /* end if */ -#endif /* LATER */ - ctx->indent_level++; /* Dump the array element */ diff --git a/tools/lib/io_timer.c b/tools/lib/io_timer.c index ce21b3e..49a4a20 100644 --- a/tools/lib/io_timer.c +++ b/tools/lib/io_timer.c @@ -57,7 +57,6 @@ sub_time(struct timeval *a, struct timeval *b) * SYS_CLOCK for system time). * Return: Pointer to io_time object * Programmer: Bill Wendling, 01. October 2001 - * Modifications: */ io_time_t * io_time_new(clock_type type) @@ -78,7 +77,6 @@ io_time_new(clock_type type) * function. * Return: Nothing * Programmer: Bill Wendling, 01. October 2001 - * Modifications: */ void io_time_destroy(io_time_t *pt) @@ -97,7 +95,6 @@ io_time_destroy(io_time_t *pt) * timer with the pio_timer_new function (shame!). * Return: Nothing * Programmer: Bill Wendling, 04. October 2001 - * Modifications: */ void set_timer_type(io_time_t *pt, clock_type type) @@ -110,7 +107,6 @@ set_timer_type(io_time_t *pt, clock_type type) * Purpose: Get the type of the timer. * Return: MPI_CLOCK or SYS_CLOCK. * Programmer: Bill Wendling, 04. October 2001 - * Modifications: */ clock_type get_timer_type(io_time_t *pt) @@ -124,7 +120,6 @@ get_timer_type(io_time_t *pt) * Purpose: Set the time in a ``io_time_t'' object. * Return: Pointer to the passed in ``io_time_t'' object if SUCCEED; Null otherwise. * Programmer: Bill Wendling, 01. October 2001 - * Modifications: */ io_time_t * io_time_set(io_time_t *pt, timer_type t, int start_stop) @@ -214,7 +209,6 @@ io_time_set(io_time_t *pt, timer_type t, int start_stop) * Purpose: Get the time from a ``io_time_t'' object. * Return: The number of seconds as a DOUBLE. * Programmer: Bill Wendling, 01. October 2001 - * Modifications: */ H5_ATTR_PURE double io_time_get(io_time_t *pt, timer_type t) diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c index 9bc3f76..f060e2c 100644 --- a/tools/libtest/h5tools_test_utils.c +++ b/tools/libtest/h5tools_test_utils.c @@ -372,8 +372,6 @@ H5_GCC_CLANG_DIAG_OFF("format") * Programmer: Jacob Smith * 2017-11-11 * - * Changes: None. - * *---------------------------------------------------------------------------- */ static unsigned @@ -595,8 +593,6 @@ error: * Programmer: Jacob Smith * 2017-11-13 * - * Changes: None - * *---------------------------------------------------------------------------- */ static unsigned @@ -975,8 +971,6 @@ error: * Programmer: Jacob Smith * 2018-07-12 * - * Changes: None - * *---------------------------------------------------------------------------- */ static unsigned @@ -1229,8 +1223,6 @@ H5_GCC_CLANG_DIAG_ON("format") * Programmer: Jacob Smith * 2017-11-10 * - * Changes: None. - * *---------------------------------------------------------------------------- */ int diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c index 3f8f8cf..9756d11 100644 --- a/tools/src/h5copy/h5copy.c +++ b/tools/src/h5copy/h5copy.c @@ -46,8 +46,6 @@ char *str_flag = NULL; * Programmer: Quincey Koziol * Saturday, 31. January 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -77,8 +75,6 @@ leave(int ret) * * Programmer: Pedro Vicente Nunes, 7/8/2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -159,8 +155,6 @@ usage(void) * * Programmer: Pedro Vicente Nunes, 7/8/2006 * - * Modifications: - * *------------------------------------------------------------------------- */ @@ -207,8 +201,6 @@ parse_flag(const char *s_flag, unsigned *flag) * * Programmer: Pedro Vicente Nunes * - * Modifications: - * *------------------------------------------------------------------------- */ diff --git a/tools/src/h5diff/h5diff_main.c b/tools/src/h5diff/h5diff_main.c index 9aa0cdd..561f139 100644 --- a/tools/src/h5diff/h5diff_main.c +++ b/tools/src/h5diff/h5diff_main.c @@ -30,36 +30,6 @@ * * Comments: * - * Modifications: July 2004 - * Introduced the four modes: - * Normal mode: print the number of differences found and where they occurred - * Report mode: print the above plus the differences - * Verbose mode: print the above plus a list of objects and warnings - * Quiet mode: do not print output - * - * November 2004: Leon Arber (larber@uiuc.edu) - * Additions that allow h5diff to be run in parallel - * - * February 2005: Leon Arber (larber@uiuc.edu) - * h5diff and ph5diff split into two files, one that is used - * to build a serial h5diff and one used to build a parallel h5diff - * Common functions have been moved to h5diff_common.c - * - * October 2005 - * Introduced a new field 'not_cmp' to 'diff_opt_t' that detects - * if some objects are not comparable and prints the message - * "Some objects are not comparable" - * - * February 2007 - * Added comparison for dataset regions. - * Added support for reading and comparing by hyperslabs for large files. - * Inclusion of a relative error formula to compare floating - * point numbers in order to deal with floating point uncertainty. - * Printing of dataset dimensions along with dataset name - * - * November 19, 2007 - * adopted the syntax h5diff [OPTIONS] file1 file2 [obj1[obj2]] - * *------------------------------------------------------------------------- */ @@ -147,8 +117,6 @@ main(int argc, char *argv[]) * * Comments: * - * Modifications: - * *------------------------------------------------------------------------- */ H5_ATTR_NORETURN void diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c index ee8669f..64b1f28 100644 --- a/tools/src/h5diff/ph5diff_main.c +++ b/tools/src/h5diff/ph5diff_main.c @@ -116,10 +116,6 @@ main(int argc, char *argv[]) * Programmer: Leon Arber * Date: January 2005 * - * Comments: - * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -286,10 +282,6 @@ print_manager_output(void) * Programmer: Albert Cheng * Date: Feb 6, 2005 * - * Comments: - * - * Modifications: - * *------------------------------------------------------------------------- */ void diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c index 0bdd6d0..e63b6a8 100644 --- a/tools/src/h5import/h5import.c +++ b/tools/src/h5import/h5import.c @@ -346,9 +346,6 @@ gtoken(char *s) * * Programmer: pkmat * - * Modifications: pvn - * 7/23/2007. Added support for STR type, extra parameter FILE_ID - * *------------------------------------------------------------------------- */ diff --git a/tools/src/h5perf/pio_engine.c b/tools/src/h5perf/pio_engine.c index 26968e3..2238aac 100644 --- a/tools/src/h5perf/pio_engine.c +++ b/tools/src/h5perf/pio_engine.c @@ -133,8 +133,6 @@ static off_t sqrto(off_t); * Purpose: PIO Engine where Parallel IO are executed. * Return: results * Programmer: Albert Cheng, Bill Wendling 2001/12/12 - * Modifications: - * Added 2D testing (Christian Chilan, 10. August 2005) */ results do_pio(parameters param) @@ -382,7 +380,6 @@ done: * USER or LOGIN are specified in the environment. * Return: Pointer to filename or NULL * Programmer: Bill Wendling, 21. November 2001 - * Modifications: */ static char * pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t size) @@ -497,26 +494,24 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si * Purpose: Write the required amount of data to the file. * Return: SUCCESS or FAIL * Programmer: Albert Cheng, Bill Wendling, 2001/12/13 - * Modifications: - * Added 2D testing (Christian Chilan, 10. August 2005) */ static herr_t do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbytes, size_t buf_size, void *buffer) { int ret_code = SUCCESS; - int rc; /*routine return code */ + int rc; /* Return code */ long ndset; size_t blk_size; /* The block size to subdivide the xfer buffer into */ off_t nbytes_xfer; /* Total number of bytes transferred so far */ size_t nbytes_xfer_advance; /* Number of bytes transferred in a single I/O operation */ size_t nbytes_toxfer; /* Number of bytes to transfer a particular time */ char dname[64]; - off_t dset_offset = 0; /*dataset offset in a file */ - off_t bytes_begin[2]; /*first elmt this process transfer */ - off_t bytes_count; /*number of elmts this process transfer */ - off_t snbytes = 0; /*size of a side of the dataset square */ - unsigned char *buf_p; /* Current buffer pointer */ + off_t dset_offset = 0; /* Dataset offset in a file */ + off_t bytes_begin[2] = {0, 0}; /* First elmt this process transfer */ + off_t bytes_count; /* Number of elmts this process transfer */ + off_t snbytes = 0; /* Size of a side of the dataset square */ + unsigned char *buf_p; /* Current buffer pointer */ /* POSIX variables */ off_t file_offset; /* File offset of the next transfer */ @@ -1514,8 +1509,6 @@ sqrto(off_t x) * Purpose: read the required amount of data from the file. * Return: SUCCESS or FAIL * Programmer: Albert Cheng 2001/12/13 - * Modifications: - * Added 2D testing (Christian Chilan, 10. August 2005) */ static herr_t do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbytes, size_t buf_size, @@ -1530,11 +1523,11 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt size_t nbytes_xfer_advance; /* Number of bytes transferred in a single I/O operation */ size_t nbytes_toxfer; /* Number of bytes to transfer a particular time */ char dname[64]; - off_t dset_offset = 0; /*dataset offset in a file */ - off_t bytes_begin[2]; /*first elmt this process transfer */ - off_t bytes_count; /*number of elmts this process transfer */ - off_t snbytes = 0; /*size of a side of the dataset square */ - unsigned char *buf_p; /* Current buffer pointer */ + off_t dset_offset = 0; /* Dataset offset in a file */ + off_t bytes_begin[2] = {0, 0}; /* First elmt this process transfer */ + off_t bytes_count; /* Number of elmts this process transfer */ + off_t snbytes = 0; /* Size of a side of the dataset square */ + unsigned char *buf_p; /* Current buffer pointer */ /* POSIX variables */ off_t file_offset; /* File offset of the next transfer */ @@ -2497,7 +2490,6 @@ done: * Purpose: Open the specified file. * Return: SUCCESS or FAIL * Programmer: Albert Cheng, Bill Wendling, 2001/12/13 - * Modifications: */ static herr_t do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) @@ -2607,7 +2599,6 @@ done: * Purpose: Close the specified file descriptor. * Return: SUCCESS or FAIL * Programmer: Albert Cheng, Bill Wendling, 2001/12/13 - * Modifications: */ static herr_t do_fclose(iotype iot, file_descr *fd /*out*/) @@ -2664,7 +2655,6 @@ done: * Other processes just return. * Return: void * Programmer: Albert Cheng 2001/12/12 - * Modifications: */ static void do_cleanupfile(iotype iot, char *fname) diff --git a/tools/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c index 1460772..d4b302e 100644 --- a/tools/src/h5perf/pio_perf.c +++ b/tools/src/h5perf/pio_perf.c @@ -206,7 +206,6 @@ static off_t squareo(off_t); * function. * Return: EXIT_SUCCESS or EXIT_FAILURE * Programmer: Bill Wendling, 30. October 2001 - * Modifications: */ int main(int argc, char *argv[]) @@ -303,15 +302,13 @@ squareo(off_t x) * * Return: Nothing * Programmer: Bill Wendling, 30. October 2001 - * Modifications: - * Added 2D testing (Christian Chilan, 10. August 2005) */ static void run_test_loop(struct options *opts) { parameters parms; int num_procs; - int doing_pio; /* if this process is doing PIO */ + int doing_pio = 0; /* if this process is doing parallel IO */ parms.num_files = opts->num_files; parms.num_dsets = opts->num_dsets; @@ -399,7 +396,6 @@ run_test_loop(struct options *opts) * Purpose: Inner loop call to actually run the I/O test. * Return: Nothing * Programmer: Bill Wendling, 18. December 2001 - * Modifications: */ static int run_test(iotype iot, parameters parms, struct options *opts) @@ -715,7 +711,6 @@ run_test(iotype iot, parameters parms, struct options *opts) * Purpose: * Return: Nothing * Programmer: Bill Wendling, 29. January 2002 - * Modifications: */ static void output_all_info(minmax *mm, int count, int indent_level) @@ -738,12 +733,6 @@ output_all_info(minmax *mm, int count, int indent_level) * object. * Return: 0 if all is fine; otherwise non-zero. * Programmer: Albert Cheng, 2002/05/21. - * Modifications: - * Bill Wendling, 2002/05/31 - * Modified so that the HDF5_MPI_INFO environment variable can - * be a semicolon separated list of "key=value" pairings. Most - * of the code is to remove any whitespaces which might be - * surrounding the "key=value" pairs. */ int h5_set_info_object(void) @@ -836,7 +825,6 @@ h5_set_info_object(void) * Purpose: Display content of an MPI Info object * Return: void * Programmer: Albert Cheng 2002/05/21 - * Modifications: */ void h5_dump_info_object(MPI_Info info) @@ -866,8 +854,6 @@ h5_dump_info_object(MPI_Info info) * Purpose: Gather all the min, max and total of val. * Return: Nothing * Programmer: Bill Wendling, 21. December 2001 - * Modifications: - * Use MPI_Allreduce to do it. -akc, 2002/01/11 */ static void get_minmax(minmax *mm, double val) @@ -888,8 +874,6 @@ get_minmax(minmax *mm, double val) * across all processes. * Return: TOTAL_MM - the total of all of these. * Programmer: Bill Wendling, 21. December 2001 - * Modifications: - * Changed to use seconds instead of MB/s - QAK, 5/9/02 */ static minmax accumulate_minmax_stuff(minmax *mm, int count) @@ -924,7 +908,6 @@ accumulate_minmax_stuff(minmax *mm, int count) * Return: SUCCESS on success. * FAIL otherwise. * Programmer: Bill Wendling, 19. December 2001 - * Modifications: */ static int create_comm_world(int num_procs, int *doing_pio) @@ -983,7 +966,6 @@ error_done: * Return: SUCCESS on success. * FAIL otherwise. * Programmer: Bill Wendling, 19. December 2001 - * Modifications: */ static int destroy_comm_world(void) @@ -1003,7 +985,6 @@ destroy_comm_world(void) * minmax & # of iterations. * Return: Nothing * Programmer: Quincey Koziol, 9. May 2002 - * Modifications: */ static void output_results(const struct options *opts, const char *name, minmax *table, int table_size, off_t data_size) @@ -1067,7 +1048,6 @@ output_times(const struct options *opts, const char *name, minmax *table, int ta * Purpose: Print a line of the report. Only do so if I'm the 0 process. * Return: Nothing * Programmer: Bill Wendling, 19. December 2001 - * Modifications: */ static void output_report(const char *fmt, ...) @@ -1266,8 +1246,6 @@ report_parameters(struct options *opts) * structure which will need to be freed by the calling function. * Return: Pointer to an OPTIONS structure * Programmer: Bill Wendling, 31. October 2001 - * Modifications: - * Added 2D testing (Christian Chilan, 10. August 2005) */ static struct options * parse_command_line(int argc, const char *const *argv) @@ -1518,7 +1496,6 @@ parse_command_line(int argc, const char *const *argv) * If an unknown size indicator is used, then the program will * exit with EXIT_FAILURE as the return value. * Programmer: Bill Wendling, 18. December 2001 - * Modifications: */ static off_t parse_size_directive(const char *size) @@ -1559,8 +1536,6 @@ parse_size_directive(const char *size) * Purpose: Print a usage message and then exit. * Return: Nothing * Programmer: Bill Wendling, 31. October 2001 - * Modifications: - * Added 2D testing (Christian Chilan, 10. August 2005) */ static void usage(const char *prog) diff --git a/tools/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c index 376fc0b..b80189b 100644 --- a/tools/src/h5perf/sio_engine.c +++ b/tools/src/h5perf/sio_engine.c @@ -282,7 +282,6 @@ done: * USER or LOGIN are specified in the environment. * Return: Pointer to filename or NULL * Programmer: Bill Wendling, 21. November 2001 - * Modifications: Support for file drivers. Christian Chilan, April, 2008 */ static char * sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t size, parameters *param) @@ -403,7 +402,6 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si * Purpose: Write the required amount of data to the file. * Return: SUCCESS or FAIL * Programmer: Christian Chilan, April, 2008 - * Modifications: */ static herr_t do_write(results *res, file_descr *fd, parameters *parms, void *buffer) @@ -618,7 +616,6 @@ done: * Purpose: Write buffer into the dataset. * Return: SUCCESS or FAIL * Programmer: Christian Chilan, April, 2008 - * Modifications: */ static herr_t dset_write(int local_dim, file_descr *fd, parameters *parms, void *buffer) @@ -701,7 +698,6 @@ done: * Purpose: Write buffer into the POSIX file considering contiguity. * Return: SUCCESS or FAIL * Programmer: Christian Chilan, April, 2008 - * Modifications: */ static herr_t @@ -762,7 +758,6 @@ done: * Purpose: Read the required amount of data to the file. * Return: SUCCESS or FAIL * Programmer: Christian Chilan, April, 2008 - * Modifications: */ static herr_t do_read(results *res, file_descr *fd, parameters *parms, void *buffer) @@ -940,7 +935,6 @@ done: * Purpose: Read buffer into the dataset. * Return: SUCCESS or FAIL * Programmer: Christian Chilan, April, 2008 - * Modifications: */ static herr_t @@ -1002,7 +996,6 @@ done: * Purpose: Read buffer into the POSIX file considering contiguity. * Return: SUCCESS or FAIL * Programmer: Christian Chilan, April, 2008 - * Modifications: */ static herr_t @@ -1057,7 +1050,6 @@ done: * Purpose: Open the specified file. * Return: SUCCESS or FAIL * Programmer: Albert Cheng, Bill Wendling, 2001/12/13 - * Modifications: Support for file drivers, Christian Chilan, April, 2008 */ static herr_t do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) @@ -1223,7 +1215,6 @@ set_vfd(parameters *param) * Purpose: Close the specified file descriptor. * Return: SUCCESS or FAIL * Programmer: Albert Cheng, Bill Wendling, 2001/12/13 - * Modifications: */ static herr_t do_fclose(iotype iot, file_descr *fd /*out*/) diff --git a/tools/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c index fc300fb..ef9e7db 100644 --- a/tools/src/h5perf/sio_perf.c +++ b/tools/src/h5perf/sio_perf.c @@ -182,7 +182,6 @@ static void report_parameters(struct options *opts); * Purpose: Start things up. * Return: EXIT_SUCCESS or EXIT_FAILURE * Programmer: Bill Wendling, 30. October 2001 - * Modifications: */ int main(int argc, char *argv[]) @@ -237,8 +236,6 @@ finish: * * Return: Nothing * Programmer: Bill Wendling, 30. October 2001 - * Modifications: - * Added multidimensional testing (Christian Chilan, April, 2008) */ static void run_test_loop(struct options *opts) @@ -292,7 +289,6 @@ run_test_loop(struct options *opts) * Purpose: Inner loop call to actually run the I/O test. * Return: Nothing * Programmer: Bill Wendling, 18. December 2001 - * Modifications: */ static int run_test(iotype iot, parameters parms, struct options *opts) @@ -524,7 +520,6 @@ run_test(iotype iot, parameters parms, struct options *opts) * Purpose: * Return: Nothing * Programmer: Bill Wendling, 29. January 2002 - * Modifications: */ static void output_all_info(minmax *mm, int count, int indent_level) @@ -546,8 +541,6 @@ output_all_info(minmax *mm, int count, int indent_level) * Purpose: Gather all the min, max and total of val. * Return: Nothing * Programmer: Bill Wendling, 21. December 2001 - * Modifications: - * Use MPI_Allreduce to do it. -akc, 2002/01/11 */ static void @@ -564,8 +557,6 @@ get_minmax(minmax *mm, double val) * across all processes. * Return: TOTAL_MM - the total of all of these. * Programmer: Bill Wendling, 21. December 2001 - * Modifications: - * Changed to use seconds instead of MB/s - QAK, 5/9/02 */ static void accumulate_minmax_stuff(const minmax *mm, int count, minmax *total_mm) @@ -596,7 +587,6 @@ accumulate_minmax_stuff(const minmax *mm, int count, minmax *total_mm) * minmax & # of iterations. * Return: Nothing * Programmer: Quincey Koziol, 9. May 2002 - * Modifications: */ static void output_results(const struct options *opts, const char *name, minmax *table, int table_size, off_t data_size) @@ -637,7 +627,6 @@ output_results(const struct options *opts, const char *name, minmax *table, int * Purpose: Print a line of the report. Only do so if I'm the 0 process. * Return: Nothing * Programmer: Bill Wendling, 19. December 2001 - * Modifications: */ static void output_report(const char *fmt, ...) @@ -812,8 +801,6 @@ report_parameters(struct options *opts) * structure which will need to be freed by the calling function. * Return: Pointer to an OPTIONS structure * Programmer: Bill Wendling, 31. October 2001 - * Modifications: - * Added multidimensional testing (Christian Chilan, April, 2008) */ static struct options * parse_command_line(int argc, const char *const *argv) @@ -1180,7 +1167,6 @@ parse_command_line(int argc, const char *const *argv) * If an unknown size indicator is used, then the program will * exit with EXIT_FAILURE as the return value. * Programmer: Bill Wendling, 18. December 2001 - * Modifications: */ static hsize_t @@ -1225,7 +1211,6 @@ parse_size_directive(const char *size) * Purpose: Print a usage message and then exit. * Return: Nothing * Programmer: Bill Wendling, 31. October 2001 - * Modifications: */ static void usage(const char *prog) diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c index d29c6e4..04d1723 100644 --- a/tools/src/h5stat/h5stat.c +++ b/tools/src/h5stat/h5stat.c @@ -335,18 +335,6 @@ attribute_stats(iter_t *iter, const H5O_info2_t *oi, const H5O_native_info_t *na * Programmer: Quincey Koziol * Tuesday, August 16, 2005 * - * Modifications: Refactored code from the walk_function - * EIP, Wednesday, August 16, 2006 - * - * Vailin Choi 12 July 2007 - * 1. Gathered storage info for btree and heap - * (groups and attributes) - * 2. Gathered info for attributes - * - * Vailin Choi 14 July 2007 - * Cast "num_objs" and "num_attrs" to size_t - * Due to the -Mbounds problem for the pgi-32 bit compiler on indexing - * *------------------------------------------------------------------------- */ static herr_t @@ -1103,8 +1091,6 @@ iter_free(iter_t *iter) * Programmer: Elena Pourmal * Saturday, August 12, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -1190,11 +1176,6 @@ print_file_metadata(const iter_t *iter) * Programmer: Elena Pourmal * Saturday, August 12, 2006 * - * Modifications: - * bug #1253; Oct 6th 2008; Vailin Choi - * Fixed segmentation fault: print iter->group_bins[0] when - * there is iter->group_nbins - * *------------------------------------------------------------------------- */ static herr_t @@ -1636,8 +1617,6 @@ print_file_statistics(const iter_t *iter) * Programmer: Elena Pourmal * Thursday, August 17, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -1658,8 +1637,6 @@ print_object_statistics(const char *name) * Programmer: Elena Pourmal * Thursday, August 17, 2006 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -1674,10 +1651,6 @@ print_statistics(const char *name, const iter_t *iter) /*------------------------------------------------------------------------- * Function: main * - * Modifications: - * 2/2010; Vailin Choi - * Get the size of user block - * *------------------------------------------------------------------------- */ int diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c index ac10944..c01ec0f 100644 --- a/tools/src/misc/h5repart.c +++ b/tools/src/misc/h5repart.c @@ -45,8 +45,6 @@ * Programmer: Robb Matzke * Wednesday, May 13, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -146,8 +144,6 @@ get_size(const char *progname, int *argno, int argc, char *argv[]) * Programmer: Robb Matzke * Wednesday, May 13, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ H5_GCC_CLANG_DIAG_OFF("format-nonliteral") diff --git a/tools/test/h5diff/h5diff_plugin.sh.in b/tools/test/h5diff/h5diff_plugin.sh.in index ee7bc8b..e3f0f01 100644 --- a/tools/test/h5diff/h5diff_plugin.sh.in +++ b/tools/test/h5diff/h5diff_plugin.sh.in @@ -82,7 +82,7 @@ if [ $? != 0 ]; then fi # setup plugin path -ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}" +ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}:${HDF5_PLUGIN_PATH}" # # copy test files and expected output files from source dirs to test dir diff --git a/tools/test/h5dump/binread.c b/tools/test/h5dump/binread.c index 484e354..2315e85 100644 --- a/tools/test/h5dump/binread.c +++ b/tools/test/h5dump/binread.c @@ -39,8 +39,6 @@ * * Programmer: Pedro Vicente Nunes * - * Modifications: - * *------------------------------------------------------------------------- */ static void diff --git a/tools/test/h5dump/h5dump_plugin.sh.in b/tools/test/h5dump/h5dump_plugin.sh.in index b2f9f31..d9b77ee 100644 --- a/tools/test/h5dump/h5dump_plugin.sh.in +++ b/tools/test/h5dump/h5dump_plugin.sh.in @@ -88,7 +88,7 @@ if [ $? != 0 ]; then fi # setup plugin path -ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}" +ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}:${HDF5_PLUGIN_PATH}" # # copy test files and expected output files from source dirs to test dir diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c index 7e8e19b..1fd512c 100644 --- a/tools/test/h5dump/h5dumpgentest.c +++ b/tools/test/h5dump/h5dumpgentest.c @@ -7175,10 +7175,6 @@ gent_fs_strategy_threshold(void) * Create one dataset with (set_chunk, fixed dims, fixed max. dims) * so that Fixed Array indexing will be used. * - * Modifications: - * Fixed Array indexing will be used for chunked dataset - * with fixed max. dims setting. - * */ static void gent_dataset_idx(void) diff --git a/tools/test/h5ls/h5ls_plugin.sh.in b/tools/test/h5ls/h5ls_plugin.sh.in index 48f6e1e..02e0cf7 100644 --- a/tools/test/h5ls/h5ls_plugin.sh.in +++ b/tools/test/h5ls/h5ls_plugin.sh.in @@ -88,7 +88,7 @@ if [ $? != 0 ]; then fi # setup plugin path -ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}" +ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}:${HDF5_PLUGIN_PATH}" # # copy test files and expected output files from source dirs to test dir diff --git a/tools/test/h5repack/h5repack_plugin.sh.in b/tools/test/h5repack/h5repack_plugin.sh.in index 14bcbbf..bd7c3a1 100644 --- a/tools/test/h5repack/h5repack_plugin.sh.in +++ b/tools/test/h5repack/h5repack_plugin.sh.in @@ -98,7 +98,7 @@ if [ $? != 0 ]; then fi # setup plugin path -ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}" +ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}:${HDF5_PLUGIN_PATH}" COPY_TESTFILES_TO_TESTDIR() { diff --git a/tools/test/h5repack/testh5repack_detect_szip.c b/tools/test/h5repack/testh5repack_detect_szip.c index f4e4aec..b2be484 100644 --- a/tools/test/h5repack/testh5repack_detect_szip.c +++ b/tools/test/h5repack/testh5repack_detect_szip.c @@ -30,10 +30,6 @@ * * Date: * - * Comments: - * - * Modifications: - * *------------------------------------------------------------------------- */ diff --git a/tools/test/h5stat/testh5stat.sh.in b/tools/test/h5stat/testh5stat.sh.in index 9cbedce..65e40c4 100644 --- a/tools/test/h5stat/testh5stat.sh.in +++ b/tools/test/h5stat/testh5stat.sh.in @@ -12,10 +12,6 @@ # # Tests for the h5stat tool # -# Modifications: -# Vailin Choi; July 2013 -# Add tests for -l, -m, -a options -# srcdir=@srcdir@ diff --git a/tools/test/perform/chunk.c b/tools/test/perform/chunk.c index 27ada87..3f4b3d7 100644 --- a/tools/test/perform/chunk.c +++ b/tools/test/perform/chunk.c @@ -97,8 +97,6 @@ const H5Z_class2_t H5Z_COUNTER[1] = {{ * Programmer: Robb Matzke * Thursday, May 14, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static size_t @@ -123,8 +121,6 @@ counter(unsigned H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts, * Programmer: Robb Matzke * Thursday, May 14, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -175,8 +171,6 @@ create_dataset(void) * Programmer: Robb Matzke * Thursday, May 14, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static double @@ -247,8 +241,6 @@ test_rowmaj(int op, size_t cache_size, size_t io_size) * Programmer: Robb Matzke * Friday, May 15, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static double @@ -318,8 +310,6 @@ test_diag(int op, size_t cache_size, size_t io_size, size_t offset) * Programmer: Robb Matzke * Thursday, May 14, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/tools/test/perform/overhead.c b/tools/test/perform/overhead.c index 69a8251..257d3ec 100644 --- a/tools/test/perform/overhead.c +++ b/tools/test/perform/overhead.c @@ -62,8 +62,6 @@ typedef enum fill_t { FILL_ALL, FILL_FORWARD, FILL_REVERSE, FILL_INWARD, FILL_OU * Programmer: Robb Matzke * Wednesday, September 30, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -111,8 +109,6 @@ usage(const char *prog) * Programmer: Robb Matzke * Thursday, June 4, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -135,8 +131,6 @@ cleanup(void) * Programmer: Robb Matzke * Wednesday, March 4, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -160,8 +154,6 @@ display_error_cb(hid_t estack, void H5_ATTR_UNUSED *client_data) * Programmer: Robb Matzke * Wednesday, September 30, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -333,8 +325,6 @@ error: * Programmer: Robb Matzke * Monday, September 28, 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/tools/test/perform/perf_meta.c b/tools/test/perform/perf_meta.c index 94fe849..6e62f6a 100644 --- a/tools/test/perform/perf_meta.c +++ b/tools/test/perform/perf_meta.c @@ -68,13 +68,11 @@ void print_perf(p_time, p_time, p_time); /*------------------------------------------------------------------------- * Function: parse_options * - Purpose: Parse command line options + * Purpose: Parse command line options * * Programmer: Raymond Lu * Friday, Oct 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static int @@ -188,13 +186,11 @@ parse_options(int argc, char **argv) /*------------------------------------------------------------------------- * Function: usage * - Purpose: Prints help page + * Purpose: Prints help page * * Programmer: Raymond Lu * Friday, Oct 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static void @@ -248,8 +244,6 @@ usage(void) * Programmer: Raymond Lu * Friday, Oct 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -288,8 +282,6 @@ error: * Programmer: Raymond Lu * Friday, Oct 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -330,8 +322,6 @@ error: * Programmer: Raymond Lu * Friday, Oct 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -435,8 +425,6 @@ error: * Programmer: Raymond Lu * Friday, Oct 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -538,8 +526,6 @@ error: * Programmer: Raymond Lu * Friday, Oct 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t @@ -644,8 +630,6 @@ error: * Programmer: Raymond Lu * Friday, Oct 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ double @@ -674,8 +658,6 @@ retrieve_time(void) * Programmer: Raymond Lu * Friday, Oct 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ void @@ -728,8 +710,6 @@ perf(p_time *perf_t, double start_t, double end_t) * Programmer: Raymond Lu * Friday, Oct 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ void @@ -756,8 +736,6 @@ print_perf(p_time open_t, p_time close_t, p_time attr_t) * Programmer: Raymond Lu * Friday, Oct 3, 2003 * - * Modifications: - * *------------------------------------------------------------------------- */ int diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c index 1265c30..256289c 100644 --- a/tools/test/perform/zip_perf.c +++ b/tools/test/perform/zip_perf.c @@ -77,7 +77,6 @@ static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'}, * Function: error * Purpose: Display error message and exit. * Programmer: Bill Wendling, 05. June 2002 - * Modifications: */ static void error(const char *fmt, ...) @@ -99,7 +98,6 @@ error(const char *fmt, ...) * Purpose: Cleanup the output file. * Returns: Nothing * Programmer: Bill Wendling, 06. June 2002 - * Modifications: */ static void cleanup(void) @@ -164,7 +162,6 @@ write_file(Bytef *source, uLongf sourceLen) * Z_BUF_ERROR - not enough room in the output buffer * Z_STREAM_ERROR - level parameter is invalid * Programmer: Bill Wendling, 05. June 2002 - * Modifications: */ static void compress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen) @@ -192,33 +189,12 @@ compress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceL } } -#ifdef LATER -/* - * Function: uncompress_buffer - * Purpose: Uncompress the buffer. - * Returns: Z_OK - success - * Z_MEM_ERROR - not enough memory - * Z_BUF_ERROR - not enough room in the output buffer - * Z_DATA_ERROR - the input data was corrupted - * Programmer: Bill Wendling, 05. June 2002 - * Modifications: - */ -static int -uncompress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen) -{ - int rc = uncompress(dest, destLen, source, sourceLen); - - return rc; -} -#endif /* LATER */ - /* * Function: get_unique_name * Purpose: Create a new file who's name doesn't conflict with * pre-existing files. * Returns: Nothing * Programmer: Bill Wendling, 06. June 2002 - * Modifications: */ #define ZIP_PERF_FILE "zip_perf.data" static void @@ -255,7 +231,6 @@ get_unique_name(void) * Purpose: Print a usage message and then exit. * Return: Nothing * Programmer: Bill Wendling, 05. June 2002 - * Modifications: */ static void usage(void) @@ -298,7 +273,6 @@ usage(void) * If an unknown size indicator is used, then the program will * exit with EXIT_FAILURE as the return value. * Programmer: Bill Wendling, 05. June 2002 - * Modifications: */ static unsigned long parse_size_directive(const char *size) @@ -487,7 +461,6 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long * Purpose: Run the program * Return: EXIT_SUCCESS or EXIT_FAILURE * Programmer: Bill Wendling, 05. June 2002 - * Modifications: */ int main(int argc, char *argv[]) @@ -575,7 +548,6 @@ main(int argc, char *argv[]) * zlib stuff. * Return: EXIT_SUCCESS * Programmer: Bill Wendling, 10. June 2002 - * Modifications: */ int main(void) |