mtl/ofi: add some more mca parameters

allow for toggling of both control/data progress models.
allow for using FI_AV_TABLE or FI_AV_MAP for av type.

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

ompi/mca/mtl/ofi/mtl_ofi_component.c

@@ -3,7 +3,7 @@
  * Copyright (c) 2013-2016 Intel, Inc. All rights reserved
  *
  * Copyright (c) 2014-2015 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Los Alamos National Security, LLC.  All rights
+ * Copyright (c) 2015-2016 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * $COPYRIGHT$
  *
@@ -27,6 +27,9 @@ ompi_mtl_ofi_component_init(bool enable_progress_threads,
 static int param_priority;
 static char *prov_include;
 static char *prov_exclude;
+static char *control_progress;
+static char *data_progress;
+static char *av_type;
 
 mca_mtl_ofi_component_t mca_mtl_ofi_component = {
     {
@@ -82,6 +85,33 @@ ompi_mtl_ofi_component_register(void)
                                     MCA_BASE_VAR_SCOPE_READONLY,
                                     &prov_exclude);
 
+    control_progress = "manual";
+    mca_base_component_var_register(&mca_mtl_ofi_component.super.mtl_version,
+                                    "control_progress",
+                                    "Specify control progress model (default: manual). Set to auto for auto progress.",
+                                    MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
+                                    OPAL_INFO_LVL_3,
+                                    MCA_BASE_VAR_SCOPE_READONLY,
+                                    &control_progress);
+
+    data_progress = "auto";
+    mca_base_component_var_register(&mca_mtl_ofi_component.super.mtl_version,
+                                    "data_progress",
+                                    "Specify data progress model (default: auto). Set to manual for manual progress.",
+                                    MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
+                                    OPAL_INFO_LVL_3,
+                                    MCA_BASE_VAR_SCOPE_READONLY,
+                                    &data_progress);
+
+    av_type = "map";
+    mca_base_component_var_register(&mca_mtl_ofi_component.super.mtl_version,
+                                    "av_type",
+                                    "Specify AV type to use (default: map). Set to table for FI_AV_TABLE AV type.",
+                                    MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
+                                    OPAL_INFO_LVL_3,
+                                    MCA_BASE_VAR_SCOPE_READONLY,
+                                    &av_type);
+
     return OMPI_SUCCESS;
 }
 
@@ -239,9 +269,25 @@ ompi_mtl_ofi_component_init(bool enable_progress_threads,
     hints->rx_attr->msg_order = FI_ORDER_SAS;
 
     hints->domain_attr->threading        = FI_THREAD_UNSPEC;
-    hints->domain_attr->control_progress = FI_PROGRESS_MANUAL;
+
+    if (0 == strcmp(control_progress,"auto")) {
+        hints->domain_attr->control_progress = FI_PROGRESS_AUTO;
+    } else {
+        hints->domain_attr->control_progress = FI_PROGRESS_MANUAL;
+    }
+
+    if (0 == strcmp(data_progress,"manual")) {
+        hints->domain_attr->data_progress = FI_PROGRESS_MANUAL;
+    } else {
+        hints->domain_attr->data_progress = FI_PROGRESS_AUTO;
+    }
+
     hints->domain_attr->resource_mgmt    = FI_RM_ENABLED;
-    hints->domain_attr->av_type          = FI_AV_MAP;
+    if (0 == strcmp(av_type, "table")) {
+        hints->domain_attr->av_type          = FI_AV_TABLE;
+    } else {
+        hints->domain_attr->av_type          = FI_AV_MAP;
+    }
 
     /**
      * FI_VERSION provides binary backward and forward compatibility support