Remove the compile-time proiorities for paffinity modules (they were

done this way a long time ago for the "gee whiz!" factor -- when in
reality, they really only need one-of-many-run-time priority
selection).

Changed run-time priorities to be as follows:

 * darwin: 20
 * linux: 20
 * posix: 10
 * solaris: 30
 * test: 5
 * windows: 20

I have a very dim (possibly untrue) recollection that Solaris needs to
have a higher priority than others just to ensure that no other is
chosen under Solaris.  Make all other "native" components have a
priority of 20 (they shouldn't conflict with each other).  Make the
posix fallback component have a priority of 10.  Make the test
component priority 5, meaning someone can always select it, but you
can also make a "never select me" component that prioritizes itself
under test.

This commit was SVN r22997.

opal/mca/paffinity/configure.m4

@@ -1,13 +0,0 @@
-dnl -*- shell-script -*-
-dnl
-dnl Copyright (c) 2007      Los Alamos National Security, LLC.
-dnl                         All rights reserved. 
-dnl $COPYRIGHT$
-dnl 
-dnl Additional copyrights may follow
-dnl 
-dnl $HEADER$
-dnl
-
-dnl we only want those at same priority
-m4_define(MCA_paffinity_CONFIGURE_MODE, STOP_AT_FIRST_PRIORITY)

opal/mca/paffinity/darwin/configure.params

@@ -12,6 +12,7 @@
 #                         All rights reserved.
 # Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
 #                         reserved. 
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -20,9 +21,3 @@
 #
 
 PARAM_CONFIG_FILES="Makefile"
-
-#
-# Set the config priority so that, if we can build,
-# only this component will build
-
-PARAM_CONFIG_PRIORITY=50

opal/mca/paffinity/darwin/paffinity_darwin_component.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-2010 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -79,5 +79,10 @@ const opal_paffinity_base_component_2_0_0_t mca_paffinity_darwin_component = {
 
 static int darwin_open(void)
 {
+    mca_base_param_reg_int(&mca_paffinity_darwin_component.base_version,
+                           "priority",
+                           "Priority of the darwin paffinity component",
+                           false, false, 20, NULL);
+
     return OPAL_SUCCESS;
 }

opal/mca/paffinity/linux/configure.params

@@ -12,6 +12,7 @@
 #                         All rights reserved.
 # Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
 #                         reserved. 
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -20,9 +21,3 @@
 #
 
 PARAM_CONFIG_FILES="Makefile"
-
-#
-# Set the config priority so that, if we can build,
-# only this component will build
-
-PARAM_CONFIG_PRIORITY=60

opal/mca/paffinity/linux/paffinity_linux_component.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-2008 Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2007-2010 Cisco Systems, Inc. All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -79,7 +79,7 @@ static int linux_register(void)
     mca_base_param_reg_int(&mca_paffinity_linux_component.base_version,
                            "priority",
                            "Priority of the linux paffinity component",
-                           false, false, 10, NULL);
+                           false, false, 20, NULL);
     mca_base_param_reg_string(&mca_paffinity_linux_component.base_version,
                               "plpa_version",
                               "Version of PLPA that is embedded in Open MPI",

opal/mca/paffinity/posix/configure.params

@@ -12,6 +12,7 @@
 #                         All rights reserved.
 # Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
 #                         reserved. 
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -20,9 +21,3 @@
 #
 
 PARAM_CONFIG_FILES="Makefile"
-
-#
-# Set the config priority so that we only build
-# if nobody else can
-
-PARAM_CONFIG_PRIORITY=10

opal/mca/paffinity/solaris/configure.params

@@ -12,6 +12,7 @@
 #                         All rights reserved.
 # Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
 #                         reserved. 
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -20,9 +21,3 @@
 #
 
 PARAM_CONFIG_FILES="Makefile"
-
-#
-# Set the config priority so that, if we can build,
-# only this component will build
-
-PARAM_CONFIG_PRIORITY=60

opal/mca/paffinity/solaris/paffinity_solaris_component.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-2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2010 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -77,7 +77,7 @@ static int solaris_register(void)
     mca_base_param_reg_int(&mca_paffinity_solaris_component.base_version,
                            "priority",
                            "Priority of the solaris paffinity component",
-                           false, false, 10, NULL);
+                           false, false, 30, NULL);
 
     return OPAL_SUCCESS;
 }

opal/mca/paffinity/test/configure.params

@@ -12,6 +12,7 @@
 #                         All rights reserved.
 # Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
 #                         reserved. 
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -20,9 +21,3 @@
 #
 
 PARAM_CONFIG_FILES="Makefile"
-
-#
-# Set the config priority so that, if we can build,
-# only this component will build
-
-PARAM_CONFIG_PRIORITY=50

opal/mca/paffinity/test/paffinity_test_component.c

@@ -102,7 +102,7 @@ static int test_open(void)
 static int test_query(mca_base_module_t **module, int *priority)
 {
     /* set this priority so I can only be selected if directed */
-    *priority = 00;
+    *priority = 5;
     *module = (mca_base_module_t *)&opal_paffinity_test_module;
     
     return OPAL_SUCCESS;

opal/mca/paffinity/windows/configure.params

@@ -12,6 +12,7 @@
 #                         All rights reserved.
 # Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
 #                         reserved. 
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -20,9 +21,3 @@
 #
 
 PARAM_CONFIG_FILES="Makefile"
-
-#
-# Set the config priority so that, if we can build,
-# only this component will build
-
-PARAM_CONFIG_PRIORITY=60

opal/mca/paffinity/windows/paffinity_windows_component.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) 2010      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -75,7 +76,7 @@ static int windows_open(void)
     mca_base_param_reg_int(&mca_paffinity_windows_component.base_version,
                            "priority",
                            "Priority of the windows paffinity component",
-                           false, false, 10, NULL);
+                           false, false, 20, NULL);
 
     return OPAL_SUCCESS;
 }