Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Collapse the OOB framework #42

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Collapse the OOB framework #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 5 additions & 55 deletions src/mca/ess/base/ess_base_std_prted.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
#include "src/mca/grpcomm/grpcomm.h"
#include "src/mca/iof/base/base.h"
#include "src/mca/odls/base/base.h"
#include "src/mca/oob/base/base.h"
#include "src/mca/plm/base/base.h"
#include "src/mca/prtereachable/base/base.h"
#include "src/mca/rmaps/base/base.h"
Expand Down Expand Up @@ -99,17 +98,15 @@ int prte_ess_base_prted_setup(void)
int fd;
char log_file[PATH_MAX];
char *error = NULL;
char *uri = NULL;
char *tmp;
prte_job_t *jdata;
char *tmp = NULL;
prte_job_t *jdata = NULL;
prte_proc_t *proc;
prte_app_context_t *app;
hwloc_obj_t obj;
unsigned i, j;
prte_topology_t *t;
prte_ess_base_signal_t *sig;
int idx;
pmix_value_t val;

plm_in_use = false;

Expand Down Expand Up @@ -245,7 +242,7 @@ int prte_ess_base_prted_setup(void)
/* obviously, we have "reported" */
jdata->num_reported = 1;

/* setup my session directory here as the OOB may need it */
/* setup my session directory here */
PMIX_OUTPUT_VERBOSE(
(2, prte_ess_base_framework.framework_output,
"%s setting up session dir with\n\ttmpdir: %s\n\thost %s",
Expand Down Expand Up @@ -316,61 +313,15 @@ int prte_ess_base_prted_setup(void)
error = "prte_prtereachable_base_select";
goto error;
}
if (PRTE_SUCCESS
!= (ret = pmix_mca_base_framework_open(&prte_oob_base_framework,
PMIX_MCA_BASE_OPEN_DEFAULT))) {
PRTE_ERROR_LOG(ret);
error = "prte_oob_base_open";
goto error;
}
if (PRTE_SUCCESS != (ret = prte_oob_base_select())) {
if (PRTE_SUCCESS != (ret = prte_rml_open())) {
PRTE_ERROR_LOG(ret);
error = "prte_oob_base_select";
error = "prte_rml_open";
goto error;
}
prte_rml_open();

/* it is now safe to start the pmix server */
pmix_server_start();

/* store our URI for later */
prte_oob_base_get_addr(&uri);
PMIX_VALUE_LOAD(&val, uri, PMIX_STRING);
ret = PMIx_Store_internal(PRTE_PROC_MY_NAME, PMIX_PROC_URI, &val);
if (PMIX_SUCCESS != ret) {
PMIX_VALUE_DESTRUCT(&val);
error = "store MY URI";
ret = PRTE_ERROR;
goto error;
}
PMIX_VALUE_DESTRUCT(&val);
free(uri);

if (NULL != prte_process_info.my_hnp_uri) {
/* extract the HNP's name so we can update the routing table */
ret = prte_rml_parse_uris(prte_process_info.my_hnp_uri,
PRTE_PROC_MY_HNP,
NULL);
if (PRTE_SUCCESS != ret) {
PRTE_ERROR_LOG(ret);
error = "prte_rml_parse_HNP";
goto error;
}
/* Set the contact info in the RML - this won't actually establish
* the connection, but just tells the RML how to reach the HNP
* if/when we attempt to send to it
*/
PMIX_VALUE_LOAD(&val, prte_process_info.my_hnp_uri, PMIX_STRING);
ret = PMIx_Store_internal(PRTE_PROC_MY_HNP, PMIX_PROC_URI, &val);
if (PMIX_SUCCESS != ret) {
PMIX_VALUE_DESTRUCT(&val);
error = "store HNP URI";
ret = PRTE_ERROR;
goto error;
}
PMIX_VALUE_DESTRUCT(&val);
}

/* select the errmgr */
if (PRTE_SUCCESS != (ret = prte_errmgr_base_select())) {
PRTE_ERROR_LOG(ret);
Expand Down Expand Up @@ -547,7 +498,6 @@ int prte_ess_base_prted_finalize(void)
(void) pmix_mca_base_framework_close(&prte_odls_base_framework);
(void) pmix_mca_base_framework_close(&prte_errmgr_base_framework);
prte_rml_close();
(void) pmix_mca_base_framework_close(&prte_oob_base_framework);
(void) pmix_mca_base_framework_close(&prte_prtereachable_base_framework);
(void) pmix_mca_base_framework_close(&prte_state_base_framework);

Expand Down
41 changes: 5 additions & 36 deletions src/mca/ess/hnp/ess_hnp_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
#include "src/mca/grpcomm/base/base.h"
#include "src/mca/iof/base/base.h"
#include "src/mca/odls/base/base.h"
#include "src/mca/oob/base/base.h"
#include "src/mca/plm/base/base.h"
#include "src/mca/plm/plm.h"
#include "src/mca/prtereachable/base/base.h"
Expand Down Expand Up @@ -107,8 +106,6 @@ static int rte_init(int argc, char **argv)
prte_app_context_t *app;
int idx;
prte_topology_t *t;
pmix_value_t pval;
pmix_status_t pret;
PRTE_HIDE_UNUSED_PARAMS(argc);

/* run the prolog */
Expand Down Expand Up @@ -234,7 +231,7 @@ static int rte_init(int argc, char **argv)
jdata->num_reported = 1;
jdata->num_daemons_reported = 1;

/* setup my session directory here as the OOB may need it */
/* setup my session directory here */
PMIX_OUTPUT_VERBOSE((2, prte_debug_output,
"%s setting up session dir with\n\ttmpdir: %s\n\thost %s",
PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
Expand Down Expand Up @@ -268,38 +265,11 @@ static int rte_init(int argc, char **argv)
error = "prte_prtereachable_base_select";
goto error;
}
/*
* OOB Layer
*/
if (PRTE_SUCCESS
!= (ret = pmix_mca_base_framework_open(&prte_oob_base_framework,
PMIX_MCA_BASE_OPEN_DEFAULT))) {
error = "prte_oob_base_open";
goto error;
}
if (PRTE_SUCCESS != (ret = prte_oob_base_select())) {
error = "prte_oob_base_select";
goto error;
}

// set our RML address
prte_oob_base_get_addr(&proc->rml_uri);
prte_process_info.my_hnp_uri = strdup(proc->rml_uri);
/* store it in the local PMIx repo for later retrieval */
PMIX_VALUE_LOAD(&pval, proc->rml_uri, PMIX_STRING);
if (PMIX_SUCCESS != (pret = PMIx_Store_internal(PRTE_PROC_MY_NAME, PMIX_PROC_URI, &pval))) {
PMIX_ERROR_LOG(pret);
ret = PRTE_ERROR;
PMIX_VALUE_DESTRUCT(&pval);
error = "store uri";
if (PRTE_SUCCESS != (ret = prte_rml_open())) {
PRTE_ERROR_LOG(ret);
error = "prte_rml_open";
goto error;
}
PMIX_VALUE_DESTRUCT(&pval);

/*
* Runtime Messaging Layer
*/
prte_rml_open();

/* it is now safe to start the pmix server */
pmix_server_start();
Expand Down Expand Up @@ -471,7 +441,7 @@ static int rte_init(int argc, char **argv)
static int rte_finalize(void)
{
/* first stage shutdown of the errmgr, deregister the handler but keep
* the required facilities until the rml and oob are offline */
* the required facilities until the rml is offline */
prte_errmgr.finalize();

/* close frameworks */
Expand All @@ -486,7 +456,6 @@ static int rte_finalize(void)
(void) pmix_mca_base_framework_close(&prte_rtc_base_framework);
(void) pmix_mca_base_framework_close(&prte_odls_base_framework);
prte_rml_close();
(void) pmix_mca_base_framework_close(&prte_oob_base_framework);
(void) pmix_mca_base_framework_close(&prte_prtereachable_base_framework);
(void) pmix_mca_base_framework_close(&prte_errmgr_base_framework);
(void) pmix_mca_base_framework_close(&prte_state_base_framework);
Expand Down
40 changes: 0 additions & 40 deletions src/mca/oob/Makefile.am
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions src/mca/oob/base/Makefile.am
View file
Open in desktop

This file was deleted.

111 changes: 0 additions & 111 deletions src/mca/oob/base/oob_base_frame.c
View file
Open in desktop

This file was deleted.

Loading
Loading