From 22acad7c5c9a8693eb591d3a71ddea680f525208 Mon Sep 17 00:00:00 2001
From: Edgar Gabriel <gabriel@cs.uh.edu>
Date: Tue, 26 Oct 2004 14:54:23 +0000
Subject: [PATCH] adding the routine to handle the proper disconnect of all
 dynamic communicators in MPI_Finalize (in cases the user did not explicitly
 disconnect).

This commit was SVN r3338.
---
 src/communicator/comm_dyn.c     | 37 +++++++++++++++++++++++++++++----
 src/communicator/comm_init.c    |  6 ++++--
 src/communicator/communicator.h | 13 ++++++++++++
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/communicator/comm_dyn.c b/src/communicator/comm_dyn.c
index deef6fec23..fac088f47b 100644
--- a/src/communicator/comm_dyn.c
+++ b/src/communicator/comm_dyn.c
@@ -436,7 +436,8 @@ int ompi_comm_dyn_init (void)
 	 * now we have to decrease the reference counters to the according
 	 * objects 
 	 */
-/*	OBJ_RELEASE(&ompi_mpi_comm_null);
+/*
+	OBJ_RELEASE(&ompi_mpi_comm_null);
 	OBJ_RELEASE(&ompi_mpi_group_null);
 	OBJ_RELEASE(&ompi_mpi_group_null);
 	OBJ_RELEASE(&ompi_mpi_errors_are_fatal);
@@ -451,12 +452,40 @@ int ompi_comm_dyn_init (void)
 /**********************************************************************/
 /* this routine runs through the list of communicators and
    and does the disconnect for all dynamic communicators */
-/*int ompi_comm_dyn_finalize (void)
+int ompi_comm_dyn_finalize (void)
 {
-    
+    int i,j=0, max=0;
+    ompi_comm_disconnect_obj **objs=NULL;
+    ompi_communicator_t *comm=NULL;
 
+    if ( 1 <ompi_comm_num_dyncomm ) {
+	objs = (ompi_comm_disconnect_obj **)malloc (ompi_comm_num_dyncomm*
+						   sizeof(ompi_comm_disconnect_obj*));
+	if ( NULL == objs ) {
+	    return OMPI_ERR_OUT_OF_RESOURCE;
+	}
+
+	max = ompi_pointer_array_get_size(&ompi_mpi_communicators);
+	for ( i=3; i<max; i++ ) {
+	    comm = (ompi_communicator_t*)ompi_pointer_array_get_item(&ompi_mpi_communicators,i);
+	    if ( OMPI_COMM_IS_DYNAMIC(comm)) {
+		objs[j++]=ompi_comm_disconnect_init(comm);
+	    }
+	}
+    
+	if ( j != ompi_comm_num_dyncomm+1 ) {
+	    free (objs);
+	    return OMPI_ERROR;
+	}
+
+	ompi_comm_disconnect_waitall (ompi_comm_num_dyncomm, objs);
+	free (objs);
+    }
+    
+    
+    return OMPI_SUCCESS;
 }
-*/
+
 /**********************************************************************/
 /**********************************************************************/
 /**********************************************************************/
diff --git a/src/communicator/comm_init.c b/src/communicator/comm_init.c
index f54d4c667d..0aece80e8b 100644
--- a/src/communicator/comm_init.c
+++ b/src/communicator/comm_init.c
@@ -184,8 +184,10 @@ int ompi_comm_finalize(void)
     int max, i;
     ompi_communicator_t *comm;
 
+    /* disconnect all dynamic communicators */
+    ompi_comm_dyn_finalize();
+
     /* Destroy all predefined communicators */    
-    
     ompi_mpi_comm_world.c_local_group->grp_flags = 0;
     ompi_mpi_comm_world.c_flags = 0;
     OBJ_DESTRUCT( &ompi_mpi_comm_world );
@@ -203,7 +205,7 @@ int ompi_comm_finalize(void)
     ompi_mpi_comm_null.c_local_group->grp_flags = 0;
     ompi_mpi_comm_null.c_flags = 0;
     OBJ_DESTRUCT( &ompi_mpi_comm_null );
-    
+
     /* Check whether we have some communicators left */
     max = ompi_pointer_array_get_size(&ompi_mpi_communicators);
     for ( i=3; i<max; i++ ) {
diff --git a/src/communicator/communicator.h b/src/communicator/communicator.h
index 240892eeab..b16333c987 100644
--- a/src/communicator/communicator.h
+++ b/src/communicator/communicator.h
@@ -406,8 +406,21 @@ struct ompi_communicator_t {
     int ompi_comm_start_processes (char *command, char **argv, int maxprocs, 
 				   MPI_Info info,  char *port_name);
 
+    /*
+     * This routine checks, whether an application has been spawned
+     * by another MPI application, or has been independently started.
+     * If it has been spawned, it establishes the parent communicator.
+     * Since the routine has to communicate, it should be among the last
+     * steps in MPI_Init, to be sure that everything is already set up.
+     */
     int ompi_comm_dyn_init(void);
 
+    /** 
+     * Executes internally a disconnect on all dynamic communicators
+     * in case the user did not disconnect them.
+     */
+    int ompi_comm_dyn_finalize(void);
+
     /* this routine counts the number of different jobids of the processes
        given in a certain communicator. If there is more than one jobid,
        we mark the communicator as 'dynamic'. This is especially relevant