From 34fbec1f496a894880051f9ae21460cb16341651 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 19 Sep 2013 19:45:00 +0000 Subject: [PATCH] Sadly, the connection priorities being defined at time of variable instantiation were being overridden just before registering the param. Thus, changes people made to the relative priority of the cpc methods were being lost. Fix it be removing the duplicate initializiation, letting the value defined at instantiation be the one actually used. cmr:v1.7.4:reviewer=hjelmn This commit was SVN r29212. --- ompi/mca/btl/openib/connect/btl_openib_connect_oob.c | 4 ++-- ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c | 2 +- ompi/mca/btl/openib/connect/btl_openib_connect_udcm.c | 2 +- ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c b/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c index 3fc428ca71..8d7587e543 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c @@ -51,7 +51,7 @@ typedef enum { ENDPOINT_CONNECT_ACK } connect_message_type_t; -static int oob_priority = 50; +static int oob_priority = 0; static bool rml_recv_posted = false; static void oob_component_register(void); @@ -98,7 +98,7 @@ ompi_btl_openib_connect_base_component_t ompi_btl_openib_connect_oob = { /* Open - this functions sets up any oob specific commandline params */ static void oob_component_register(void) { - oob_priority = 50; + /* the priority is initialized in the declaration above */ (void) mca_base_component_var_register(&mca_btl_openib_component.super.btl_version, "connect_oob_priority", "The selection method priority for oob", diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c b/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c index 30310e5a76..438b4275a6 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c @@ -228,7 +228,7 @@ static void rdmacm_contents_destructor(rdmacm_contents_t *contents) */ static void rdmacm_component_register(void) { - rdmacm_priority = 30; + /* the priority is initialized in the declaration above */ (void) mca_base_component_var_register(&mca_btl_openib_component.super.btl_version, "connect_rdmacm_priority", "The selection method priority for rdma_cm", diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_udcm.c b/ompi/mca/btl/openib/connect/btl_openib_connect_udcm.c index cf8c4e56fb..458628a58a 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_udcm.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_udcm.c @@ -342,7 +342,7 @@ ompi_btl_openib_connect_base_component_t ompi_btl_openib_connect_udcm = { static void udcm_component_register(void) { - udcm_priority = 0; + /* the priority is initialized in the declaration above */ (void) mca_base_component_var_register(&mca_btl_openib_component.super.btl_version, "connect_udcm_priority", "The selection method priority for ud", diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c b/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c index 7e38c828bf..457b79562c 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c @@ -1058,7 +1058,7 @@ static int xoob_component_query(mca_btl_openib_module_t *openib_btl, /* Open - this functions sets up any xoob specific commandline params */ static void xoob_component_register(void) { - xoob_priority = 60; + /* the priority is initialized in the declaration above */ (void) mca_base_component_var_register(&mca_btl_openib_component.super.btl_version, "connect_xoob_priority", "The selection method priority for xoob",