From 5be7f5e2dc99a7228bedd01dd1912d80b9c2ea82 Mon Sep 17 00:00:00 2001 From: Andrew Friedley Date: Tue, 2 Oct 2007 20:37:16 +0000 Subject: [PATCH] fixes trac:1154 Check if an exclusion string (i.e. '-mca btl ^sm) was provided; if so OFUD just disables itself. This commit was SVN r16307. The following Trac tickets were found above: Ticket 1154 --> https://svn.open-mpi.org/trac/ompi/ticket/1154 --- ompi/mca/btl/ofud/btl_ofud_component.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ompi/mca/btl/ofud/btl_ofud_component.c b/ompi/mca/btl/ofud/btl_ofud_component.c index a33aa61bcc..aae9aae3e3 100644 --- a/ompi/mca/btl/ofud/btl_ofud_component.c +++ b/ompi/mca/btl/ofud/btl_ofud_component.c @@ -261,12 +261,12 @@ mca_btl_base_module_t** mca_btl_ud_component_init(int* num_btl_modules, If not, then short out right away. */ mca_base_param_lookup_string( mca_base_param_find("btl", NULL, NULL), &btl_str); - if(NULL == btl_str) { - /* Can't specify UD with out any string at all.. bail out */ + if(NULL == btl_str || '^' == btl_str[0]) { + /* No string at all, or an exclusion string, bail out */ return NULL; } - /* Try to find a 'ud' token */ + /* Try to find a 'ofud' token */ tok = strtok(btl_str, ","); while(tok) { if(!strcasecmp("ofud", tok)) { @@ -275,7 +275,7 @@ mca_btl_base_module_t** mca_btl_ud_component_init(int* num_btl_modules, } if(NULL == tok) { - /* No valid 'ud' token found; bail out */ + /* No valid 'ofud' token found; bail out */ return NULL; }