Cleanup some include files, return a silent error in open/select as the complaining component already output a message

This commit was SVN r25416.

orte/mca/ess/alps/ess_alps_module.c

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -27,7 +28,6 @@
 #endif
 
 #include "orte/util/show_help.h"
-#include "opal/mca/paffinity/paffinity.h"
 #include "opal/util/argv.h"
 
 #include "orte/util/proc_info.h"

orte/mca/ess/base/ess_base_open.c

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -63,7 +64,8 @@ orte_ess_base_open(void)
         mca_base_components_open("ess", orte_ess_base_output, mca_ess_base_static_components, 
                                  &orte_ess_base_components_available,
                                  true)) {
-        return ORTE_ERROR;
+        /* error message emitted by fn above */
+        return ORTE_ERR_SILENT;
     }
 
     return ORTE_SUCCESS;

orte/mca/ess/base/ess_base_select.c

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -63,8 +64,8 @@ orte_ess_base_select(void)
                                         &orte_ess_base_components_available,
                                         (mca_base_module_t **) &best_module,
                                         (mca_base_component_t **) &best_component) ) {
-        /* This will only happen if no component was selected */
-        return ORTE_ERR_NOT_FOUND;
+        /* error message emitted by fn above */
+        return ORTE_ERR_SILENT;
     }
 
     /* Save the winner */

orte/mca/ess/base/ess_base_std_orted.c

@@ -11,6 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2009      Institut National de Recherche en Informatique
  *                         et Automatique. All rights reserved.
+ * Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -36,7 +37,6 @@
 #include "opal/runtime/opal_cr.h"
 #include "opal/mca/hwloc/base/base.h"
 #include "opal/mca/pstat/base/base.h"
-#include "opal/mca/paffinity/base/base.h"
 #include "opal/util/os_path.h"
 
 #include "orte/mca/rml/base/base.h"
@@ -524,7 +524,7 @@ int orte_ess_base_orted_setup(char **hosts)
                    "orte_init:startup:internal-failure",
                    true, error, ORTE_ERROR_NAME(ret), ret);
     
-    return ret;
+    return ORTE_ERR_SILENT;
 }
 
 int orte_ess_base_orted_finalize(void)

orte/mca/ess/cnos/ess_cnos_module.c

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow

orte/mca/ess/env/ess_env_module.c

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -32,14 +33,12 @@
 
 #include "opal/mca/event/event.h"
 #include "opal/runtime/opal.h"
-#include "opal/mca/paffinity/paffinity.h"
 
 #include "orte/util/show_help.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_param.h"
 #include "opal/util/output.h"
-#include "opal/util/opal_sos.h"
 #include "opal/util/malloc.h"
 #include "opal/util/argv.h"
 

orte/mca/ess/generic/ess_generic_module.c

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010-2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -37,9 +37,7 @@
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_param.h"
-#include "opal/mca/paffinity/paffinity.h"
 #include "opal/util/output.h"
-#include "opal/util/opal_sos.h"
 #include "opal/util/malloc.h"
 #include "opal/util/argv.h"
 #include "opal/util/if.h"

orte/mca/ess/hnp/ess_hnp_module.c

@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2010-2011 Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -41,7 +42,6 @@
 #include "opal/util/malloc.h"
 #include "opal/util/basename.h"
 #include "opal/mca/pstat/base/base.h"
-#include "opal/mca/paffinity/base/base.h"
 #include "opal/mca/hwloc/base/base.h"
 
 #include "orte/mca/rml/base/base.h"
@@ -410,7 +410,7 @@ static int rte_init(void)
     /* setup the orte_show_help system to recv remote output */
     ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_SHOW_HELP,
                                  ORTE_RML_NON_PERSISTENT, orte_show_help_recv, NULL);
