diff --git a/doc/sphinx/userDoc/options.rst b/doc/sphinx/userDoc/options.rst index 7626d0e..bb7eb92 100644 --- a/doc/sphinx/userDoc/options.rst +++ b/doc/sphinx/userDoc/options.rst @@ -17,7 +17,7 @@ normal parameters override each other, so the last one executed. Command line options -------------------- These options are to be used on the command line. E.g., 'IOR -a POSIX -b 4K'. - -a S api -- API for I/O [POSIX|MPIIO|HDF5|HDFS|S3|S3_EMC|NCMPI] + -a S api -- API for I/O [POSIX|MPIIO|HDF5|HDFS|S3|S3_EMC|NCMPI|RADOS] -A N refNum -- user reference number to include in long summary -b N blockSize -- contiguous bytes to write per task (e.g.: 8, 4k, 2m, 1g) -B useO_DIRECT -- uses O_DIRECT for POSIX, bypassing I/O buffers diff --git a/doc/sphinx/userDoc/skripts.rst b/doc/sphinx/userDoc/skripts.rst index bfb07b2..964f1ac 100644 --- a/doc/sphinx/userDoc/skripts.rst +++ b/doc/sphinx/userDoc/skripts.rst @@ -25,7 +25,7 @@ Syntax: An example of a script: :: IOR START - api=[POSIX|MPIIO|HDF5|HDFS|S3|S3_EMC|NCMPI] + api=[POSIX|MPIIO|HDF5|HDFS|S3|S3_EMC|NCMPI|RADOS] testFile=testFile hintsFileName=hintsFile repetitions=8 diff --git a/src/aiori-RADOS.c b/src/aiori-RADOS.c index da27dec..430c1b2 100755 --- a/src/aiori-RADOS.c +++ b/src/aiori-RADOS.c @@ -56,7 +56,7 @@ static int RADOS_MkDir(const char *, mode_t, IOR_param_t *); static int RADOS_RmDir(const char *, IOR_param_t *); static int RADOS_Access(const char *, int, IOR_param_t *); static int RADOS_Stat(const char *, struct stat *, IOR_param_t *); -static option_help * RADIOS_options(); +static option_help * RADOS_options(); /************************** D E C L A R A T I O N S ***************************/ ior_aiori_t rados_aiori = { @@ -74,7 +74,7 @@ ior_aiori_t rados_aiori = { .rmdir = RADOS_RmDir, .access = RADOS_Access, .stat = RADOS_Stat, - .get_options = RADIOS_options, + .get_options = RADOS_options, }; #define RADOS_ERR(__err_str, __ret) do { \ @@ -83,7 +83,7 @@ ior_aiori_t rados_aiori = { } while(0) /***************************** F U N C T I O N S ******************************/ -static option_help * RADIOS_options(){ +static option_help * RADOS_options(){ return options; } diff --git a/src/mdtest.c b/src/mdtest.c index b646aef..61decb4 100644 --- a/src/mdtest.c +++ b/src/mdtest.c @@ -1308,7 +1308,7 @@ void print_help (void) { " [-n number_of_items] [-N stride_length] [-p seconds] [-r]\n" " [-R[seed]] [-s stride] [-S] [-t] [-T] [-u] [-v] [-a API]\n" " [-V verbosity_value] [-w number_of_bytes_to_write] [-W seconds] [-y] [-z depth] -Z\n" - "\t-a: API for I/O [POSIX|MPIIO|HDF5|HDFS|S3|S3_EMC|NCMPI]\n" + "\t-a: API for I/O [POSIX|MPIIO|HDF5|HDFS|S3|S3_EMC|NCMPI|RADOS]\n" "\t-b: branching factor of hierarchical directory structure\n" "\t-B: no barriers between phases\n" "\t-c: collective creates: task 0 does all creates\n" @@ -2164,7 +2164,7 @@ mdtest_results_t * mdtest_run(int argc, char **argv, MPI_Comm world_com, FILE * char * path = "./out"; int randomize = 0; option_help options [] = { - {'a', NULL, "API for I/O [POSIX|MPIIO|HDF5|HDFS|S3|S3_EMC|NCMPI]", OPTION_OPTIONAL_ARGUMENT, 's', & backend_name}, + {'a', NULL, "API for I/O [POSIX|MPIIO|HDF5|HDFS|S3|S3_EMC|NCMPI|RADOS]", OPTION_OPTIONAL_ARGUMENT, 's', & backend_name}, {'b', NULL, "branching factor of hierarchical directory structure", OPTION_OPTIONAL_ARGUMENT, 'd', & branch_factor}, {'d', NULL, "the directory in which the tests will run", OPTION_OPTIONAL_ARGUMENT, 's', & path}, {'B', NULL, "no barriers between phases", OPTION_OPTIONAL_ARGUMENT, 'd', & no_barriers}, diff --git a/src/parse_options.c b/src/parse_options.c index 55ef5ab..d0dec17 100755 --- a/src/parse_options.c +++ b/src/parse_options.c @@ -438,7 +438,7 @@ IOR_test_t *ParseCommandLine(int argc, char **argv) parameters = & initialTestParams; option_help options [] = { - {'a', NULL, "API for I/O [POSIX|MPIIO|HDF5|HDFS|S3|S3_EMC|NCMPI]", OPTION_OPTIONAL_ARGUMENT, 's', & initialTestParams.api}, + {'a', NULL, "API for I/O [POSIX|MPIIO|HDF5|HDFS|S3|S3_EMC|NCMPI|RADOS]", OPTION_OPTIONAL_ARGUMENT, 's', & initialTestParams.api}, {'A', NULL, "refNum -- user supplied reference number to include in the summary", OPTION_OPTIONAL_ARGUMENT, 'd', & initialTestParams.referenceNumber}, {'b', NULL, "blockSize -- contiguous bytes to write per task (e.g.: 8, 4k, 2m, 1g)", OPTION_OPTIONAL_ARGUMENT, 'l', & initialTestParams.blockSize}, {'B', NULL, "useO_DIRECT -- uses O_DIRECT for POSIX, bypassing I/O buffers", OPTION_FLAG, 'd', & initialTestParams.useO_DIRECT},