fixed I/O forwarding cleanup

This commit was SVN r4033.

src/mca/iof/base/iof_base_endpoint.c

@@ -34,6 +34,7 @@ static void mca_iof_base_endpoint_construct(mca_iof_base_endpoint_t* endpoint)
 
 static void mca_iof_base_endpoint_destruct(mca_iof_base_endpoint_t* endpoint)
 {
+    mca_iof_base_endpoint_close(endpoint);
     OBJ_DESTRUCT(&endpoint->ep_frags);
 }
 

src/mca/iof/base/iof_base_flush.c

@@ -61,7 +61,7 @@ int mca_iof_base_flush(void)
                                                                                                                               
     /* wait for all of the endpoints to reach an idle state */
     pending = ompi_list_get_size(&mca_iof_base.iof_endpoints);
-    while(pending == ompi_list_get_size(&mca_iof_base.iof_endpoints)) {
+    while(pending > 0 && pending == ompi_list_get_size(&mca_iof_base.iof_endpoints)) {
         pending = 0;
         for(item = ompi_list_get_first(&mca_iof_base.iof_endpoints);
             item != ompi_list_get_end(&mca_iof_base.iof_endpoints);

src/mpi/runtime/ompi_mpi_finalize.c

@@ -58,7 +58,7 @@ int ompi_mpi_finalize(void)
 
     ompi_mpi_finalized = true;
 #if OMPI_HAVE_THREADS == 0
-    ompi_progress_events(OMPI_EVLOOP_ONCE);
+    ompi_progress_events(OMPI_EVLOOP_NONBLOCK);
 #endif
 
     /* begin recording compound command */

src/mpi/runtime/ompi_mpi_init.c

@@ -349,11 +349,13 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
         goto error;
     }
 
-#if 0
+#if OMPI_HAVE_THREADS 
     /* setup I/O forwarding */
-    if (OMPI_SUCCESS != (ret = ompi_mpi_init_io())) {
-	error = "ompi_rte_init_io failed";
-	goto error;
+    if(ompi_process_info.seed == false) {
+        if (OMPI_SUCCESS != (ret = ompi_mpi_init_io())) {
+	        error = "ompi_rte_init_io failed";
+	        goto error;
+        }
     }
 #endif
 

src/runtime/ompi_rte_finalize.c

@@ -46,9 +46,7 @@ int ompi_rte_finalize(void)
   ompi_rte_wait_finalize();
   ompi_rte_internal_fini_spawn();
 
-#if 0
   mca_iof_base_close();
-#endif
   mca_pcm_base_close();
   mca_llm_base_close();
   mca_pcmclient_base_close();

src/runtime/ompi_rte_init.c

@@ -198,7 +198,7 @@ int ompi_rte_init(ompi_cmd_line_t *cmd_line, bool *allow_multi_user_threads, boo
 	return ret;
     }
 
-#if 0
+#if 1
     /*
      * Open I/O forwarding components.
      */
@@ -410,7 +410,6 @@ int ompi_rte_init(ompi_cmd_line_t *cmd_line, bool *allow_multi_user_threads, boo
 	exit(-1);
     }
 
-#if 0
     /* setup I/O forwarding */
     if (OMPI_SUCCESS != (ret = mca_iof_base_select(&user_threads, &hidden_threads))) {
 	/* JMS show_help */
@@ -419,7 +418,6 @@ int ompi_rte_init(ompi_cmd_line_t *cmd_line, bool *allow_multi_user_threads, boo
     }
     *allow_multi_user_threads &= user_threads;
     *have_hidden_threads |= hidden_threads;
-#endif
 
      /* 
      * All done