diff options
Diffstat (limited to 'tools/src/h5perf')
-rw-r--r-- | tools/src/h5perf/pio_engine.c | 32 | ||||
-rw-r--r-- | tools/src/h5perf/pio_perf.c | 27 | ||||
-rw-r--r-- | tools/src/h5perf/sio_engine.c | 9 | ||||
-rw-r--r-- | tools/src/h5perf/sio_perf.c | 15 |
4 files changed, 12 insertions, 71 deletions
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) |