-    if (ret != ORTE_SUCCESS && OPAL_SOS_GET_ERROR_CODE(ret) != ORTE_ERR_NOT_IMPLEMENTED) {
+    if (ret != ORTE_SUCCESS && ret != ORTE_ERR_NOT_IMPLEMENTED) {
         ORTE_ERROR_LOG(ret);
         error = "setup receive for orte_show_help";
         goto error;
@@ -693,13 +693,13 @@ static int rte_init(void)
     return ORTE_SUCCESS;
 
 error:
-    if (ORTE_ERR_SILENT != OPAL_SOS_GET_ERROR_CODE(ret)) {
+    if (ORTE_ERR_SILENT != ret) {
         orte_show_help("help-orte-runtime.txt",
                        "orte_init:startup:internal-failure",
                        true, error, ORTE_ERROR_NAME(ret), ret);
     }
     
-    return ret;
+    return ORTE_ERR_SILENT;
 }
 
 static int rte_finalize(void)

orte/mca/ess/lsf/ess_lsf_module.c

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -32,7 +32,6 @@
 #include <lsf/lsbatch.h>
 
 #include "opal/util/opal_environ.h"
-#include "opal/mca/paffinity/paffinity.h"
 
 #include "orte/util/show_help.h"
 #include "orte/util/name_fns.h"

orte/mca/ess/pmi/ess_pmi_module.c

@@ -42,7 +42,7 @@
 #include "opal/mca/base/mca_base_param.h"
 #include "opal/util/argv.h"
 #include "opal/class/opal_pointer_array.h"
-#include "opal/mca/paffinity/paffinity.h"
+#include "opal/mca/hwloc/base/base.h"
 #include "opal/util/printf.h"
 
 #include "orte/util/proc_info.h"
@@ -103,6 +103,16 @@ static int rte_init(void)
         goto error;
     }
     
+#if OPAL_HAVE_HWLOC
+    /* get the topology */
+    if (NULL == opal_hwloc_topology) {
+        if (OPAL_SUCCESS != opal_hwloc_base_get_topology()) {
+            error = "topology discovery";
+            goto error;
+        }
+    }
+#endif
+
     /* get our PMI id length */
     if (PMI_SUCCESS != (ret = PMI_Get_id_length_max(&pmi_maxlen))) {
         error = "PMI_Get_id_length_max";
@@ -292,6 +302,13 @@ static int rte_finalize(void)
      */
     orte_util_nidmap_finalize();
 
+#if OPAL_HAVE_HWLOC
+    if (NULL != opal_hwloc_topology) {
+        opal_hwloc_base_free_topology(opal_hwloc_topology);
+        opal_hwloc_topology = NULL;
+    }
+#endif
+
     return ret;    
 }
 

orte/mca/ess/portals4_shmem/ess_portals4_shmem_module.c

@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2010      Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow

orte/mca/ess/singleton/ess_singleton_module.c

@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved. 
+ * Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -36,10 +37,8 @@
 #include "opal/hash_string.h"
 #include "opal/util/argv.h"
 #include "opal/util/path.h"
-#include "opal/util/opal_sos.h"
 #include "opal/mca/base/mca_base_param.h"
 #include "opal/mca/installdirs/installdirs.h"
-#include "opal/mca/paffinity/paffinity.h"
 
 #include "orte/util/show_help.h"
 #include "orte/util/proc_info.h"

orte/mca/ess/slave/ess_slave_module.c

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow

orte/mca/ess/slurm/ess_slurm_module.c

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008-2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -32,12 +32,10 @@
 
 #include "opal/util/opal_environ.h"
 #include "opal/util/output.h"
-#include "opal/util/opal_sos.h"
 #include "opal/mca/base/mca_base_param.h"
 #include "opal/util/argv.h"
 #include "opal/class/opal_pointer_array.h"
 #include "opal/dss/dss.h"
-#include "opal/mca/paffinity/paffinity.h"
 
 #include "orte/util/proc_info.h"
 #include "orte/util/regex.h"

orte/mca/ess/slurmd/ess_slurmd_module.c

@@ -40,7 +40,7 @@
 #include "opal/mca/base/mca_base_param.h"
 #include "opal/util/argv.h"
 #include "opal/class/opal_pointer_array.h"
-#include "opal/mca/paffinity/paffinity.h"
+#include "opal/mca/hwloc/base/base.h"
 #include "opal/util/printf.h"
 
 #include "orte/util/proc_info.h"
@@ -128,6 +128,16 @@ static int rte_init(void)
     /* declare ourselves to be standalone - i.e., not launched by orted */
     orte_standalone_operation = true;
     
+#if OPAL_HAVE_HWLOC
+    /* get the topology */
+    if (NULL == opal_hwloc_topology) {
+        if (OPAL_SUCCESS != opal_hwloc_base_get_topology()) {
+            error = "topology discovery";
+            goto error;
+        }
+    }
+#endif
+
     /* get the slurm jobid - this will be our job family */
     envar = getenv("SLURM_JOBID");
     /* don't need to check this for NULL - if it was, we would
@@ -423,6 +433,13 @@ static int rte_finalize(void)
      */
     orte_util_nidmap_finalize();
 
+#if OPAL_HAVE_HWLOC
+    if (NULL != opal_hwloc_topology) {
+        opal_hwloc_base_free_topology(opal_hwloc_topology);
+        opal_hwloc_topology = NULL;
+    }
+#endif
+
     return ret;    
 }
 

orte/mca/ess/tm/ess_tm_module.c

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008-2011 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -36,7 +36,6 @@
 #include "opal/util/argv.h"
 #include "opal/class/opal_pointer_array.h"
 #include "opal/dss/dss.h"
-#include "opal/mca/paffinity/paffinity.h"
 
 #include "orte/util/proc_info.h"
 #include "orte/util/show_help.h"