ompi/runtime: add instead of set opal_progress_event_flags

Currently, ompi_mpi_init() call

     opal_progress_set_event_flag(OPAL_EVLOOP_NONBLOCK),

whith the intention to ensure OPAL_EVLOOP_NONBLOCK is set
in opal_progress_event_flag.

However, this call will remove other existing flags
(like OPAL_EVLOOP_ONCE) in opal_progress_event_flag,
which can cause deadlock.

This patch address the issue by adding OPAL_EVLOOP_NONBLOCK
to that flag.

Signed-off-by: Wei Zhang <[email protected]>

Author: wzamazon

ompi/runtime/ompi_mpi_init.c

@@ -999,7 +999,8 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided,
        CPU utilization for the remainder of MPI_INIT when we are
        blocking on RTE-level events, but may greatly reduce non-TCP
        latency. */
-    opal_progress_set_event_flag(OPAL_EVLOOP_NONBLOCK);
+    int old_event_flags = opal_progress_set_event_flag(0);
+    opal_progress_set_event_flag(old_event_flags | OPAL_EVLOOP_NONBLOCK);
 #endif
 
     /* wire up the mpi interface, if requested.  Do this after the