Merge pull request #7261 from bosilca/fix/vprotocol

Fix/vprotocol initialization

Author: bosilca

ompi/mca/pml/base/pml_base_frame.c

@@ -218,7 +218,19 @@ static int mca_pml_base_open(mca_base_open_flag_t flags)
             opal_pointer_array_add(&mca_pml_base_pml, strdup("ucx"));
             opal_pointer_array_add(&mca_pml_base_pml, strdup("cm"));
         } else {
+#if OPAL_ENABLE_DEBUG
+            char **req_pml = opal_argv_split(default_pml[0], ',');
+            if( NULL != req_pml[1] ) {
+                opal_output(0, "Only one PML must be provided. Using %s PML (the"
+                            " first on the MCA pml list)", req_pml[0]);
+                opal_pointer_array_add(&mca_pml_base_pml, strdup(req_pml[0]));
+            } else {
+                opal_pointer_array_add(&mca_pml_base_pml, strdup(default_pml[0]));
+            }
+            opal_argv_free(req_pml);
+#else
             opal_pointer_array_add(&mca_pml_base_pml, strdup(default_pml[0]));
+#endif  /* OPAL_ENABLE_DEBUG */
         }
     }
 #if OPAL_ENABLE_FT_CR == 1

ompi/mca/pml/v/pml_v_component.c

@@ -28,6 +28,7 @@
 #include "ompi/mca/vprotocol/base/base.h"
 #include "pml_v_output.h"
 #include "pml_v.h"
+#include "ompi/runtime/mpiruntime.h"
 
 static int mca_pml_v_component_register(void);
 static int mca_pml_v_component_open(void);
@@ -61,9 +62,6 @@ mca_pml_base_component_2_0_0_t mca_pml_v_component =
     .pmlm_finalize = mca_pml_v_component_finalize,
 };
 
-static bool pml_v_enable_progress_treads = OPAL_ENABLE_PROGRESS_THREADS;
-static bool pml_v_enable_mpi_thread_multiple = 1;
-
 static char *ompi_pml_vprotocol_include_list;
 static char *ompi_pml_v_output;
 static int ompi_pml_v_verbose;
@@ -205,17 +203,19 @@ static int mca_pml_v_component_parasite_close(void)
 
 
 /*******************************************************************************
- * Init/finalize for MCA PML components
+ * The init function for the V PML is never supposed to be called, as the mechanism
+ * that enables the PML V to work require a real PML to move data across. Thus, a
+ * normal PML should be selected (so the PML V cannot be in the MCA list of PMLs)
+ * and if the PML V is enabled (via the activation of a vprotocol) it will insert
+ * itself before the selected PML (assuming no DIRECT_call PML).
  */
-static mca_pml_base_module_t *mca_pml_v_component_init(int *priority,
-                                                      bool enable_progress_threads,
-                                                      bool enable_mpi_thread_multiple)
+static mca_pml_base_module_t*
+mca_pml_v_component_init(int *priority,
+                         bool enable_progress_threads,
+                         bool enable_mpi_thread_multiple)
 {
     V_OUTPUT_VERBOSE(1, "init: I'm not supposed to be here until BTL loading stuff gets fixed!? That's strange...");
 
-    pml_v_enable_progress_treads = enable_progress_threads;
-    pml_v_enable_mpi_thread_multiple = enable_mpi_thread_multiple;
-
     /* I NEVER want to be the selected PML, so I report less than possible
      * priority and a NULL module
      */
@@ -249,8 +249,8 @@ static int mca_pml_v_enable(bool enable)
     if(enable) {
         /* Check if a protocol have been selected during init */
         if(! mca_vprotocol_base_selected())
-            mca_vprotocol_base_select(pml_v_enable_progress_treads,
-                                      pml_v_enable_mpi_thread_multiple);
+            mca_vprotocol_base_select(OPAL_ENABLE_PROGRESS_THREADS,
+                                      ompi_mpi_thread_multiple);
 
         /* Check if we succeeded selecting a protocol */
         if(mca_vprotocol_base_selected()) {

ompi/mca/vprotocol/pessimist/vprotocol_pessimist_component.c

@@ -30,6 +30,7 @@ static int _free_list_inc;
 static int _sender_based_size;
 static int _event_buffer_size;
 static char *_mmap_file_name;
+static int ompi_vprotocol_pessimist_allow_thread_multiple;
 
 mca_vprotocol_base_component_2_0_0_t mca_vprotocol_pessimist_component =
 {
@@ -94,13 +95,27 @@ static int mca_vprotocol_pessimist_component_register(void)
                                            "sender_based_file", NULL, MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
                                            OPAL_INFO_LVL_9,
                                            MCA_BASE_VAR_SCOPE_READONLY, &_mmap_file_name);
+    /* Provide an overwrite allowing the PML V to run even if the OMPI library has been
+     * initialized with full support for THREAD_MULTIPLE.
+     */
+    ompi_vprotocol_pessimist_allow_thread_multiple = 0;
+    (void) mca_base_component_var_register(&mca_vprotocol_pessimist_component.pmlm_version,
+                                           "allow_thread_multiple", "Allow the PML V to work even when the MPI"
+                                           " library is initialized with MPI_THREAD_MULTIPLE support. By "
+                                           "default the PML V is disabled in such instances, to protect "
+                                           "applications that are not send deterministic.",
+                                           MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
+                                           OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
+                                           &ompi_vprotocol_pessimist_allow_thread_multiple);
+
+
     return OMPI_SUCCESS;
 }
 
 static int mca_vprotocol_pessimist_component_open(void)
 {
     V_OUTPUT_VERBOSE(500, "vprotocol_pessimist: component_open: read priority %d", _priority);
-  return OMPI_SUCCESS;
+    return OMPI_SUCCESS;
 }
 
 static int mca_vprotocol_pessimist_component_close(void)
@@ -111,16 +126,22 @@ static int mca_vprotocol_pessimist_component_close(void)
 
 /** VPROTOCOL level functions (same as PML one)
   */
-static mca_vprotocol_base_module_t *mca_vprotocol_pessimist_component_init( int* priority,
-                                                                          bool enable_progress_threads,
-                                                                          bool enable_mpi_threads)
+static mca_vprotocol_base_module_t*
+mca_vprotocol_pessimist_component_init( int* priority,
+                                        bool enable_progress_threads,
+                                        bool enable_mpi_threads)
 {
     V_OUTPUT_VERBOSE(500, "vprotocol_pessimist: component_init");
     *priority = _priority;
 
     /* sanity check */
-    if(enable_mpi_threads)
-    {
+    if(enable_mpi_threads && !ompi_vprotocol_pessimist_allow_thread_multiple) {
+        /**
+         * Prevent the pessimistic protocol from activating if we are in a potentially multithreaded
+         * applications. The reason is that without tracking the thread initiator of messages it is
+         * extrmely difficult to provide a global message ordering in threaded-scenarios. Thus, the
+         * safe approach is to turn off the logger.
+         */
         opal_output(0, "vprotocol_pessimist: component_init: threads are enabled, and not supported by vprotocol pessimist fault tolerant layer, will not load");
         return NULL;
     }