Changed the parser.

The parser now supports concurrent parsing of all plugin options.
Moved HDF5 collective_md option into the backend as an example.
Example: ./src/ior -a dummy --dummy.delay-xfer=50000

Author: JulianKunkel

doc/sphinx/userDoc/options.rst

@@ -289,8 +289,9 @@ HDF5-ONLY
 
   * setAlignment         - HDF5 alignment in bytes (e.g.: 8, 4k, 2m, 1g) [1]
 
-  * collectiveMetadata   - enable HDF5 collective metadata (available since
-                           HDF5-1.10.0)
+HDF5-backend options
+^^^^^^^^^^^^^^^^^^^^
+  * -c | --collectiveMetadata   - enable HDF5 collective metadata (available since HDF5-1.10.0)
 
 MPIIO-, HDF5-, AND NCMPI-ONLY
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

src/aiori-DUMMY.c

@@ -29,9 +29,9 @@ static struct dummy_options o = {
 };
 
 static option_help options [] = {
-      {'c', "delay-create",        "Delay per create in usec", OPTION_OPTIONAL_ARGUMENT, 'l', & o.delay_creates},
-      {'x', "delay-xfer",          "Delay per xfer in usec", OPTION_OPTIONAL_ARGUMENT, 'l', & o.delay_xfer},
-      {'z', "delay-only-rank0",    "Delay only Rank0", OPTION_FLAG, 'd', & o.delay_rank_0_only},
+      {0, "dummy.delay-create",        "Delay per create in usec", OPTION_OPTIONAL_ARGUMENT, 'l', & o.delay_creates},
+      {0, "dummy.delay-xfer",          "Delay per xfer in usec", OPTION_OPTIONAL_ARGUMENT, 'l', & o.delay_xfer},
+      {0, "dummy.delay-only-rank0",    "Delay only Rank0", OPTION_FLAG, 'd', & o.delay_rank_0_only},
       LAST_OPTION
 };
 

src/aiori-HDF5.c

@@ -93,6 +93,7 @@ static char* HDF5_GetVersion();
 static void HDF5_Fsync(void *, IOR_param_t *);
 static IOR_offset_t HDF5_GetFileSize(IOR_param_t *, MPI_Comm, char *);
 static int HDF5_Access(const char *, int, IOR_param_t *);
+static option_help * HDF5_get_options();
 
 /************************** D E C L A R A T I O N S ***************************/
 
@@ -111,6 +112,7 @@ ior_aiori_t hdf5_aiori = {
         .rmdir = aiori_posix_rmdir,
         .access = HDF5_Access,
         .stat = aiori_posix_stat,
+        .get_options = HDF5_get_options
 };
 
 static hid_t xferPropList;      /* xfer property list */
@@ -120,8 +122,27 @@ hid_t fileDataSpace;            /* file data space id */
 hid_t memDataSpace;             /* memory data space id */
 int newlyOpenedFile;            /* newly opened file */
 
+/************************** O P T I O N S *****************************/
+struct HDF5_options{
+  int collective_md;
+};
 /***************************** F U N C T I O N S ******************************/
 
+
+static struct HDF5_options o = {
+  .collective_md = 0
+};
+
+static option_help options [] = {
+      {0, "hdf5.collectiveMetadata",        "Use collectiveMetadata (available since HDF5-1.10.0)", OPTION_FLAG, 'd', & o.collective_md},
+      LAST_OPTION
+};
+
+static option_help * HDF5_get_options(){
+  return options;
+}
+
+
 /*
  * Create and open a file through the HDF5 interface.
  */
@@ -229,7 +250,7 @@ static void *HDF5_Open(char *testFileName, IOR_param_t * param)
                    "cannot set alignment");
 
 #ifdef HAVE_H5PSET_ALL_COLL_METADATA_OPS
