And more fixes ...

This commit was SVN r7321.

ompi/attribute/attribute.c

@@ -196,6 +196,7 @@
 #include "communicator/communicator.h"
 #include "win/win.h"
 #include "mpi/f77/fint_2_int.h"
+#include "class/ompi_bitmap.h"
 
 /*
  * Macros
@@ -817,7 +818,7 @@ int ompi_attr_copy_all(ompi_attribute_type_t type, void *old_object,
     /* Protect against the user calling ompi_attr_destroy and then
        calling any of the functions which use it  */
     if (NULL == keyval_hash) {
-	return MPI_ERR_INTERN;
+        return MPI_ERR_INTERN;
     }
 
     /* If there's nothing to do, just return */
@@ -845,8 +846,8 @@ int ompi_attr_copy_all(ompi_attribute_type_t type, void *old_object,
         /* Get the attr_item in the main keyval hash - so that we know
            what the copy_attr_fn is */
 
-	err = opal_hash_table_get_value_uint32(keyval_hash, key, 
-					       (void **) &hash_value);
+        err = opal_hash_table_get_value_uint32(keyval_hash, key, 
+                                               (void **) &hash_value);
 
         new_attr = OBJ_NEW(attribute_value_t);
         switch (type) {
@@ -918,7 +919,7 @@ int ompi_attr_delete_all(ompi_attribute_type_t type, void *object,
     /* Protect against the user calling ompi_attr_destroy and then
        calling any of the functions which use it  */
     if (NULL == keyval_hash) {
-	return MPI_ERR_INTERN;
+        return MPI_ERR_INTERN;
     }
 
     /* Ensure that the table is not empty */
@@ -940,20 +941,20 @@ int ompi_attr_delete_all(ompi_attribute_type_t type, void *object,
     del_ret = OMPI_SUCCESS;
     while (OMPI_SUCCESS == key_ret && OMPI_SUCCESS == del_ret) {
 
-	/* Save this node info for deletion, before we move onto the
-	   next node */
+        /* Save this node info for deletion, before we move onto the
+           next node */
 
-	in_node = node;
-	oldkey = key;
+        in_node = node;
+        oldkey = key;
 	
-	/* Move to the next node */
+        /* Move to the next node */
 
-	key_ret = opal_hash_table_get_next_key_uint32(keyhash,
+        key_ret = opal_hash_table_get_next_key_uint32(keyhash,
                                                       &key, &old_attr, 
                                                       in_node, &node);
-	/* Now delete this attribute */
+        /* Now delete this attribute */
 
-	del_ret = ompi_attr_delete(type, object, keyhash, oldkey, true, false);
+        del_ret = ompi_attr_delete(type, object, keyhash, oldkey, true, false);
     }
 
     /* All done */

ompi/communicator/comm_init.c

@@ -18,8 +18,6 @@
 
 #include <stdio.h>
 
-#include "mpi.h"
-
 #include "opal/util/bit_ops.h"
 #include "ompi/include/constants.h"
 #include "mca/pml/pml.h"
@@ -27,9 +25,9 @@
 #include "mca/topo/base/base.h"
 #include "mca/ns/base/base.h"
 #include "ompi/runtime/params.h"
-#include "communicator/communicator.h"
-#include "group/group.h"
+#include "ompi/communicator/communicator.h"
 #include "attribute/attribute.h"
+#include "mca/topo/topo.h"
 
 /*
 ** Table for Fortran <-> C communicator handle conversion
@@ -310,7 +308,7 @@ static void ompi_comm_destruct(ompi_communicator_t* comm)
     /* Release the collective module */
 
     if ( MPI_COMM_NULL != comm ) {
-	mca_coll_base_comm_unselect(comm);
+        mca_coll_base_comm_unselect(comm);
     }
 
     /*  Check if the communicator is a topology */
@@ -362,7 +360,7 @@ static void ompi_comm_destruct(ompi_communicator_t* comm)
        never pml_add_com'ed. */
 
     if ( MPI_COMM_NULL != comm && OMPI_COMM_IS_PML_ADDED(comm) ) {
-	MCA_PML_CALL(del_comm (comm));
+        MCA_PML_CALL(del_comm (comm));
     }
     
 
@@ -370,16 +368,16 @@ static void ompi_comm_destruct(ompi_communicator_t* comm)
     mca_topo_base_comm_unselect(comm);
 
     if (NULL != comm->c_local_group) {
-	ompi_group_decrement_proc_count (comm->c_local_group);
+        ompi_group_decrement_proc_count (comm->c_local_group);
         OBJ_RELEASE ( comm->c_local_group );
         comm->c_local_group = NULL;
-	if ( OMPI_COMM_IS_INTRA(comm) ) {
-	    comm->c_remote_group = NULL;
-	}
+        if ( OMPI_COMM_IS_INTRA(comm) ) {
+            comm->c_remote_group = NULL;
+        }
     }
 
     if (NULL != comm->c_remote_group) {
-	ompi_group_decrement_proc_count (comm->c_remote_group);
+        ompi_group_decrement_proc_count (comm->c_remote_group);
         OBJ_RELEASE ( comm->c_remote_group );
         comm->c_remote_group = NULL;
     }

ompi/communicator/comm_publish.c

@@ -17,9 +17,9 @@
 #include "ompi_config.h"
 #include <string.h>
 #include <stdio.h>
-#include "mpi.h"
 
-#include "communicator/communicator.h"
+#include "ompi/communicator/communicator.h"
+#include "ompi/proc/proc.h"
 #include "ompi/include/constants.h"
 
 #include "mca/errmgr/errmgr.h"
@@ -56,6 +56,7 @@ int ompi_open_port(char *port_name)
 
     OPAL_THREAD_LOCK(&ompi_port_lock);
     if (ORTE_SUCCESS != (rc = orte_ns.assign_rml_tag(&lport_id, NULL))) {
+    	    OPAL_THREAD_UNLOCK(&ompi_port_lock);
         return rc;
     }
     OPAL_THREAD_UNLOCK(&ompi_port_lock);
@@ -76,7 +77,7 @@ char *ompi_parse_port (char *port_name, orte_rml_tag_t *tag)
 
     tmp_string = (char *) malloc (MPI_MAX_PORT_NAME);
     if (NULL ==  tmp_string ) {
-	return NULL;
+	   return NULL;
     }
 
     strncpy (tmp_port, port_name, MPI_MAX_PORT_NAME);

ompi/request/req_test.c

@@ -15,7 +15,6 @@
  */
 
 #include "ompi_config.h"
-#include "mpi.h"
 #include "ompi/include/constants.h"
 #include "request/request.h"
 

ompi/request/req_wait.c

@@ -18,6 +18,7 @@
 #include "ompi/include/constants.h"
 #include "request/request.h"
 
+int ompi_request_poll_iterations = 20000;
 
 int ompi_request_wait_any(
     size_t count,

ompi/request/request.c

@@ -22,7 +22,6 @@
 
 ompi_pointer_array_t  ompi_request_f_to_c_table;
 OMPI_DECLSPEC volatile int          ompi_request_waiting = 0;
-int                   ompi_request_poll_iterations = 20000;
 OMPI_DECLSPEC opal_mutex_t          ompi_request_lock;
 OMPI_DECLSPEC opal_condition_t      ompi_request_cond;
 OMPI_DECLSPEC ompi_request_t        ompi_request_null;

ompi/runtime/ompi_mpi_abort.c

@@ -20,14 +20,14 @@
 #include <unistd.h>
 #endif
 
-#include "communicator/communicator.h"
+#include "ompi/communicator/communicator.h"
 #include "opal/util/show_help.h"
 #include "util/proc_info.h"
 #include "ompi/runtime/mpiruntime.h"
 #include "orte/runtime/runtime.h"
-#include "mca/ns/ns.h"
-#include "mca/rmgr/rmgr.h"
-
+#include "orte/mca/ns/ns.h"
+#include "orte/mca/rmgr/rmgr.h"
+#include "ompi/proc/proc.h"
 #include "opal/event/event.h"
 
 #if HAVE_SIGNAL_H

ompi/runtime/ompi_mpi_init.c

@@ -66,6 +66,7 @@
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/base.h"
 #include "ompi/debuggers/debuggers.h"
+#include "ompi/proc/proc.h"
 
 /*
  * Global variables and symbols for the MPI layer