From a4030ad2d9cc69010e0f64a34172802150c4b346 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 9 Jun 2006 18:02:45 +0000 Subject: [PATCH] Improve the tremendously unhelpful MCA help message for the btl_openib_ib_mtu and btl_mvapi_ib_mtu MCA params by showing the valid values what what they represent (got a question about this from Cisco testing engineers). This commit was SVN r10277. --- ompi/mca/btl/mvapi/btl_mvapi_component.c | 13 +++++++++++-- ompi/mca/btl/openib/btl_openib_component.c | 15 +++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ompi/mca/btl/mvapi/btl_mvapi_component.c b/ompi/mca/btl/mvapi/btl_mvapi_component.c index 258893a5b9..4159a78f2e 100644 --- a/ompi/mca/btl/mvapi/btl_mvapi_component.c +++ b/ompi/mca/btl/mvapi/btl_mvapi_component.c @@ -126,6 +126,7 @@ static inline void mca_btl_mvapi_param_register_int( int mca_btl_mvapi_component_open(void) { + char *msg; int tmp_int; /* initialize state */ @@ -165,8 +166,16 @@ int mca_btl_mvapi_component_open(void) 0, (int*) &mca_btl_mvapi_component.ib_psn); mca_btl_mvapi_param_register_int("ib_qp_ous_rd_atom", "IB outstanding atomic reads", 4, (int*) &mca_btl_mvapi_component.ib_qp_ous_rd_atom); - mca_btl_mvapi_param_register_int("ib_mtu", "IB MTU", - MTU1024, (int*) &mca_btl_mvapi_component.ib_mtu); + tmp_int = MTU1024; + asprintf(&msg, "IB MTU, in bytes. Valid values are: %d=256 bytes, %d=512 bytes, %d=1024 bytes, %d=2048 bytes, %d=4096 bytes.", + MTU256, + MTU512, + MTU1024, + MTU2048, + MTU4096); + mca_btl_mvapi_param_register_int("ib_mtu", msg, + tmp_int, (int*) &mca_btl_mvapi_component.ib_mtu); + free(msg); mca_btl_mvapi_param_register_int("ib_min_rnr_timer", "IB min rnr timer", 5, (int*) &mca_btl_mvapi_component.ib_min_rnr_timer); diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c index fc4f27eb63..1423c75b9d 100644 --- a/ompi/mca/btl/openib/btl_openib_component.c +++ b/ompi/mca/btl/openib/btl_openib_component.c @@ -123,6 +123,9 @@ static inline void mca_btl_openib_param_register_int( int mca_btl_openib_component_open(void) { + char *msg; + int val; + /* initialize state */ mca_btl_openib_component.ib_num_btls=0; mca_btl_openib_component.openib_btls=NULL; @@ -155,8 +158,16 @@ int mca_btl_openib_component_open(void) 0, (int*) &mca_btl_openib_component.ib_psn); mca_btl_openib_param_register_int("ib_qp_ous_rd_atom", "IB outstanding atomic reads", 4, (int*) &mca_btl_openib_component.ib_qp_ous_rd_atom); - mca_btl_openib_param_register_int("ib_mtu", "IB MTU", - IBV_MTU_1024, (int*) &mca_btl_openib_component.ib_mtu); + val = IBV_MTU_1024; + asprintf(&msg, "IB MTU, in bytes. Valid values are: %d=256 bytes, %d=512 bytes, %d=1024 bytes, %d=2048 bytes, %d=4096 bytes.", + IBV_MTU_256, + IBV_MTU_512, + IBV_MTU_1024, + IBV_MTU_2048, + IBV_MTU_4096); + mca_btl_openib_param_register_int("ib_mtu", msg, + val, (int*) &mca_btl_openib_component.ib_mtu); + free(msg); mca_btl_openib_param_register_int("ib_min_rnr_timer", "IB min rnr timer", 5, (int*) &mca_btl_openib_component.ib_min_rnr_timer); mca_btl_openib_param_register_int("ib_timeout", "IB transmit timeout",