Fix the proxy component to default to using the seed daemon as its replica.
This commit was SVN r2168.
Этот коммит содержится в:
родитель
9c9037ef2b
Коммит
c11d3896f0
@ -97,9 +97,6 @@ int mca_ns_proxy_close(void)
|
|||||||
|
|
||||||
mca_ns_base_module_t* mca_ns_proxy_init(bool *allow_multi_user_threads, bool *have_hidden_threads, int *priority)
|
mca_ns_base_module_t* mca_ns_proxy_init(bool *allow_multi_user_threads, bool *have_hidden_threads, int *priority)
|
||||||
{
|
{
|
||||||
int index, error_code;
|
|
||||||
char *my_replica_string;
|
|
||||||
|
|
||||||
/* If we're NOT the seed, then we want to be selected, so do all
|
/* If we're NOT the seed, then we want to be selected, so do all
|
||||||
the setup and return the module */
|
the setup and return the module */
|
||||||
/* ompi_output(mca_ns_base_output, "ns_proxy: entered init\n"); */
|
/* ompi_output(mca_ns_base_output, "ns_proxy: entered init\n"); */
|
||||||
@ -118,23 +115,12 @@ mca_ns_base_module_t* mca_ns_proxy_init(bool *allow_multi_user_threads, bool *ha
|
|||||||
*have_hidden_threads = false;
|
*have_hidden_threads = false;
|
||||||
|
|
||||||
/* define the replica for us to use */
|
/* define the replica for us to use */
|
||||||
/* register the mca parameter containing my replica's contact info */
|
/* default to seed for now */
|
||||||
index = mca_base_param_register_string("NS", "PROXY", "REPLICA", NULL, NULL);
|
mca_ns_my_replica = mca_ns_proxy.create_process_name(0,0,0);
|
||||||
|
if (NULL == mca_ns_my_replica) { /* couldn't create process name - can't operate */
|
||||||
error_code = mca_base_param_lookup_string(index, &my_replica_string);
|
|
||||||
if (OMPI_ERROR == error_code) { /* can't lookup mca parameter for some reason - can't operate */
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
mca_ns_my_replica = mca_ns_proxy.convert_string_to_process_name(my_replica_string);
|
|
||||||
if(NULL == mca_ns_my_replica) {
|
|
||||||
/* couldn't convert string to name - probably parameter not set - use seed as default */
|
|
||||||
mca_ns_my_replica = mca_ns_proxy.create_process_name(0,0,0);
|
|
||||||
if (NULL == mca_ns_my_replica) { /* couldn't create process name - can't operate */
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Return the module */
|
/* Return the module */
|
||||||
|
|
||||||
initialized = true;
|
initialized = true;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user