-        if (param->collective_md) {
+        if (o.collective_md) {
                 /* more scalable metadata */
 
                 HDF5_CHECK(H5Pset_all_coll_metadata_ops(accessPropList, 1),

src/aiori-RADOS.c

@@ -41,9 +41,9 @@ static struct rados_options o = {
 };
 
 static option_help options [] = {
-      {'u', "user", "Username for the RADOS cluster", OPTION_REQUIRED_ARGUMENT, 's', & o.user},
-      {'c', "conf", "Config file for the RADOS cluster", OPTION_REQUIRED_ARGUMENT, 's', & o.conf},
-      {'p', "pool", "RADOS pool to use for I/O", OPTION_REQUIRED_ARGUMENT, 's', & o.pool},
+      {0, "rados.user", "Username for the RADOS cluster", OPTION_REQUIRED_ARGUMENT, 's', & o.user},
+      {0, "rados.conf", "Config file for the RADOS cluster", OPTION_REQUIRED_ARGUMENT, 's', & o.conf},
+      {0, "rados.pool", "RADOS pool to use for I/O", OPTION_REQUIRED_ARGUMENT, 's', & o.pool},
       LAST_OPTION
 };
 

src/aiori.c

@@ -61,6 +61,26 @@ ior_aiori_t *available_aiori[] = {
         NULL
 };
 
+void airoi_parse_options(int argc, char ** argv, option_help * global_options){
+    int airoi_c = aiori_count();
+    options_all opt;
+    opt.module_count = airoi_c + 1;
+    opt.modules = malloc(sizeof(option_module) * (airoi_c + 1));
+    opt.modules[0].prefix = NULL;
+    opt.modules[0].options = global_options;
+    ior_aiori_t **tmp = available_aiori;
+    for (int i=1; *tmp != NULL; ++tmp, i++) {
+      opt.modules[i].prefix = (*tmp)->name;
+      if((*tmp)->get_options != NULL){
+        opt.modules[i].options = (*tmp)->get_options();
+      }else{
+        opt.modules[i].options = NULL;
+      }
+    }
+    option_parse(argc, argv, &opt);
+    free(opt.modules);
+}
+
 void aiori_supported_apis(char * APIs){
   ior_aiori_t **tmp = available_aiori;
   if(*tmp != NULL){

src/aiori.h

@@ -102,6 +102,7 @@ void aiori_finalize();
 const ior_aiori_t *aiori_select (const char *api);
 int aiori_count (void);
 void aiori_supported_apis(char * APIs);
+void airoi_parse_options(int argc, char ** argv, option_help * global_options);
 const char *aiori_default (void);
 
 /* some generic POSIX-based backend calls */

src/ior.h

@@ -175,7 +175,6 @@ typedef struct
     char*       URI;                 /* "path" to target object */
     size_t      part_number;         /* multi-part upload increment (PER-RANK!) */
     char*       UploadId; /* key for multi-part-uploads */
-    int         collective_md;       /* use collective metatata optimization */
 
     /* RADOS variables */
     rados_t rados_cluster;           /* RADOS cluster handle */

src/mdtest.c

@@ -2217,35 +2217,13 @@ mdtest_results_t * mdtest_run(int argc, char **argv, MPI_Comm world_com, FILE *
       {'Z', NULL,        "print time instead of rate", OPTION_FLAG, 'd', & print_time},
       LAST_OPTION
     };
-    int printhelp = 0;
-    int parsed_options = option_parse(argc, argv, options, & printhelp);
+    airoi_parse_options(argc, argv, options);
 
     backend = aiori_select(backend_name);
     if (NULL == backend) {
         FAIL("Could not find suitable backend to use");
     }
 
-    if(backend->get_options != NULL){
-      option_parse(argc - parsed_options, argv + parsed_options, backend->get_options(), & printhelp);
-    }
-
-    if(printhelp != 0){
-      printf("Usage: %s ", argv[0]);
-
-      option_print_help(options, 0);
-
-      if(backend->get_options != NULL){
-        printf("\nPlugin options for backend %s\n", backend_name);
-        option_print_help(backend->get_options(), 1);
-      }
-      if(printhelp == 1){
-        exit(0);
-      }else{
-        exit(1);
-      }
-    }
-
-
     MPI_Comm_rank(testComm, &rank);
     MPI_Comm_size(testComm, &size);