diff --git a/ompi/mca/btl/base/btl_base_mca.c b/ompi/mca/btl/base/btl_base_mca.c index f528796f35..253a6246e6 100644 --- a/ompi/mca/btl/base/btl_base_mca.c +++ b/ompi/mca/btl/base/btl_base_mca.c @@ -42,7 +42,7 @@ int mca_btl_base_param_register(mca_base_component_t *version, (void) mca_base_component_var_register(version, "exclusivity", "BTL exclusivity (must be >= 0)", MCA_BASE_VAR_TYPE_UNSIGNED_INT, NULL, 0, 0, - OPAL_INFO_LVL_9, + OPAL_INFO_LVL_7, MCA_BASE_VAR_SCOPE_READONLY, &module->btl_exclusivity); @@ -59,51 +59,51 @@ int mca_btl_base_param_register(mca_base_component_t *version, MCA_BTL_FLAGS_FAILOVER_SUPPORT); (void) mca_base_component_var_register(version, "flags", msg, MCA_BASE_VAR_TYPE_UNSIGNED_INT, NULL, 0, 0, - OPAL_INFO_LVL_9, + OPAL_INFO_LVL_5, MCA_BASE_VAR_SCOPE_READONLY, &module->btl_flags); free(msg); (void) mca_base_component_var_register(version, "rndv_eager_limit", "Size (in bytes, including header) of \"phase 1\" fragment sent for all large messages (must be >= 0 and <= eager_limit)", MCA_BASE_VAR_TYPE_SIZE_T, NULL, 0, 0, - OPAL_INFO_LVL_9, + OPAL_INFO_LVL_4, MCA_BASE_VAR_SCOPE_READONLY, &module->btl_rndv_eager_limit); (void) mca_base_component_var_register(version, "eager_limit", "Maximum size (in bytes, including header) of \"short\" messages (must be >= 1).", MCA_BASE_VAR_TYPE_SIZE_T, NULL, 0, 0, - OPAL_INFO_LVL_9, + OPAL_INFO_LVL_4, MCA_BASE_VAR_SCOPE_READONLY, &module->btl_eager_limit); (void) mca_base_component_var_register(version, "max_send_size", "Maximum size (in bytes) of a single \"phase 2\" fragment of a long message when using the pipeline protocol (must be >= 1)", MCA_BASE_VAR_TYPE_SIZE_T, NULL, 0, 0, - OPAL_INFO_LVL_9, + OPAL_INFO_LVL_4, MCA_BASE_VAR_SCOPE_READONLY, &module->btl_max_send_size); if (NULL != module->btl_put) { (void) mca_base_component_var_register(version, "rdma_pipeline_send_length", "Length of the \"phase 2\" portion of a large message (in bytes) when using the pipeline protocol. This part of the message will be split into fragments of size max_send_size and sent using send/receive semantics (must be >= 0; only relevant when the PUT flag is set)", MCA_BASE_VAR_TYPE_SIZE_T, NULL, 0, 0, - OPAL_INFO_LVL_9, + OPAL_INFO_LVL_4, MCA_BASE_VAR_SCOPE_READONLY, &module->btl_rdma_pipeline_send_length); (void) mca_base_component_var_register(version, "rdma_pipeline_frag_size", "Maximum size (in bytes) of a single \"phase 3\" fragment from a long message when using the pipeline protocol. These fragments will be sent using RDMA semantics (must be >= 1; only relevant when the PUT flag is set)", MCA_BASE_VAR_TYPE_SIZE_T, NULL, 0, 0, - OPAL_INFO_LVL_9, + OPAL_INFO_LVL_4, MCA_BASE_VAR_SCOPE_READONLY, &module->btl_rdma_pipeline_frag_size); (void) mca_base_component_var_register(version, "min_rdma_pipeline_size", "Messages smaller than this size (in bytes) will not use the RDMA pipeline protocol. Instead, they will be split into fragments of max_send_size and sent using send/receive semantics (must be >=0, and is automatically adjusted up to at least (eager_limit+btl_rdma_pipeline_send_length); only relevant when the PUT flag is set)", MCA_BASE_VAR_TYPE_SIZE_T, NULL, 0, 0, - OPAL_INFO_LVL_9, + OPAL_INFO_LVL_4, MCA_BASE_VAR_SCOPE_READONLY, &module->btl_min_rdma_pipeline_size); (void) mca_base_component_var_register(version, "bandwidth", "Approximate maximum bandwidth of interconnect (0 = auto-detect value at run-time [not supported in all BTL modules], >= 1 = bandwidth in Mbps)", MCA_BASE_VAR_TYPE_UNSIGNED_INT, NULL, 0, 0, - OPAL_INFO_LVL_9, + OPAL_INFO_LVL_5, MCA_BASE_VAR_SCOPE_READONLY, &module->btl_latency); } diff --git a/ompi/mca/btl/sm/btl_sm_component.c b/ompi/mca/btl/sm/btl_sm_component.c index 8d0a0be41a..9e295c9e67 100644 --- a/ompi/mca/btl/sm/btl_sm_component.c +++ b/ompi/mca/btl/sm/btl_sm_component.c @@ -114,12 +114,13 @@ mca_btl_sm_component_t mca_btl_sm_component = { static inline int mca_btl_sm_param_register_int( const char* param_name, int default_value, + int level, int *storage) { *storage = default_value; (void) mca_base_component_var_register (&mca_btl_sm_component.super.btl_version, param_name, NULL, MCA_BASE_VAR_TYPE_INT, - NULL, 0, 0, OPAL_INFO_LVL_9, + NULL, 0, 0, level, MCA_BASE_VAR_SCOPE_READONLY, storage); return *storage; } @@ -127,12 +128,13 @@ static inline int mca_btl_sm_param_register_int( static inline unsigned int mca_btl_sm_param_register_uint( const char* param_name, unsigned int default_value, + int level, unsigned int *storage) { *storage = default_value; (void) mca_base_component_var_register (&mca_btl_sm_component.super.btl_version, param_name, NULL, MCA_BASE_VAR_TYPE_UNSIGNED_INT, - NULL, 0, 0, OPAL_INFO_LVL_9, + NULL, 0, 0, level, MCA_BASE_VAR_SCOPE_READONLY, storage); return *storage; } @@ -205,20 +207,20 @@ static int sm_register(void) &mca_btl_sm_component.use_cma); /* register SM component parameters */ - mca_btl_sm_param_register_int("free_list_num", 8, &mca_btl_sm_component.sm_free_list_num); - mca_btl_sm_param_register_int("free_list_max", -1, &mca_btl_sm_component.sm_free_list_max); - mca_btl_sm_param_register_int("free_list_inc", 64, &mca_btl_sm_component.sm_free_list_inc); - mca_btl_sm_param_register_int("max_procs", -1, &mca_btl_sm_component.sm_max_procs); + mca_btl_sm_param_register_int("free_list_num", 8, OPAL_INFO_LVL_5, &mca_btl_sm_component.sm_free_list_num); + mca_btl_sm_param_register_int("free_list_max", -1, OPAL_INFO_LVL_5, &mca_btl_sm_component.sm_free_list_max); + mca_btl_sm_param_register_int("free_list_inc", 64, OPAL_INFO_LVL_5, &mca_btl_sm_component.sm_free_list_inc); + mca_btl_sm_param_register_int("max_procs", -1, OPAL_INFO_LVL_5, &mca_btl_sm_component.sm_max_procs); /* there is no practical use for the mpool name parameter since mpool resources differ between components */ mca_btl_sm_component.sm_mpool_name = "sm"; - mca_btl_sm_param_register_uint("fifo_size", 4096, &mca_btl_sm_component.fifo_size); - mca_btl_sm_param_register_int("num_fifos", 1, &mca_btl_sm_component.nfifos); + mca_btl_sm_param_register_uint("fifo_size", 4096, OPAL_INFO_LVL_4, &mca_btl_sm_component.fifo_size); + mca_btl_sm_param_register_int("num_fifos", 1, OPAL_INFO_LVL_4, &mca_btl_sm_component.nfifos); - mca_btl_sm_param_register_uint("fifo_lazy_free", 120, &mca_btl_sm_component.fifo_lazy_free); + mca_btl_sm_param_register_uint("fifo_lazy_free", 120, OPAL_INFO_LVL_5, &mca_btl_sm_component.fifo_lazy_free); /* default number of extra procs to allow for future growth */ - mca_btl_sm_param_register_int("sm_extra_procs", 0, &mca_btl_sm_component.sm_extra_procs); + mca_btl_sm_param_register_int("sm_extra_procs", 0, OPAL_INFO_LVL_9, &mca_btl_sm_component.sm_extra_procs); mca_btl_sm.super.btl_exclusivity = MCA_BTL_EXCLUSIVITY_HIGH-1; mca_btl_sm.super.btl_eager_limit = 4*1024; diff --git a/ompi/mca/btl/tcp/btl_tcp_component.c b/ompi/mca/btl/tcp/btl_tcp_component.c index 3b5467c110..78634fd557 100644 --- a/ompi/mca/btl/tcp/btl_tcp_component.c +++ b/ompi/mca/btl/tcp/btl_tcp_component.c @@ -114,12 +114,13 @@ static inline char* mca_btl_tcp_param_register_string( const char* param_name, const char* help_string, const char* default_value, + int level, char **storage) { *storage = (char *) default_value; (void) mca_base_component_var_register(&mca_btl_tcp_component.super.btl_version, param_name, help_string, MCA_BASE_VAR_TYPE_STRING, - NULL, 0, 0, OPAL_INFO_LVL_9, + NULL, 0, 0, level, MCA_BASE_VAR_SCOPE_READONLY, storage); return *storage; } @@ -128,12 +129,13 @@ static inline int mca_btl_tcp_param_register_int( const char* param_name, const char* help_string, int default_value, + int level, int *storage) { *storage = default_value; (void) mca_base_component_var_register(&mca_btl_tcp_component.super.btl_version, param_name, help_string, MCA_BASE_VAR_TYPE_INT, - NULL, 0, 0, OPAL_INFO_LVL_9, + NULL, 0, 0, level, MCA_BASE_VAR_SCOPE_READONLY, storage); return *storage; } @@ -142,12 +144,13 @@ static inline unsigned int mca_btl_tcp_param_register_uint( const char* param_name, const char* help_string, unsigned int default_value, + int level, unsigned int *storage) { *storage = default_value; (void) mca_base_component_var_register(&mca_btl_tcp_component.super.btl_version, param_name, help_string, MCA_BASE_VAR_TYPE_UNSIGNED_INT, - NULL, 0, 0, OPAL_INFO_LVL_9, + NULL, 0, 0, level, MCA_BASE_VAR_SCOPE_READONLY, storage); return *storage; } @@ -220,26 +223,26 @@ static int mca_btl_tcp_component_register(void) char* message; /* register TCP component parameters */ - mca_btl_tcp_param_register_uint("links", NULL, 1, &mca_btl_tcp_component.tcp_num_links); - mca_btl_tcp_param_register_string("if_include", "Comma-delimited list of devices and/or CIDR notation of networks to use for MPI communication (e.g., \"eth0,192.168.0.0/16\"). Mutually exclusive with btl_tcp_if_exclude.", "", &mca_btl_tcp_component.tcp_if_include); + mca_btl_tcp_param_register_uint("links", NULL, 1, OPAL_INFO_LVL_4, &mca_btl_tcp_component.tcp_num_links); + mca_btl_tcp_param_register_string("if_include", "Comma-delimited list of devices and/or CIDR notation of networks to use for MPI communication (e.g., \"eth0,192.168.0.0/16\"). Mutually exclusive with btl_tcp_if_exclude.", "", OPAL_INFO_LVL_1, &mca_btl_tcp_component.tcp_if_include); mca_btl_tcp_param_register_string("if_exclude", "Comma-delimited list of devices and/or CIDR notation of networks to NOT use for MPI communication -- all devices not matching these specifications will be used (e.g., \"eth0,192.168.0.0/16\"). If set to a non-default value, it is mutually exclusive with btl_tcp_if_include.", "127.0.0.1/8,sppp", - &mca_btl_tcp_component.tcp_if_exclude); + OPAL_INFO_LVL_1, &mca_btl_tcp_component.tcp_if_exclude); - mca_btl_tcp_param_register_int ("free_list_num", NULL, 8, &mca_btl_tcp_component.tcp_free_list_num); - mca_btl_tcp_param_register_int ("free_list_max", NULL, -1, &mca_btl_tcp_component.tcp_free_list_max); - mca_btl_tcp_param_register_int ("free_list_inc", NULL, 32, &mca_btl_tcp_component.tcp_free_list_inc); - mca_btl_tcp_param_register_int ("sndbuf", NULL, 128*1024, &mca_btl_tcp_component.tcp_sndbuf); - mca_btl_tcp_param_register_int ("rcvbuf", NULL, 128*1024, &mca_btl_tcp_component.tcp_rcvbuf); + mca_btl_tcp_param_register_int ("free_list_num", NULL, 8, OPAL_INFO_LVL_5, &mca_btl_tcp_component.tcp_free_list_num); + mca_btl_tcp_param_register_int ("free_list_max", NULL, -1, OPAL_INFO_LVL_5, &mca_btl_tcp_component.tcp_free_list_max); + mca_btl_tcp_param_register_int ("free_list_inc", NULL, 32, OPAL_INFO_LVL_5, &mca_btl_tcp_component.tcp_free_list_inc); + mca_btl_tcp_param_register_int ("sndbuf", NULL, 128*1024, OPAL_INFO_LVL_4, &mca_btl_tcp_component.tcp_sndbuf); + mca_btl_tcp_param_register_int ("rcvbuf", NULL, 128*1024, OPAL_INFO_LVL_4, &mca_btl_tcp_component.tcp_rcvbuf); mca_btl_tcp_param_register_int ("endpoint_cache", "The size of the internal cache for each TCP connection. This cache is" " used to reduce the number of syscalls, by replacing them with memcpy." " Every read will read the expected data plus the amount of the" - " endpoint_cache", 30*1024, &mca_btl_tcp_component.tcp_endpoint_cache); - mca_btl_tcp_param_register_int ("use_nagle", "Whether to use Nagle's algorithm or not (using Nagle's algorithm may increase short message latency)", 0, &mca_btl_tcp_component.tcp_not_use_nodelay); + " endpoint_cache", 30*1024, OPAL_INFO_LVL_4, &mca_btl_tcp_component.tcp_endpoint_cache); + mca_btl_tcp_param_register_int ("use_nagle", "Whether to use Nagle's algorithm or not (using Nagle's algorithm may increase short message latency)", 0, OPAL_INFO_LVL_4, &mca_btl_tcp_component.tcp_not_use_nodelay); mca_btl_tcp_param_register_int( "port_min_v4", "The minimum port where the TCP BTL will try to bind (default 1024)", - 1024, &mca_btl_tcp_component.tcp_port_min); + 1024, OPAL_INFO_LVL_2, &mca_btl_tcp_component.tcp_port_min); asprintf( &message, "The number of ports where the TCP BTL will try to bind (default %d)." @@ -248,12 +251,12 @@ static int mca_btl_tcp_component_register(void) (0x1 << 16) - mca_btl_tcp_component.tcp_port_min - 1 ); mca_btl_tcp_param_register_int( "port_range_v4", message, (0x1 << 16) - mca_btl_tcp_component.tcp_port_min - 1, - &mca_btl_tcp_component.tcp_port_range); + OPAL_INFO_LVL_2, &mca_btl_tcp_component.tcp_port_range); free(message); #if OPAL_WANT_IPV6 mca_btl_tcp_param_register_int( "port_min_v6", "The minimum port where the TCP BTL will try to bind (default 1024)", 1024, - & mca_btl_tcp_component.tcp6_port_min ); + OPAL_INFO_LVL_2, & mca_btl_tcp_component.tcp6_port_min ); asprintf( &message, "The number of ports where the TCP BTL will try to bind (default %d)." " This parameter together with the port min, define a range of ports" @@ -261,7 +264,7 @@ static int mca_btl_tcp_component_register(void) (0x1 << 16) - mca_btl_tcp_component.tcp6_port_min - 1 ); mca_btl_tcp_param_register_int( "port_range_v6", message, (0x1 << 16) - mca_btl_tcp_component.tcp6_port_min - 1, - &mca_btl_tcp_component.tcp6_port_range ); + OPAL_INFO_LVL_2, &mca_btl_tcp_component.tcp6_port_range ); free(message); #endif @@ -284,11 +287,11 @@ static int mca_btl_tcp_component_register(void) mca_btl_base_param_register(&mca_btl_tcp_component.super.btl_version, &mca_btl_tcp_module.super); - mca_btl_tcp_param_register_int ("disable_family", NULL, 0, &mca_btl_tcp_component.tcp_disable_family); + mca_btl_tcp_param_register_int ("disable_family", NULL, 0, OPAL_INFO_LVL_2, &mca_btl_tcp_component.tcp_disable_family); /* Register a list of interfaces to use in sequence */ mca_btl_tcp_param_register_string("if_seq", - "If specified, a comma-delimited list of TCP interfaces. Interfaces will be assigned, one to each MPI process, in a round-robin fashion on each server. For example, if the list is \"eth0,eth1\" and four MPI processes are run on a single server, then local ranks 0 and 2 will use eth0 and local ranks 1 and 3 will use eth1.", NULL, &mca_btl_tcp_if_seq_string); + "If specified, a comma-delimited list of TCP interfaces. Interfaces will be assigned, one to each MPI process, in a round-robin fashion on each server. For example, if the list is \"eth0,eth1\" and four MPI processes are run on a single server, then local ranks 0 and 2 will use eth0 and local ranks 1 and 3 will use eth1.", NULL, OPAL_INFO_LVL_9, &mca_btl_tcp_if_seq_string); mca_btl_tcp_component.tcp_if_seq = NULL; if (NULL != mca_btl_tcp_if_seq_string && '\0' != *mca_btl_tcp_if_seq_string) { @@ -462,11 +465,11 @@ static int mca_btl_tcp_create(int if_kindex, const char* if_name) /* allow user to specify interface bandwidth */ sprintf(param, "bandwidth_%s", if_name); - mca_btl_tcp_param_register_uint(param, NULL, btl->super.btl_bandwidth, &btl->super.btl_bandwidth); + mca_btl_tcp_param_register_uint(param, NULL, btl->super.btl_bandwidth, OPAL_INFO_LVL_5, &btl->super.btl_bandwidth); /* allow user to override/specify latency ranking */ sprintf(param, "latency_%s", if_name); - mca_btl_tcp_param_register_uint(param, NULL, btl->super.btl_latency, &btl->super.btl_latency); + mca_btl_tcp_param_register_uint(param, NULL, btl->super.btl_latency, OPAL_INFO_LVL_5, &btl->super.btl_latency); if( i > 0 ) { btl->super.btl_bandwidth >>= 1; btl->super.btl_latency <<= 1; @@ -474,11 +477,11 @@ static int mca_btl_tcp_create(int if_kindex, const char* if_name) /* allow user to specify interface bandwidth */ sprintf(param, "bandwidth_%s:%d", if_name, i); - mca_btl_tcp_param_register_uint(param, NULL, btl->super.btl_bandwidth, &btl->super.btl_bandwidth); + mca_btl_tcp_param_register_uint(param, NULL, btl->super.btl_bandwidth, OPAL_INFO_LVL_5, &btl->super.btl_bandwidth); /* allow user to override/specify latency ranking */ sprintf(param, "latency_%s:%d", if_name, i); - mca_btl_tcp_param_register_uint(param, NULL, btl->super.btl_latency, &btl->super.btl_latency); + mca_btl_tcp_param_register_uint(param, NULL, btl->super.btl_latency, OPAL_INFO_LVL_5, &btl->super.btl_latency); #if 0 && OPAL_ENABLE_DEBUG BTL_OUTPUT(("interface %s instance %i: bandwidth %d latency %d\n", if_name, i, btl->super.btl_bandwidth, btl->super.btl_latency));