From f3c816b52ebef16f2773a277a7a6829bcea54efa Mon Sep 17 00:00:00 2001 From: Artem Polyakov Date: Mon, 15 Aug 2016 18:21:50 +0700 Subject: [PATCH] opal/pmix: fix indentation in some files. --- opal/mca/pmix/ext114/pmix_ext_client.c | 1144 +++++++++++------------ opal/mca/pmix/ext20/pmix_ext20_client.c | 558 +++++------ opal/mca/pmix/pmix2x/pmix2x_client.c | 546 +++++------ 3 files changed, 1124 insertions(+), 1124 deletions(-) diff --git a/opal/mca/pmix/ext114/pmix_ext_client.c b/opal/mca/pmix/ext114/pmix_ext_client.c index c393a8fc78..cc1b196a51 100644 --- a/opal/mca/pmix/ext114/pmix_ext_client.c +++ b/opal/mca/pmix/ext114/pmix_ext_client.c @@ -38,22 +38,22 @@ static int errhdler_ref = 0; #define PMIX_WAIT_FOR_COMPLETION(a) \ do { \ - while ((a)) { \ - usleep(10); \ - } \ + while ((a)) { \ + usleep(10); \ + } \ } while (0) static void completion_handler(int status, opal_list_t *results, - opal_pmix_op_cbfunc_t cbfunc, void *thiscbdata, - void *notification_cbdata) { + opal_pmix_op_cbfunc_t cbfunc, void *thiscbdata, + void *notification_cbdata) { int * cond = (int *)notification_cbdata; *cond = 0; } static void myerr(pmix_status_t status, - pmix_proc_t procs[], size_t nprocs, - pmix_info_t info[], size_t ninfo) + pmix_proc_t procs[], size_t nprocs, + pmix_info_t info[], size_t ninfo) { int rc; opal_list_t plist, ilist; @@ -68,19 +68,19 @@ static void myerr(pmix_status_t status, /* convert the array of procs */ OBJ_CONSTRUCT(&plist, opal_list_t); for (n=0; n < nprocs; n++) { - nm = OBJ_NEW(opal_namelist_t); - nm->name.jobid = strtoul(procs[n].nspace, NULL, 10); - nm->name.vpid = procs[n].rank; - opal_list_append(&plist, &nm->super); + nm = OBJ_NEW(opal_namelist_t); + nm->name.jobid = strtoul(procs[n].nspace, NULL, 10); + nm->name.vpid = procs[n].rank; + opal_list_append(&plist, &nm->super); } /* convert the array of info */ OBJ_CONSTRUCT(&ilist, opal_list_t); for (n=0; n < ninfo; n++) { - iptr = OBJ_NEW(opal_value_t); - iptr->key = strdup(info[n].key); - pmix1_value_unload(iptr, &info[n].value); - opal_list_append(&plist, &iptr->super); + iptr = OBJ_NEW(opal_value_t); + iptr->key = strdup(info[n].key); + pmix1_value_unload(iptr, &info[n].value); + opal_list_append(&plist, &iptr->super); } /* call the base errhandler */ @@ -92,13 +92,13 @@ static void myerr(pmix_status_t status, } static void errreg_cbfunc (pmix_status_t status, - int errhandler_ref, - void *cbdata) + int errhandler_ref, + void *cbdata) { errhdler_ref = errhandler_ref; opal_output_verbose(5, opal_pmix_base_framework.framework_output, - "PMIX client errreg_cbfunc - error handler registered status=%d, reference=%d", - status, errhandler_ref); + "PMIX client errreg_cbfunc - error handler registered status=%d, reference=%d", + status, errhandler_ref); } int pmix1_client_init(void) @@ -109,28 +109,28 @@ int pmix1_client_init(void) opal_pmix1_jobid_trkr_t *job; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client init"); + "PMIx_client init"); if (0 < (dbg = opal_output_get_verbosity(opal_pmix_base_framework.framework_output))) { - asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg); - putenv(dbgvalue); + asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg); + putenv(dbgvalue); } rc = PMIx_Init(&my_proc); if (PMIX_SUCCESS != rc) { - return pmix1_convert_rc(rc); + return pmix1_convert_rc(rc); } /* store our jobid and rank */ - if (NULL != getenv(OPAL_MCA_PREFIX"orte_launch")) { - /* if we were launched by the OMPI RTE, then - * the jobid is in a special format - so get it */ - mca_pmix_ext114_component.native_launch = true; - opal_convert_string_to_jobid(&pname.jobid, my_proc.nspace); + if (NULL != getenv(OPAL_MCA_PREFIX"orte_launch")) { + /* if we were launched by the OMPI RTE, then + * the jobid is in a special format - so get it */ + mca_pmix_ext114_component.native_launch = true; + opal_convert_string_to_jobid(&pname.jobid, my_proc.nspace); } else { - /* we were launched by someone else, so make the - * jobid just be the hash of the nspace */ - OPAL_HASH_STR(my_proc.nspace, pname.jobid); + /* we were launched by someone else, so make the + * jobid just be the hash of the nspace */ + OPAL_HASH_STR(my_proc.nspace, pname.jobid); } /* insert this into our list of jobids - it will be the * first, and so we'll check it first */ @@ -153,7 +153,7 @@ int pmix1_client_finalize(void) pmix_status_t rc; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client finalize"); + "PMIx_client finalize"); /* deregister the errhandler */ PMIx_Deregister_errhandler(errhdler_ref, NULL, NULL); @@ -165,13 +165,13 @@ int pmix1_client_finalize(void) int pmix1_initialized(void) { opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client initialized"); + "PMIx_client initialized"); return PMIx_Initialized(); } int pmix1_abort(int flag, const char *msg, - opal_list_t *procs) + opal_list_t *procs) { pmix_status_t rc; pmix_proc_t *parray=NULL; @@ -180,30 +180,30 @@ int pmix1_abort(int flag, const char *msg, opal_pmix1_jobid_trkr_t *job, *jptr; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client abort"); + "PMIx_client abort"); /* convert the list of procs to an array * of pmix_proc_t */ if (NULL != procs && 0 < (cnt = opal_list_get_size(procs))) { - PMIX_PROC_CREATE(parray, cnt); - n=0; - OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (jptr->jobid == ptr->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - parray[n].rank = ptr->name.vpid; - ++n; - } + PMIX_PROC_CREATE(parray, cnt); + n=0; + OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (jptr->jobid == ptr->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + parray[n].rank = ptr->name.vpid; + ++n; + } } /* call the library abort */ @@ -223,25 +223,25 @@ int pmix1_store_local(const opal_process_name_t *proc, opal_value_t *val) opal_pmix1_jobid_trkr_t *job, *jptr; if (NULL != proc) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (jptr->jobid == proc->jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND); - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(p.nspace, job->nspace, PMIX_MAX_NSLEN); - p.rank = proc->vpid; + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (jptr->jobid == proc->jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND); + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(p.nspace, job->nspace, PMIX_MAX_NSLEN); + p.rank = proc->vpid; } else { - /* use our name */ - (void)strncpy(p.nspace, my_proc.nspace, PMIX_MAX_NSLEN); - p.rank = OPAL_PROC_MY_NAME.vpid; + /* use our name */ + (void)strncpy(p.nspace, my_proc.nspace, PMIX_MAX_NSLEN); + p.rank = OPAL_PROC_MY_NAME.vpid; } PMIX_VALUE_CONSTRUCT(&kv); @@ -266,7 +266,7 @@ static void opcbfunc(pmix_status_t status, void *cbdata) pmix1_opcaddy_t *op = (pmix1_opcaddy_t*)cbdata; if (NULL != op->opcbfunc) { - op->opcbfunc(pmix1_convert_rc(status), op->cbdata); + op->opcbfunc(pmix1_convert_rc(status), op->cbdata); } OBJ_RELEASE(op); } @@ -281,41 +281,41 @@ int pmix1_fence(opal_list_t *procs, int collect_data) opal_pmix1_jobid_trkr_t *job, *jptr; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client fence"); + "PMIx_client fence"); /* convert the list of procs to an array * of pmix_proc_t */ if (NULL != procs && 0 < (cnt = opal_list_get_size(procs))) { - PMIX_PROC_CREATE(parray, cnt); - n=0; - OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (jptr->jobid == ptr->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - parray[n].rank = ptr->name.vpid; - ++n; - } + PMIX_PROC_CREATE(parray, cnt); + n=0; + OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (jptr->jobid == ptr->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + parray[n].rank = ptr->name.vpid; + ++n; + } } if (collect_data) { - PMIX_INFO_CONSTRUCT(&info); - (void)strncpy(info.key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN); - info.value.type = PMIX_BOOL; - info.value.data.flag = true; - iptr = &info; - n = 1; + PMIX_INFO_CONSTRUCT(&info); + (void)strncpy(info.key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN); + info.value.type = PMIX_BOOL; + info.value.data.flag = true; + iptr = &info; + n = 1; } else { - iptr = NULL; - n = 0; + iptr = NULL; + n = 0; } /* call the library function */ @@ -324,7 +324,7 @@ int pmix1_fence(opal_list_t *procs, int collect_data) /* release the array */ PMIX_PROC_FREE(parray, cnt); if (NULL != iptr) { - PMIX_INFO_DESTRUCT(&info); + PMIX_INFO_DESTRUCT(&info); } return pmix1_convert_rc(rc); @@ -332,7 +332,7 @@ int pmix1_fence(opal_list_t *procs, int collect_data) } int pmix1_fencenb(opal_list_t *procs, int collect_data, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, void *cbdata) { pmix_status_t rc; pmix_proc_t *parray=NULL; @@ -343,42 +343,42 @@ int pmix1_fencenb(opal_list_t *procs, int collect_data, opal_pmix1_jobid_trkr_t *job, *jptr; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client fence_nb"); + "PMIx_client fence_nb"); /* convert the list of procs to an array * of pmix_proc_t */ if (NULL != procs && 0 < (cnt = opal_list_get_size(procs))) { - PMIX_PROC_CREATE(parray, cnt); - n=0; - OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (jptr->jobid == ptr->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - parray[n].rank = ptr->name.vpid; - ++n; - } + PMIX_PROC_CREATE(parray, cnt); + n=0; + OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (jptr->jobid == ptr->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + parray[n].rank = ptr->name.vpid; + ++n; + } } if (collect_data) { - PMIX_INFO_CONSTRUCT(&info); - (void)strncpy(info.key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN); - info.value.type = PMIX_BOOL; - info.value.data.flag = true; - iptr = &info; - n = 1; + PMIX_INFO_CONSTRUCT(&info); + (void)strncpy(info.key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN); + info.value.type = PMIX_BOOL; + info.value.data.flag = true; + iptr = &info; + n = 1; } else { - iptr = NULL; - n = 0; + iptr = NULL; + n = 0; } /* create the caddy */ @@ -391,7 +391,7 @@ int pmix1_fencenb(opal_list_t *procs, int collect_data, /* call the library function */ rc = PMIx_Fence_nb(parray, cnt, iptr, n, opcbfunc, op); if (PMIX_SUCCESS != rc) { - OBJ_RELEASE(op); + OBJ_RELEASE(op); } return pmix1_convert_rc(rc); @@ -399,14 +399,14 @@ int pmix1_fencenb(opal_list_t *procs, int collect_data, } int pmix1_put(opal_pmix_scope_t opal_scope, - opal_value_t *val) + opal_value_t *val) { pmix_value_t kv; pmix_scope_t pmix_scope = pmix1_convert_opalscope(opal_scope); pmix_status_t rc; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client put"); + "PMIx_client put"); PMIX_VALUE_CONSTRUCT(&kv); pmix1_value_load(&kv, val); @@ -417,7 +417,7 @@ int pmix1_put(opal_pmix_scope_t opal_scope, } int pmix1_get(const opal_process_name_t *proc, const char *key, - opal_list_t *info, opal_value_t **val) + opal_list_t *info, opal_value_t **val) { int ret; pmix_value_t *kv; @@ -429,80 +429,80 @@ int pmix1_get(const opal_process_name_t *proc, const char *key, opal_pmix1_jobid_trkr_t *job, *jptr; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "%s PMIx_client get on proc %s key %s", - OPAL_NAME_PRINT(OPAL_PROC_MY_NAME), - (NULL == proc) ? "NULL" : OPAL_NAME_PRINT(*proc), key); + "%s PMIx_client get on proc %s key %s", + OPAL_NAME_PRINT(OPAL_PROC_MY_NAME), + (NULL == proc) ? "NULL" : OPAL_NAME_PRINT(*proc), key); /* prep default response */ *val = NULL; if (NULL != proc) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (jptr->jobid == proc->jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(p.nspace, job->nspace, PMIX_MAX_NSLEN); - p.rank = proc->vpid; - pptr = &p; + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (jptr->jobid == proc->jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(p.nspace, job->nspace, PMIX_MAX_NSLEN); + p.rank = proc->vpid; + pptr = &p; } else { - /* if they are asking for our jobid, then return it */ - if (0 == strcmp(key, OPAL_PMIX_JOBID)) { - (*val) = OBJ_NEW(opal_value_t); - (*val)->type = OPAL_UINT32; - (*val)->data.uint32 = OPAL_PROC_MY_NAME.jobid; - return OPAL_SUCCESS; - } else if (0 == strcmp(key, OPAL_PMIX_RANK)) { - (*val) = OBJ_NEW(opal_value_t); - (*val)->type = OPAL_INT; - (*val)->data.integer = my_proc.rank; - return OPAL_SUCCESS; - } - pptr = NULL; + /* if they are asking for our jobid, then return it */ + if (0 == strcmp(key, OPAL_PMIX_JOBID)) { + (*val) = OBJ_NEW(opal_value_t); + (*val)->type = OPAL_UINT32; + (*val)->data.uint32 = OPAL_PROC_MY_NAME.jobid; + return OPAL_SUCCESS; + } else if (0 == strcmp(key, OPAL_PMIX_RANK)) { + (*val) = OBJ_NEW(opal_value_t); + (*val)->type = OPAL_INT; + (*val)->data.integer = my_proc.rank; + return OPAL_SUCCESS; + } + pptr = NULL; } if (NULL != info) { - ninfo = opal_list_get_size(info); - if (0 < ninfo) { - PMIX_INFO_CREATE(pinfo, ninfo); - n=0; - OPAL_LIST_FOREACH(ival, info, opal_value_t) { - (void)strncpy(pinfo[n].key, ival->key, PMIX_MAX_KEYLEN); - pmix1_value_load(&pinfo[n].value, ival); - } - } else { - pinfo = NULL; - } + ninfo = opal_list_get_size(info); + if (0 < ninfo) { + PMIX_INFO_CREATE(pinfo, ninfo); + n=0; + OPAL_LIST_FOREACH(ival, info, opal_value_t) { + (void)strncpy(pinfo[n].key, ival->key, PMIX_MAX_KEYLEN); + pmix1_value_load(&pinfo[n].value, ival); + } + } else { + pinfo = NULL; + } } else { - pinfo = NULL; - ninfo = 0; + pinfo = NULL; + ninfo = 0; } /* pass the request down */ rc = PMIx_Get(pptr, key, pinfo, ninfo, &kv); if (PMIX_SUCCESS == rc) { - if (NULL == kv) { - ret = OPAL_SUCCESS; - } else { - *val = OBJ_NEW(opal_value_t); - ret = pmix1_value_unload(*val, kv); - PMIX_VALUE_FREE(kv, 1); - } + if (NULL == kv) { + ret = OPAL_SUCCESS; + } else { + *val = OBJ_NEW(opal_value_t); + ret = pmix1_value_unload(*val, kv); + PMIX_VALUE_FREE(kv, 1); + } } else { - ret = pmix1_convert_rc(rc); + ret = pmix1_convert_rc(rc); } PMIX_INFO_FREE(pinfo, ninfo); return ret; } static void val_cbfunc(pmix_status_t status, - pmix_value_t *kv, void *cbdata) + pmix_value_t *kv, void *cbdata) { pmix1_opcaddy_t *op = (pmix1_opcaddy_t*)cbdata; int rc; @@ -510,19 +510,19 @@ static void val_cbfunc(pmix_status_t status, rc = pmix1_convert_opalrc(status); if (PMIX_SUCCESS == status && NULL != kv) { - rc = pmix1_value_unload(&val, kv); - v = &val; + rc = pmix1_value_unload(&val, kv); + v = &val; } if (NULL != op->valcbfunc) { - op->valcbfunc(rc, v, op->cbdata); + op->valcbfunc(rc, v, op->cbdata); } OBJ_RELEASE(op); } int pmix1_getnb(const opal_process_name_t *proc, const char *key, - opal_list_t *info, - opal_pmix_value_cbfunc_t cbfunc, void *cbdata) + opal_list_t *info, + opal_pmix_value_cbfunc_t cbfunc, void *cbdata) { pmix1_opcaddy_t *op; pmix_status_t rc; @@ -531,9 +531,9 @@ int pmix1_getnb(const opal_process_name_t *proc, const char *key, opal_pmix1_jobid_trkr_t *job, *jptr; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "%s PMIx_client get_nb on proc %s key %s", - OPAL_NAME_PRINT(OPAL_PROC_MY_NAME), - (NULL == proc) ? "NULL" : OPAL_NAME_PRINT(*proc), key); + "%s PMIx_client get_nb on proc %s key %s", + OPAL_NAME_PRINT(OPAL_PROC_MY_NAME), + (NULL == proc) ? "NULL" : OPAL_NAME_PRINT(*proc), key); /* create the caddy */ op = OBJ_NEW(pmix1_opcaddy_t); @@ -541,41 +541,41 @@ int pmix1_getnb(const opal_process_name_t *proc, const char *key, op->cbdata = cbdata; if (NULL != proc) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (jptr->jobid == proc->jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(op->p.nspace, job->nspace, PMIX_MAX_NSLEN); - op->p.rank = proc->vpid; + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (jptr->jobid == proc->jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(op->p.nspace, job->nspace, PMIX_MAX_NSLEN); + op->p.rank = proc->vpid; } else { - (void)strncpy(op->p.nspace, my_proc.nspace, PMIX_MAX_NSLEN); - op->p.rank = PMIX_RANK_WILDCARD; + (void)strncpy(op->p.nspace, my_proc.nspace, PMIX_MAX_NSLEN); + op->p.rank = PMIX_RANK_WILDCARD; } if (NULL != info) { - op->sz = opal_list_get_size(info); - if (0 < op->sz) { - PMIX_INFO_CREATE(op->info, op->sz); - n=0; - OPAL_LIST_FOREACH(ival, info, opal_value_t) { - (void)strncpy(op->info[n].key, ival->key, PMIX_MAX_KEYLEN); - pmix1_value_load(&op->info[n].value, ival); - } - } + op->sz = opal_list_get_size(info); + if (0 < op->sz) { + PMIX_INFO_CREATE(op->info, op->sz); + n=0; + OPAL_LIST_FOREACH(ival, info, opal_value_t) { + (void)strncpy(op->info[n].key, ival->key, PMIX_MAX_KEYLEN); + pmix1_value_load(&op->info[n].value, ival); + } + } } /* call the library function */ rc = PMIx_Get_nb(&op->p, key, op->info, op->sz, val_cbfunc, op); if (PMIX_SUCCESS != rc) { - OBJ_RELEASE(op); + OBJ_RELEASE(op); } return pmix1_convert_rc(rc); @@ -589,23 +589,23 @@ int pmix1_publish(opal_list_t *info) size_t sz, n; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client publish"); + "PMIx_client publish"); if (NULL == info) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } sz = opal_list_get_size(info); if (0 < sz) { - PMIX_INFO_CREATE(pinfo, sz); - n=0; - OPAL_LIST_FOREACH(iptr, info, opal_value_t) { - (void)strncpy(pinfo[n].key, iptr->key, PMIX_MAX_KEYLEN); - pmix1_value_load(&pinfo[n].value, iptr); - ++n; - } + PMIX_INFO_CREATE(pinfo, sz); + n=0; + OPAL_LIST_FOREACH(iptr, info, opal_value_t) { + (void)strncpy(pinfo[n].key, iptr->key, PMIX_MAX_KEYLEN); + pmix1_value_load(&pinfo[n].value, iptr); + ++n; + } } else { - pinfo = NULL; + pinfo = NULL; } ret = PMIx_Publish(pinfo, sz); @@ -614,7 +614,7 @@ int pmix1_publish(opal_list_t *info) } int pmix1_publishnb(opal_list_t *info, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, void *cbdata) { pmix_status_t ret; opal_value_t *iptr; @@ -622,10 +622,10 @@ int pmix1_publishnb(opal_list_t *info, pmix1_opcaddy_t *op; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client publish_nb"); + "PMIx_client publish_nb"); if (NULL == info) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* create the caddy */ @@ -635,13 +635,13 @@ int pmix1_publishnb(opal_list_t *info, op->sz = opal_list_get_size(info); if (0 < op->sz) { - PMIX_INFO_CREATE(op->info, op->sz); - n=0; - OPAL_LIST_FOREACH(iptr, info, opal_value_t) { - (void)strncpy(op->info[n].key, iptr->key, PMIX_MAX_KEYLEN); - pmix1_value_load(&op->info[n].value, iptr); - ++n; - } + PMIX_INFO_CREATE(op->info, op->sz); + n=0; + OPAL_LIST_FOREACH(iptr, info, opal_value_t) { + (void)strncpy(op->info[n].key, iptr->key, PMIX_MAX_KEYLEN); + pmix1_value_load(&op->info[n].value, iptr); + ++n; + } } ret = PMIx_Publish_nb(op->info, op->sz, opcbfunc, op); @@ -661,84 +661,84 @@ int pmix1_lookup(opal_list_t *data, opal_list_t *info) opal_pmix1_jobid_trkr_t *job, *jptr; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client lookup"); + "PMIx_client lookup"); if (NULL == data) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } sz = opal_list_get_size(data); PMIX_PDATA_CREATE(pdata, sz); n=0; OPAL_LIST_FOREACH(d, data, opal_pmix_pdata_t) { - (void)strncpy(pdata[n++].key, d->value.key, PMIX_MAX_KEYLEN); + (void)strncpy(pdata[n++].key, d->value.key, PMIX_MAX_KEYLEN); } if (NULL != info) { - ninfo = opal_list_get_size(info); - PMIX_INFO_CREATE(pinfo, ninfo); - n=0; - OPAL_LIST_FOREACH(iptr, info, opal_value_t) { - (void)strncpy(pinfo[n++].key, iptr->key, PMIX_MAX_KEYLEN); - pmix1_value_load(&pinfo[n].value, iptr); - ++n; - } + ninfo = opal_list_get_size(info); + PMIX_INFO_CREATE(pinfo, ninfo); + n=0; + OPAL_LIST_FOREACH(iptr, info, opal_value_t) { + (void)strncpy(pinfo[n++].key, iptr->key, PMIX_MAX_KEYLEN); + pmix1_value_load(&pinfo[n].value, iptr); + ++n; + } } else { - pinfo = NULL; - ninfo = 0; + pinfo = NULL; + ninfo = 0; } ret = PMIx_Lookup(pdata, sz, pinfo, ninfo); PMIX_INFO_FREE(pinfo, ninfo); if (PMIX_SUCCESS == ret) { - /* transfer the data back */ - n=0; - OPAL_LIST_FOREACH(d, data, opal_pmix_pdata_t) { - if (mca_pmix_ext114_component.native_launch) { - /* if we were launched by the OMPI RTE, then - * the jobid is in a special format - so get it */ - opal_convert_string_to_jobid(&d->proc.jobid, pdata[n].proc.nspace); - } else { - /* we were launched by someone else, so make the - * jobid just be the hash of the nspace */ - OPAL_HASH_STR(pdata[n].proc.nspace, d->proc.jobid); - } - /* if we don't already have it, add this to our jobid tracker */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (jptr->jobid == d->proc.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - job = OBJ_NEW(opal_pmix1_jobid_trkr_t); - (void)strncpy(job->nspace, pdata[n].proc.nspace, PMIX_MAX_NSLEN); - job->jobid = d->proc.jobid; - opal_list_append(&mca_pmix_ext114_component.jobids, &job->super); - } - if (PMIX_RANK_WILDCARD == pdata[n].proc.rank) { - d->proc.vpid = OPAL_VPID_WILDCARD; - } else { - d->proc.vpid = pdata[n].proc.rank; - } - rc = pmix1_value_unload(&d->value, &pdata[n].value); - if (OPAL_SUCCESS != rc) { - OPAL_ERROR_LOG(rc); - PMIX_PDATA_FREE(pdata, sz); - return OPAL_ERR_BAD_PARAM; - } - ++n; - } + /* transfer the data back */ + n=0; + OPAL_LIST_FOREACH(d, data, opal_pmix_pdata_t) { + if (mca_pmix_ext114_component.native_launch) { + /* if we were launched by the OMPI RTE, then + * the jobid is in a special format - so get it */ + opal_convert_string_to_jobid(&d->proc.jobid, pdata[n].proc.nspace); + } else { + /* we were launched by someone else, so make the + * jobid just be the hash of the nspace */ + OPAL_HASH_STR(pdata[n].proc.nspace, d->proc.jobid); + } + /* if we don't already have it, add this to our jobid tracker */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (jptr->jobid == d->proc.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + job = OBJ_NEW(opal_pmix1_jobid_trkr_t); + (void)strncpy(job->nspace, pdata[n].proc.nspace, PMIX_MAX_NSLEN); + job->jobid = d->proc.jobid; + opal_list_append(&mca_pmix_ext114_component.jobids, &job->super); + } + if (PMIX_RANK_WILDCARD == pdata[n].proc.rank) { + d->proc.vpid = OPAL_VPID_WILDCARD; + } else { + d->proc.vpid = pdata[n].proc.rank; + } + rc = pmix1_value_unload(&d->value, &pdata[n].value); + if (OPAL_SUCCESS != rc) { + OPAL_ERROR_LOG(rc); + PMIX_PDATA_FREE(pdata, sz); + return OPAL_ERR_BAD_PARAM; + } + ++n; + } } return pmix1_convert_rc(ret); } static void lk_cbfunc(pmix_status_t status, - pmix_pdata_t data[], size_t ndata, - void *cbdata) + pmix_pdata_t data[], size_t ndata, + void *cbdata) { pmix1_opcaddy_t *op = (pmix1_opcaddy_t*)cbdata; opal_pmix_pdata_t *d; @@ -748,66 +748,66 @@ static void lk_cbfunc(pmix_status_t status, opal_pmix1_jobid_trkr_t *job, *jptr; if (NULL == op->lkcbfunc) { - OBJ_RELEASE(op); - return; + OBJ_RELEASE(op); + return; } rc = pmix1_convert_rc(status); if (OPAL_SUCCESS == rc) { - OBJ_CONSTRUCT(&results, opal_list_t); - for (n=0; n < ndata; n++) { - d = OBJ_NEW(opal_pmix_pdata_t); - opal_list_append(&results, &d->super); - if (mca_pmix_ext114_component.native_launch) { - /* if we were launched by the OMPI RTE, then - * the jobid is in a special format - so get it */ - opal_convert_string_to_jobid(&d->proc.jobid, data[n].proc.nspace); - } else { - /* we were launched by someone else, so make the - * jobid just be the hash of the nspace */ - OPAL_HASH_STR(data[n].proc.nspace, d->proc.jobid); - } - /* if we don't already have it, add this to our jobid tracker */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (jptr->jobid == d->proc.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - job = OBJ_NEW(opal_pmix1_jobid_trkr_t); - (void)strncpy(job->nspace, data[n].proc.nspace, PMIX_MAX_NSLEN); - job->jobid = d->proc.jobid; - opal_list_append(&mca_pmix_ext114_component.jobids, &job->super); - } - if (PMIX_RANK_WILDCARD == data[n].proc.rank) { - d->proc.vpid = OPAL_VPID_WILDCARD; - } else { - d->proc.vpid = data[n].proc.rank; - } - d->value.key = strdup(data[n].key); - rc = pmix1_value_unload(&d->value, &data[n].value); - if (OPAL_SUCCESS != rc) { - rc = OPAL_ERR_BAD_PARAM; - OPAL_ERROR_LOG(rc); - goto release; - } - } - r = &results; + OBJ_CONSTRUCT(&results, opal_list_t); + for (n=0; n < ndata; n++) { + d = OBJ_NEW(opal_pmix_pdata_t); + opal_list_append(&results, &d->super); + if (mca_pmix_ext114_component.native_launch) { + /* if we were launched by the OMPI RTE, then + * the jobid is in a special format - so get it */ + opal_convert_string_to_jobid(&d->proc.jobid, data[n].proc.nspace); + } else { + /* we were launched by someone else, so make the + * jobid just be the hash of the nspace */ + OPAL_HASH_STR(data[n].proc.nspace, d->proc.jobid); + } + /* if we don't already have it, add this to our jobid tracker */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (jptr->jobid == d->proc.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + job = OBJ_NEW(opal_pmix1_jobid_trkr_t); + (void)strncpy(job->nspace, data[n].proc.nspace, PMIX_MAX_NSLEN); + job->jobid = d->proc.jobid; + opal_list_append(&mca_pmix_ext114_component.jobids, &job->super); + } + if (PMIX_RANK_WILDCARD == data[n].proc.rank) { + d->proc.vpid = OPAL_VPID_WILDCARD; + } else { + d->proc.vpid = data[n].proc.rank; + } + d->value.key = strdup(data[n].key); + rc = pmix1_value_unload(&d->value, &data[n].value); + if (OPAL_SUCCESS != rc) { + rc = OPAL_ERR_BAD_PARAM; + OPAL_ERROR_LOG(rc); + goto release; + } + } + r = &results; } - release: +release: /* execute the callback */ op->lkcbfunc(rc, r, op->cbdata); if (NULL != r) { - OPAL_LIST_DESTRUCT(&results); + OPAL_LIST_DESTRUCT(&results); } OBJ_RELEASE(op); } int pmix1_lookupnb(char **keys, opal_list_t *info, - opal_pmix_lookup_cbfunc_t cbfunc, void *cbdata) + opal_pmix_lookup_cbfunc_t cbfunc, void *cbdata) { pmix_status_t ret; pmix1_opcaddy_t *op; @@ -816,7 +816,7 @@ int pmix1_lookupnb(char **keys, opal_list_t *info, opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client lookup_nb"); + "PMIx_client lookup_nb"); /* create the caddy */ op = OBJ_NEW(pmix1_opcaddy_t); @@ -824,16 +824,16 @@ int pmix1_lookupnb(char **keys, opal_list_t *info, op->cbdata = cbdata; if (NULL != info) { - op->sz = opal_list_get_size(info); - if (0 < op->sz) { - PMIX_INFO_CREATE(op->info, op->sz); - n=0; - OPAL_LIST_FOREACH(iptr, info, opal_value_t) { - (void)strncpy(op->info[n].key, iptr->key, PMIX_MAX_KEYLEN); - pmix1_value_load(&op->info[n].value, iptr); - ++n; - } - } + op->sz = opal_list_get_size(info); + if (0 < op->sz) { + PMIX_INFO_CREATE(op->info, op->sz); + n=0; + OPAL_LIST_FOREACH(iptr, info, opal_value_t) { + (void)strncpy(op->info[n].key, iptr->key, PMIX_MAX_KEYLEN); + pmix1_value_load(&op->info[n].value, iptr); + ++n; + } + } } ret = PMIx_Lookup_nb(keys, op->info, op->sz, lk_cbfunc, op); @@ -849,17 +849,17 @@ int pmix1_unpublish(char **keys, opal_list_t *info) opal_value_t *iptr; if (NULL != info) { - ninfo = opal_list_get_size(info); - PMIX_INFO_CREATE(pinfo, ninfo); - n=0; - OPAL_LIST_FOREACH(iptr, info, opal_value_t) { - (void)strncpy(pinfo[n++].key, iptr->key, PMIX_MAX_KEYLEN); - pmix1_value_load(&pinfo[n].value, iptr); - ++n; - } + ninfo = opal_list_get_size(info); + PMIX_INFO_CREATE(pinfo, ninfo); + n=0; + OPAL_LIST_FOREACH(iptr, info, opal_value_t) { + (void)strncpy(pinfo[n++].key, iptr->key, PMIX_MAX_KEYLEN); + pmix1_value_load(&pinfo[n].value, iptr); + ++n; + } } else { - pinfo = NULL; - ninfo = 0; + pinfo = NULL; + ninfo = 0; } ret = PMIx_Unpublish(keys, pinfo, ninfo); @@ -869,7 +869,7 @@ int pmix1_unpublish(char **keys, opal_list_t *info) } int pmix1_unpublishnb(char **keys, opal_list_t *info, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, void *cbdata) { pmix_status_t ret; pmix1_opcaddy_t *op; @@ -882,16 +882,16 @@ int pmix1_unpublishnb(char **keys, opal_list_t *info, op->cbdata = cbdata; if (NULL != info) { - op->sz = opal_list_get_size(info); - if (0 < op->sz) { - PMIX_INFO_CREATE(op->info, op->sz); - n=0; - OPAL_LIST_FOREACH(iptr, info, opal_value_t) { - (void)strncpy(op->info[n].key, iptr->key, PMIX_MAX_KEYLEN); - pmix1_value_load(&op->info[n].value, iptr); - ++n; - } - } + op->sz = opal_list_get_size(info); + if (0 < op->sz) { + PMIX_INFO_CREATE(op->info, op->sz); + n=0; + OPAL_LIST_FOREACH(iptr, info, opal_value_t) { + (void)strncpy(op->info[n].key, iptr->key, PMIX_MAX_KEYLEN); + pmix1_value_load(&op->info[n].value, iptr); + ++n; + } + } } ret = PMIx_Unpublish_nb(keys, op->info, op->sz, opcbfunc, op); @@ -911,52 +911,52 @@ int pmix1_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid) opal_pmix1_jobid_trkr_t *job; if (NULL != job_info && 0 < (ninfo = opal_list_get_size(job_info))) { - PMIX_INFO_CREATE(pinfo, ninfo); - n=0; - OPAL_LIST_FOREACH(info, job_info, opal_value_t) { - (void)strncpy(pinfo[n].key, info->key, PMIX_MAX_KEYLEN); - pmix1_value_load(&pinfo[n].value, info); - ++n; - } + PMIX_INFO_CREATE(pinfo, ninfo); + n=0; + OPAL_LIST_FOREACH(info, job_info, opal_value_t) { + (void)strncpy(pinfo[n].key, info->key, PMIX_MAX_KEYLEN); + pmix1_value_load(&pinfo[n].value, info); + ++n; + } } napps = opal_list_get_size(apps); PMIX_APP_CREATE(papps, napps); n=0; OPAL_LIST_FOREACH(app, apps, opal_pmix_app_t) { - papps[n].cmd = strdup(app->cmd); - papps[n].argc = app->argc; - papps[n].argv = opal_argv_copy(app->argv); - papps[n].env = opal_argv_copy(app->env); - papps[n].maxprocs = app->maxprocs; - if (0 < (papps[n].ninfo = opal_list_get_size(&app->info))) { - PMIX_INFO_CREATE(papps[n].info, papps[n].ninfo); - m=0; - OPAL_LIST_FOREACH(info, &app->info, opal_value_t) { - (void)strncpy(papps[n].info[m].key, info->key, PMIX_MAX_KEYLEN); - pmix1_value_load(&papps[n].info[m].value, info); - ++m; - } - } - ++n; + papps[n].cmd = strdup(app->cmd); + papps[n].argc = app->argc; + papps[n].argv = opal_argv_copy(app->argv); + papps[n].env = opal_argv_copy(app->env); + papps[n].maxprocs = app->maxprocs; + if (0 < (papps[n].ninfo = opal_list_get_size(&app->info))) { + PMIX_INFO_CREATE(papps[n].info, papps[n].ninfo); + m=0; + OPAL_LIST_FOREACH(info, &app->info, opal_value_t) { + (void)strncpy(papps[n].info[m].key, info->key, PMIX_MAX_KEYLEN); + pmix1_value_load(&papps[n].info[m].value, info); + ++m; + } + } + ++n; } ret = PMIx_Spawn(pinfo, ninfo, papps, napps, nspace); if (PMIX_SUCCESS == ret) { - if (mca_pmix_ext114_component.native_launch) { - /* if we were launched by the OMPI RTE, then - * the jobid is in a special format - so get it */ - opal_convert_string_to_jobid(jobid, nspace); - } else { - /* we were launched by someone else, so make the - * jobid just be the hash of the nspace */ - OPAL_HASH_STR(nspace, *jobid); - } - /* add this to our jobid tracker */ - job = OBJ_NEW(opal_pmix1_jobid_trkr_t); - (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); - job->jobid = *jobid; - opal_list_append(&mca_pmix_ext114_component.jobids, &job->super); + if (mca_pmix_ext114_component.native_launch) { + /* if we were launched by the OMPI RTE, then + * the jobid is in a special format - so get it */ + opal_convert_string_to_jobid(jobid, nspace); + } else { + /* we were launched by someone else, so make the + * jobid just be the hash of the nspace */ + OPAL_HASH_STR(nspace, *jobid); + } + /* add this to our jobid tracker */ + job = OBJ_NEW(opal_pmix1_jobid_trkr_t); + (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); + job->jobid = *jobid; + opal_list_append(&mca_pmix_ext114_component.jobids, &job->super); } PMIX_APP_FREE(papps, napps); @@ -964,7 +964,7 @@ int pmix1_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid) } static void spcbfunc(pmix_status_t status, - char *nspace, void *cbdata) + char *nspace, void *cbdata) { pmix1_opcaddy_t *op = (pmix1_opcaddy_t*)cbdata; int rc; @@ -973,20 +973,20 @@ static void spcbfunc(pmix_status_t status, rc = pmix1_convert_rc(status); if (PMIX_SUCCESS == status) { - if (mca_pmix_ext114_component.native_launch) { - /* if we were launched by the OMPI RTE, then - * the jobid is in a special format - so get it */ - opal_convert_string_to_jobid(&jobid, nspace); - } else { - /* we were launched by someone else, so make the - * jobid just be the hash of the nspace */ - OPAL_HASH_STR(nspace, jobid); - } - /* add this to our jobid tracker */ - job = OBJ_NEW(opal_pmix1_jobid_trkr_t); - (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); - job->jobid = jobid; - opal_list_append(&mca_pmix_ext114_component.jobids, &job->super); + if (mca_pmix_ext114_component.native_launch) { + /* if we were launched by the OMPI RTE, then + * the jobid is in a special format - so get it */ + opal_convert_string_to_jobid(&jobid, nspace); + } else { + /* we were launched by someone else, so make the + * jobid just be the hash of the nspace */ + OPAL_HASH_STR(nspace, jobid); + } + /* add this to our jobid tracker */ + job = OBJ_NEW(opal_pmix1_jobid_trkr_t); + (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); + job->jobid = jobid; + opal_list_append(&mca_pmix_ext114_component.jobids, &job->super); } op->spcbfunc(rc, jobid, op->cbdata); @@ -994,7 +994,7 @@ static void spcbfunc(pmix_status_t status, } int pmix1_spawnnb(opal_list_t *job_info, opal_list_t *apps, - opal_pmix_spawn_cbfunc_t cbfunc, void *cbdata) + opal_pmix_spawn_cbfunc_t cbfunc, void *cbdata) { pmix_status_t ret; pmix1_opcaddy_t *op; @@ -1008,34 +1008,34 @@ int pmix1_spawnnb(opal_list_t *job_info, opal_list_t *apps, op->cbdata = cbdata; if (NULL != job_info && 0 < (op->ninfo = opal_list_get_size(job_info))) { - PMIX_INFO_CREATE(op->info, op->ninfo); - n=0; - OPAL_LIST_FOREACH(info, job_info, opal_value_t) { - (void)strncpy(op->info[n].key, info->key, PMIX_MAX_KEYLEN); - pmix1_value_load(&op->info[n].value, info); - ++n; - } + PMIX_INFO_CREATE(op->info, op->ninfo); + n=0; + OPAL_LIST_FOREACH(info, job_info, opal_value_t) { + (void)strncpy(op->info[n].key, info->key, PMIX_MAX_KEYLEN); + pmix1_value_load(&op->info[n].value, info); + ++n; + } } op->sz = opal_list_get_size(apps); PMIX_APP_CREATE(op->apps, op->sz); n=0; OPAL_LIST_FOREACH(app, apps, opal_pmix_app_t) { - op->apps[n].cmd = strdup(app->cmd); - op->apps[n].argc = app->argc; - op->apps[n].argv = opal_argv_copy(app->argv); - op->apps[n].env = opal_argv_copy(app->env); - op->apps[n].maxprocs = app->maxprocs; - if (0 < (op->apps[n].ninfo = opal_list_get_size(&app->info))) { - PMIX_INFO_CREATE(op->apps[n].info, op->apps[n].ninfo); - m=0; - OPAL_LIST_FOREACH(info, &app->info, opal_value_t) { - (void)strncpy(op->apps[n].info[m].key, info->key, PMIX_MAX_KEYLEN); - pmix1_value_load(&op->apps[n].info[m].value, info); - ++m; - } - } - ++n; + op->apps[n].cmd = strdup(app->cmd); + op->apps[n].argc = app->argc; + op->apps[n].argv = opal_argv_copy(app->argv); + op->apps[n].env = opal_argv_copy(app->env); + op->apps[n].maxprocs = app->maxprocs; + if (0 < (op->apps[n].ninfo = opal_list_get_size(&app->info))) { + PMIX_INFO_CREATE(op->apps[n].info, op->apps[n].ninfo); + m=0; + OPAL_LIST_FOREACH(info, &app->info, opal_value_t) { + (void)strncpy(op->apps[n].info[m].key, info->key, PMIX_MAX_KEYLEN); + pmix1_value_load(&op->apps[n].info[m].value, info); + ++m; + } + } + ++n; } ret = PMIx_Spawn_nb(op->info, op->ninfo, op->apps, op->sz, spcbfunc, op); @@ -1053,7 +1053,7 @@ int pmix1_connect(opal_list_t *procs) /* protect against bozo error */ if (NULL == procs || 0 == (cnt = opal_list_get_size(procs))) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* convert the list of procs to an array @@ -1061,26 +1061,26 @@ int pmix1_connect(opal_list_t *procs) PMIX_PROC_CREATE(parray, cnt); n=0; OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (jptr->jobid == ptr->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND); - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - if (OPAL_VPID_WILDCARD == ptr->name.vpid) { - parray[n].rank = PMIX_RANK_WILDCARD; - } else { - parray[n].rank = ptr->name.vpid; - } - ++n; + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (jptr->jobid == ptr->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND); + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + if (OPAL_VPID_WILDCARD == ptr->name.vpid) { + parray[n].rank = PMIX_RANK_WILDCARD; + } else { + parray[n].rank = ptr->name.vpid; + } + ++n; } ret = PMIx_Connect(parray, cnt, NULL, 0); @@ -1090,8 +1090,8 @@ int pmix1_connect(opal_list_t *procs) } int pmix1_connectnb(opal_list_t *procs, - opal_pmix_op_cbfunc_t cbfunc, - void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, + void *cbdata) { pmix_status_t ret; size_t n, cnt=0; @@ -1101,7 +1101,7 @@ int pmix1_connectnb(opal_list_t *procs, /* protect against bozo error */ if (NULL == procs || 0 == (cnt = opal_list_get_size(procs))) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* create the caddy */ @@ -1115,20 +1115,20 @@ int pmix1_connectnb(opal_list_t *procs, PMIX_PROC_CREATE(op->procs, op->nprocs); n=0; OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - OPAL_LIST_FOREACH(job, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (job->jobid == ptr->name.jobid) { - (void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN); - break; - } - } - if (OPAL_VPID_WILDCARD == ptr->name.vpid) { - op->procs[n].rank = PMIX_RANK_WILDCARD; - } else { - op->procs[n].rank = ptr->name.vpid; - } - ++n; + /* look thru our list of jobids and find the + * corresponding nspace */ + OPAL_LIST_FOREACH(job, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (job->jobid == ptr->name.jobid) { + (void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN); + break; + } + } + if (OPAL_VPID_WILDCARD == ptr->name.vpid) { + op->procs[n].rank = PMIX_RANK_WILDCARD; + } else { + op->procs[n].rank = ptr->name.vpid; + } + ++n; } ret = PMIx_Connect_nb(op->procs, op->nprocs, NULL, 0, opcbfunc, op); @@ -1146,7 +1146,7 @@ int pmix1_disconnect(opal_list_t *procs) /* protect against bozo error */ if (NULL == procs || 0 == (cnt = opal_list_get_size(procs))) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* convert the list of procs to an array @@ -1154,20 +1154,20 @@ int pmix1_disconnect(opal_list_t *procs) PMIX_PROC_CREATE(parray, cnt); n=0; OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - OPAL_LIST_FOREACH(job, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (job->jobid == ptr->name.jobid) { - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - break; - } - } - if (OPAL_VPID_WILDCARD == ptr->name.vpid) { - parray[n].rank = PMIX_RANK_WILDCARD; - } else { - parray[n].rank = ptr->name.vpid; - } - ++n; + /* look thru our list of jobids and find the + * corresponding nspace */ + OPAL_LIST_FOREACH(job, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (job->jobid == ptr->name.jobid) { + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + break; + } + } + if (OPAL_VPID_WILDCARD == ptr->name.vpid) { + parray[n].rank = PMIX_RANK_WILDCARD; + } else { + parray[n].rank = ptr->name.vpid; + } + ++n; } ret = PMIx_Disconnect(parray, cnt, NULL, 0); @@ -1177,8 +1177,8 @@ int pmix1_disconnect(opal_list_t *procs) } int pmix1_disconnectnb(opal_list_t *procs, - opal_pmix_op_cbfunc_t cbfunc, - void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, + void *cbdata) { pmix_status_t ret; size_t n, cnt=0; @@ -1188,7 +1188,7 @@ int pmix1_disconnectnb(opal_list_t *procs, /* protect against bozo error */ if (NULL == procs || 0 == (cnt = opal_list_get_size(procs))) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* create the caddy */ @@ -1202,20 +1202,20 @@ int pmix1_disconnectnb(opal_list_t *procs, PMIX_PROC_CREATE(op->procs, op->nprocs); n=0; OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - OPAL_LIST_FOREACH(job, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (job->jobid == ptr->name.jobid) { - (void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN); - break; - } - } - if (OPAL_VPID_WILDCARD == ptr->name.vpid) { - op->procs[n].rank = PMIX_RANK_WILDCARD; - } else { - op->procs[n].rank = ptr->name.vpid; - } - ++n; + /* look thru our list of jobids and find the + * corresponding nspace */ + OPAL_LIST_FOREACH(job, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (job->jobid == ptr->name.jobid) { + (void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN); + break; + } + } + if (OPAL_VPID_WILDCARD == ptr->name.vpid) { + op->procs[n].rank = PMIX_RANK_WILDCARD; + } else { + op->procs[n].rank = ptr->name.vpid; + } + ++n; } ret = PMIx_Disconnect_nb(op->procs, op->nprocs, NULL, 0, opcbfunc, op); @@ -1225,7 +1225,7 @@ int pmix1_disconnectnb(opal_list_t *procs, int pmix1_resolve_peers(const char *nodename, opal_jobid_t jobid, - opal_list_t *procs) + opal_list_t *procs) { char *nspace; pmix_proc_t *array=NULL; @@ -1236,53 +1236,53 @@ int pmix1_resolve_peers(const char *nodename, opal_jobid_t jobid, opal_pmix1_jobid_trkr_t *job, *jptr; if (OPAL_JOBID_WILDCARD == jobid) { - nspace = NULL; + nspace = NULL; } else { - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (jptr->jobid == jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - nspace = job->nspace; + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (jptr->jobid == jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + nspace = job->nspace; } ret = PMIx_Resolve_peers(nodename, nspace, &array, &nprocs); rc = pmix1_convert_rc(ret); if (NULL != array && 0 < nprocs) { - for (n=0; n < nprocs; n++) { - nm = OBJ_NEW(opal_namelist_t); - opal_list_append(procs, &nm->super); - if (mca_pmix_ext114_component.native_launch) { - /* if we were launched by the OMPI RTE, then - * the jobid is in a special format - so get it */ - opal_convert_string_to_jobid(&nm->name.jobid, array[n].nspace); - } else { - /* we were launched by someone else, so make the - * jobid just be the hash of the nspace */ - OPAL_HASH_STR(array[n].nspace, nm->name.jobid); - } - /* if we don't already have it, add this to our jobid tracker */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (jptr->jobid == nm->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - job = OBJ_NEW(opal_pmix1_jobid_trkr_t); - (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); - job->jobid = jobid; - opal_list_append(&mca_pmix_ext114_component.jobids, &job->super); - } - nm->name.vpid = array[n].rank; - } + for (n=0; n < nprocs; n++) { + nm = OBJ_NEW(opal_namelist_t); + opal_list_append(procs, &nm->super); + if (mca_pmix_ext114_component.native_launch) { + /* if we were launched by the OMPI RTE, then + * the jobid is in a special format - so get it */ + opal_convert_string_to_jobid(&nm->name.jobid, array[n].nspace); + } else { + /* we were launched by someone else, so make the + * jobid just be the hash of the nspace */ + OPAL_HASH_STR(array[n].nspace, nm->name.jobid); + } + /* if we don't already have it, add this to our jobid tracker */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (jptr->jobid == nm->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + job = OBJ_NEW(opal_pmix1_jobid_trkr_t); + (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); + job->jobid = jobid; + opal_list_append(&mca_pmix_ext114_component.jobids, &job->super); + } + nm->name.vpid = array[n].rank; + } } PMIX_PROC_FREE(array, nprocs); @@ -1296,19 +1296,19 @@ int pmix1_resolve_nodes(opal_jobid_t jobid, char **nodelist) opal_pmix1_jobid_trkr_t *job, *jptr; if (OPAL_JOBID_WILDCARD != jobid) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { - if (jptr->jobid == jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - nspace = job->nspace; + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext114_component.jobids, opal_pmix1_jobid_trkr_t) { + if (jptr->jobid == jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + nspace = job->nspace; } ret = PMIx_Resolve_nodes(nspace, nodelist); diff --git a/opal/mca/pmix/ext20/pmix_ext20_client.c b/opal/mca/pmix/ext20/pmix_ext20_client.c index c2f9d2e8c2..d86da47b58 100644 --- a/opal/mca/pmix/ext20/pmix_ext20_client.c +++ b/opal/mca/pmix/ext20/pmix_ext20_client.c @@ -40,20 +40,20 @@ static size_t errhdler_ref = 0; #define PMIX_WAIT_FOR_COMPLETION(a) \ do { \ - while ((a)) { \ - usleep(10); \ - } \ + while ((a)) { \ + usleep(10); \ + } \ } while (0) static void errreg_cbfunc (pmix_status_t status, - size_t errhandler_ref, - void *cbdata) + size_t errhandler_ref, + void *cbdata) { errhdler_ref = errhandler_ref; opal_output_verbose(5, opal_pmix_base_framework.framework_output, - "PMIX client errreg_cbfunc - error handler registered status=%d, reference=%lu", - status, (unsigned long)errhandler_ref); + "PMIX client errreg_cbfunc - error handler registered status=%d, reference=%lu", + status, (unsigned long)errhandler_ref); } int ext20_client_init(void) @@ -64,28 +64,28 @@ int ext20_client_init(void) opal_ext20_jobid_trkr_t *job; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client init"); + "PMIx_client init"); if (0 < (dbg = opal_output_get_verbosity(opal_pmix_base_framework.framework_output))) { - asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg); - putenv(dbgvalue); + asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg); + putenv(dbgvalue); } rc = PMIx_Init(&my_proc, NULL, 0); if (PMIX_SUCCESS != rc) { - return ext20_convert_rc(rc); + return ext20_convert_rc(rc); } /* store our jobid and rank */ - if (NULL != getenv(OPAL_MCA_PREFIX"orte_launch")) { - /* if we were launched by the OMPI RTE, then - * the jobid is in a special format - so get it */ - mca_pmix_ext20_component.native_launch = true; - opal_convert_string_to_jobid(&pname.jobid, my_proc.nspace); + if (NULL != getenv(OPAL_MCA_PREFIX"orte_launch")) { + /* if we were launched by the OMPI RTE, then + * the jobid is in a special format - so get it */ + mca_pmix_ext20_component.native_launch = true; + opal_convert_string_to_jobid(&pname.jobid, my_proc.nspace); } else { - /* we were launched by someone else, so make the - * jobid just be the hash of the nspace */ - OPAL_HASH_STR(my_proc.nspace, pname.jobid); + /* we were launched by someone else, so make the + * jobid just be the hash of the nspace */ + OPAL_HASH_STR(my_proc.nspace, pname.jobid); } /* insert this into our list of jobids - it will be the * first, and so we'll check it first */ @@ -108,7 +108,7 @@ int ext20_client_finalize(void) pmix_status_t rc; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client finalize"); + "PMIx_client finalize"); /* deregister the default event handler */ PMIx_Deregister_event_handler(errhdler_ref, NULL, NULL); @@ -120,13 +120,13 @@ int ext20_client_finalize(void) int ext20_initialized(void) { opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client initialized"); + "PMIx_client initialized"); return PMIx_Initialized(); } int ext20_abort(int flag, const char *msg, - opal_list_t *procs) + opal_list_t *procs) { pmix_status_t rc; pmix_proc_t *parray=NULL; @@ -135,31 +135,31 @@ int ext20_abort(int flag, const char *msg, opal_ext20_jobid_trkr_t *job, *jptr; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client abort"); + "PMIx_client abort"); /* convert the list of procs to an array * of pmix_proc_t */ if (NULL != procs && 0 < (cnt = opal_list_get_size(procs))) { - PMIX_PROC_CREATE(parray, cnt); - n=0; - OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { - if (jptr->jobid == ptr->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - PMIX_PROC_FREE(parray, cnt); - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - parray[n].rank = ext20_convert_opalrank(ptr->name.vpid); - ++n; - } + PMIX_PROC_CREATE(parray, cnt); + n=0; + OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { + if (jptr->jobid == ptr->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + PMIX_PROC_FREE(parray, cnt); + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + parray[n].rank = ext20_convert_opalrank(ptr->name.vpid); + ++n; + } } /* call the library abort */ @@ -182,25 +182,25 @@ int ext20_store_local(const opal_process_name_t *proc, opal_value_t *val) * and we are going to access framework-global lists/objects */ if (NULL != proc) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { - if (jptr->jobid == proc->jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND); - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(p.nspace, job->nspace, PMIX_MAX_NSLEN); - p.rank = ext20_convert_opalrank(proc->vpid); + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { + if (jptr->jobid == proc->jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND); + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(p.nspace, job->nspace, PMIX_MAX_NSLEN); + p.rank = ext20_convert_opalrank(proc->vpid); } else { - /* use our name */ - (void)strncpy(p.nspace, my_proc.nspace, PMIX_MAX_NSLEN); - p.rank = ext20_convert_opalrank(OPAL_PROC_MY_NAME.vpid); + /* use our name */ + (void)strncpy(p.nspace, my_proc.nspace, PMIX_MAX_NSLEN); + p.rank = ext20_convert_opalrank(OPAL_PROC_MY_NAME.vpid); } PMIX_VALUE_CONSTRUCT(&kv); @@ -225,7 +225,7 @@ static void opcbfunc(pmix_status_t status, void *cbdata) ext20_opcaddy_t *op = (ext20_opcaddy_t*)cbdata; if (NULL != op->opcbfunc) { - op->opcbfunc(ext20_convert_rc(status), op->cbdata); + op->opcbfunc(ext20_convert_rc(status), op->cbdata); } OBJ_RELEASE(op); } @@ -240,41 +240,41 @@ int ext20_fence(opal_list_t *procs, int collect_data) opal_ext20_jobid_trkr_t *job, *jptr; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client fence"); + "PMIx_client fence"); /* convert the list of procs to an array * of pmix_proc_t */ if (NULL != procs && 0 < (cnt = opal_list_get_size(procs))) { - PMIX_PROC_CREATE(parray, cnt); - n=0; - OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { - if (jptr->jobid == ptr->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - parray[n].rank = ext20_convert_opalrank(ptr->name.vpid); - ++n; - } + PMIX_PROC_CREATE(parray, cnt); + n=0; + OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { + if (jptr->jobid == ptr->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + parray[n].rank = ext20_convert_opalrank(ptr->name.vpid); + ++n; + } } if (collect_data) { - PMIX_INFO_CONSTRUCT(&info); - (void)strncpy(info.key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN); - info.value.type = PMIX_BOOL; - info.value.data.flag = true; - iptr = &info; - n = 1; + PMIX_INFO_CONSTRUCT(&info); + (void)strncpy(info.key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN); + info.value.type = PMIX_BOOL; + info.value.data.flag = true; + iptr = &info; + n = 1; } else { - iptr = NULL; - n = 0; + iptr = NULL; + n = 0; } /* call the library function */ @@ -283,7 +283,7 @@ int ext20_fence(opal_list_t *procs, int collect_data) /* release the array */ PMIX_PROC_FREE(parray, cnt); if (NULL != iptr) { - PMIX_INFO_DESTRUCT(&info); + PMIX_INFO_DESTRUCT(&info); } return ext20_convert_rc(rc); @@ -291,7 +291,7 @@ int ext20_fence(opal_list_t *procs, int collect_data) } int ext20_fencenb(opal_list_t *procs, int collect_data, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, void *cbdata) { pmix_status_t rc; pmix_proc_t *parray=NULL; @@ -305,43 +305,43 @@ int ext20_fencenb(opal_list_t *procs, int collect_data, * and we are going to access framework-global lists/objects */ opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client fence_nb"); + "PMIx_client fence_nb"); /* convert the list of procs to an array * of pmix_proc_t */ if (NULL != procs && 0 < (cnt = opal_list_get_size(procs))) { - PMIX_PROC_CREATE(parray, cnt); - n=0; - OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { - if (jptr->jobid == ptr->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - PMIX_PROC_FREE(parray, cnt); - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - parray[n].rank = ext20_convert_opalrank(ptr->name.vpid); - ++n; - } + PMIX_PROC_CREATE(parray, cnt); + n=0; + OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { + if (jptr->jobid == ptr->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + PMIX_PROC_FREE(parray, cnt); + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + parray[n].rank = ext20_convert_opalrank(ptr->name.vpid); + ++n; + } } if (collect_data) { - PMIX_INFO_CONSTRUCT(&info); - (void)strncpy(info.key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN); - info.value.type = PMIX_BOOL; - info.value.data.flag = true; - iptr = &info; - n = 1; + PMIX_INFO_CONSTRUCT(&info); + (void)strncpy(info.key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN); + info.value.type = PMIX_BOOL; + info.value.data.flag = true; + iptr = &info; + n = 1; } else { - iptr = NULL; - n = 0; + iptr = NULL; + n = 0; } /* create the caddy */ @@ -354,7 +354,7 @@ int ext20_fencenb(opal_list_t *procs, int collect_data, /* call the library function */ rc = PMIx_Fence_nb(parray, cnt, iptr, n, opcbfunc, op); if (PMIX_SUCCESS != rc) { - OBJ_RELEASE(op); + OBJ_RELEASE(op); } return ext20_convert_rc(rc); @@ -362,14 +362,14 @@ int ext20_fencenb(opal_list_t *procs, int collect_data, } int ext20_put(opal_pmix_scope_t opal_scope, - opal_value_t *val) + opal_value_t *val) { pmix_value_t kv; pmix_scope_t pmix_scope = ext20_convert_opalscope(opal_scope); pmix_status_t rc; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client put"); + "PMIx_client put"); PMIX_VALUE_CONSTRUCT(&kv); ext20_value_load(&kv, val); @@ -380,7 +380,7 @@ int ext20_put(opal_pmix_scope_t opal_scope, } int ext20_get(const opal_process_name_t *proc, const char *key, - opal_list_t *info, opal_value_t **val) + opal_list_t *info, opal_value_t **val) { int ret; pmix_value_t *kv; @@ -485,8 +485,8 @@ static void val_cbfunc(pmix_status_t status, } int ext20_getnb(const opal_process_name_t *proc, const char *key, - opal_list_t *info, - opal_pmix_value_cbfunc_t cbfunc, void *cbdata) + opal_list_t *info, + opal_pmix_value_cbfunc_t cbfunc, void *cbdata) { ext20_opcaddy_t *op; pmix_status_t rc; @@ -582,7 +582,7 @@ int ext20_publish(opal_list_t *info) } int ext20_publishnb(opal_list_t *info, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, void *cbdata) { pmix_status_t ret; opal_value_t *iptr; @@ -683,7 +683,7 @@ int ext20_lookup(opal_list_t *data, opal_list_t *info) } } if (NULL == job) { - job = OBJ_NEW(opal_ext20_jobid_trkr_t); + job = OBJ_NEW(opal_ext20_jobid_trkr_t); (void)strncpy(job->nspace, pdata[n].proc.nspace, PMIX_MAX_NSLEN); job->jobid = d->proc.jobid; opal_list_append(&mca_pmix_ext20_component.jobids, &job->super); @@ -713,11 +713,11 @@ static void lk_cbfunc(pmix_status_t status, size_t n; opal_ext20_jobid_trkr_t *job, *jptr; - /* this is in the PMIx local thread - need to threadshift to - * our own thread as we will be accessing framework-global - * lists and objects */ + /* this is in the PMIx local thread - need to threadshift to + * our own thread as we will be accessing framework-global + * lists and objects */ - if (NULL == op->lkcbfunc) { + if (NULL == op->lkcbfunc) { OBJ_RELEASE(op); return; } @@ -762,7 +762,7 @@ static void lk_cbfunc(pmix_status_t status, } r = &results; } - release: +release: /* execute the callback */ op->lkcbfunc(rc, r, op->cbdata); @@ -773,7 +773,7 @@ static void lk_cbfunc(pmix_status_t status, } int ext20_lookupnb(char **keys, opal_list_t *info, - opal_pmix_lookup_cbfunc_t cbfunc, void *cbdata) + opal_pmix_lookup_cbfunc_t cbfunc, void *cbdata) { pmix_status_t ret; ext20_opcaddy_t *op; @@ -835,7 +835,7 @@ int ext20_unpublish(char **keys, opal_list_t *info) } int ext20_unpublishnb(char **keys, opal_list_t *info, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, void *cbdata) { pmix_status_t ret; ext20_opcaddy_t *op; @@ -930,7 +930,7 @@ int ext20_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid) } static void spcbfunc(pmix_status_t status, - char *nspace, void *cbdata) + char *nspace, void *cbdata) { ext20_opcaddy_t *op = (ext20_opcaddy_t*)cbdata; int rc; @@ -943,20 +943,20 @@ static void spcbfunc(pmix_status_t status, rc = ext20_convert_rc(status); if (PMIX_SUCCESS == status) { - if (mca_pmix_ext20_component.native_launch) { - /* if we were launched by the OMPI RTE, then - * the jobid is in a special format - so get it */ - opal_convert_string_to_jobid(&jobid, nspace); - } else { - /* we were launched by someone else, so make the - * jobid just be the hash of the nspace */ - OPAL_HASH_STR(nspace, jobid); - } - /* add this to our jobid tracker */ - job = OBJ_NEW(opal_ext20_jobid_trkr_t); - (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); - job->jobid = jobid; - opal_list_append(&mca_pmix_ext20_component.jobids, &job->super); + if (mca_pmix_ext20_component.native_launch) { + /* if we were launched by the OMPI RTE, then + * the jobid is in a special format - so get it */ + opal_convert_string_to_jobid(&jobid, nspace); + } else { + /* we were launched by someone else, so make the + * jobid just be the hash of the nspace */ + OPAL_HASH_STR(nspace, jobid); + } + /* add this to our jobid tracker */ + job = OBJ_NEW(opal_ext20_jobid_trkr_t); + (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); + job->jobid = jobid; + opal_list_append(&mca_pmix_ext20_component.jobids, &job->super); } op->spcbfunc(rc, jobid, op->cbdata); @@ -964,7 +964,7 @@ static void spcbfunc(pmix_status_t status, } int ext20_spawnnb(opal_list_t *job_info, opal_list_t *apps, - opal_pmix_spawn_cbfunc_t cbfunc, void *cbdata) + opal_pmix_spawn_cbfunc_t cbfunc, void *cbdata) { pmix_status_t ret; ext20_opcaddy_t *op; @@ -978,34 +978,34 @@ int ext20_spawnnb(opal_list_t *job_info, opal_list_t *apps, op->cbdata = cbdata; if (NULL != job_info && 0 < (op->ninfo = opal_list_get_size(job_info))) { - PMIX_INFO_CREATE(op->info, op->ninfo); - n=0; - OPAL_LIST_FOREACH(info, job_info, opal_value_t) { - (void)strncpy(op->info[n].key, info->key, PMIX_MAX_KEYLEN); - ext20_value_load(&op->info[n].value, info); - ++n; - } + PMIX_INFO_CREATE(op->info, op->ninfo); + n=0; + OPAL_LIST_FOREACH(info, job_info, opal_value_t) { + (void)strncpy(op->info[n].key, info->key, PMIX_MAX_KEYLEN); + ext20_value_load(&op->info[n].value, info); + ++n; + } } op->sz = opal_list_get_size(apps); PMIX_APP_CREATE(op->apps, op->sz); n=0; OPAL_LIST_FOREACH(app, apps, opal_pmix_app_t) { - op->apps[n].cmd = strdup(app->cmd); - op->apps[n].argc = app->argc; - op->apps[n].argv = opal_argv_copy(app->argv); - op->apps[n].env = opal_argv_copy(app->env); - op->apps[n].maxprocs = app->maxprocs; - if (0 < (op->apps[n].ninfo = opal_list_get_size(&app->info))) { - PMIX_INFO_CREATE(op->apps[n].info, op->apps[n].ninfo); - m=0; - OPAL_LIST_FOREACH(info, &app->info, opal_value_t) { - (void)strncpy(op->apps[n].info[m].key, info->key, PMIX_MAX_KEYLEN); - ext20_value_load(&op->apps[n].info[m].value, info); - ++m; - } - } - ++n; + op->apps[n].cmd = strdup(app->cmd); + op->apps[n].argc = app->argc; + op->apps[n].argv = opal_argv_copy(app->argv); + op->apps[n].env = opal_argv_copy(app->env); + op->apps[n].maxprocs = app->maxprocs; + if (0 < (op->apps[n].ninfo = opal_list_get_size(&app->info))) { + PMIX_INFO_CREATE(op->apps[n].info, op->apps[n].ninfo); + m=0; + OPAL_LIST_FOREACH(info, &app->info, opal_value_t) { + (void)strncpy(op->apps[n].info[m].key, info->key, PMIX_MAX_KEYLEN); + ext20_value_load(&op->apps[n].info[m].value, info); + ++m; + } + } + ++n; } ret = PMIx_Spawn_nb(op->info, op->ninfo, op->apps, op->sz, spcbfunc, op); @@ -1023,7 +1023,7 @@ int ext20_connect(opal_list_t *procs) /* protect against bozo error */ if (NULL == procs || 0 == (cnt = opal_list_get_size(procs))) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* convert the list of procs to an array @@ -1031,23 +1031,23 @@ int ext20_connect(opal_list_t *procs) PMIX_PROC_CREATE(parray, cnt); n=0; OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { - if (jptr->jobid == ptr->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND); - PMIX_PROC_FREE(parray, cnt); - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { + if (jptr->jobid == ptr->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND); + PMIX_PROC_FREE(parray, cnt); + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); parray[n].rank = ext20_convert_opalrank(ptr->name.vpid); - ++n; + ++n; } ret = PMIx_Connect(parray, cnt, NULL, 0); @@ -1057,8 +1057,8 @@ int ext20_connect(opal_list_t *procs) } int ext20_connectnb(opal_list_t *procs, - opal_pmix_op_cbfunc_t cbfunc, - void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, + void *cbdata) { pmix_status_t ret; size_t n, cnt=0; @@ -1071,7 +1071,7 @@ int ext20_connectnb(opal_list_t *procs, /* protect against bozo error */ if (NULL == procs || 0 == (cnt = opal_list_get_size(procs))) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* create the caddy */ @@ -1085,16 +1085,16 @@ int ext20_connectnb(opal_list_t *procs, PMIX_PROC_CREATE(op->procs, op->nprocs); n=0; OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - OPAL_LIST_FOREACH(job, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { - if (job->jobid == ptr->name.jobid) { - (void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN); - break; - } - } + /* look thru our list of jobids and find the + * corresponding nspace */ + OPAL_LIST_FOREACH(job, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { + if (job->jobid == ptr->name.jobid) { + (void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN); + break; + } + } op->procs[n].rank = ext20_convert_opalrank(ptr->name.vpid); - ++n; + ++n; } ret = PMIx_Connect_nb(op->procs, op->nprocs, NULL, 0, opcbfunc, op); @@ -1112,7 +1112,7 @@ int ext20_disconnect(opal_list_t *procs) /* protect against bozo error */ if (NULL == procs || 0 == (cnt = opal_list_get_size(procs))) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* convert the list of procs to an array @@ -1120,16 +1120,16 @@ int ext20_disconnect(opal_list_t *procs) PMIX_PROC_CREATE(parray, cnt); n=0; OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - OPAL_LIST_FOREACH(job, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { - if (job->jobid == ptr->name.jobid) { - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - break; - } - } + /* look thru our list of jobids and find the + * corresponding nspace */ + OPAL_LIST_FOREACH(job, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { + if (job->jobid == ptr->name.jobid) { + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + break; + } + } parray[n].rank = ext20_convert_opalrank(ptr->name.vpid); - ++n; + ++n; } ret = PMIx_Disconnect(parray, cnt, NULL, 0); @@ -1139,8 +1139,8 @@ int ext20_disconnect(opal_list_t *procs) } int ext20_disconnectnb(opal_list_t *procs, - opal_pmix_op_cbfunc_t cbfunc, - void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, + void *cbdata) { pmix_status_t ret; size_t n, cnt=0; @@ -1153,7 +1153,7 @@ int ext20_disconnectnb(opal_list_t *procs, /* protect against bozo error */ if (NULL == procs || 0 == (cnt = opal_list_get_size(procs))) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* create the caddy */ @@ -1167,16 +1167,16 @@ int ext20_disconnectnb(opal_list_t *procs, PMIX_PROC_CREATE(op->procs, op->nprocs); n=0; OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - OPAL_LIST_FOREACH(job, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { - if (job->jobid == ptr->name.jobid) { - (void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN); - break; - } - } + /* look thru our list of jobids and find the + * corresponding nspace */ + OPAL_LIST_FOREACH(job, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { + if (job->jobid == ptr->name.jobid) { + (void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN); + break; + } + } op->procs[n].rank = ext20_convert_opalrank(ptr->name.vpid); - ++n; + ++n; } ret = PMIx_Disconnect_nb(op->procs, op->nprocs, NULL, 0, opcbfunc, op); @@ -1186,7 +1186,7 @@ int ext20_disconnectnb(opal_list_t *procs, int ext20_resolve_peers(const char *nodename, opal_jobid_t jobid, - opal_list_t *procs) + opal_list_t *procs) { char *nspace; pmix_proc_t *array=NULL; @@ -1200,53 +1200,53 @@ int ext20_resolve_peers(const char *nodename, opal_jobid_t jobid, * and we are going to access framework-global lists/objects */ if (OPAL_JOBID_WILDCARD == jobid) { - nspace = NULL; + nspace = NULL; } else { - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { - if (jptr->jobid == jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - nspace = job->nspace; + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { + if (jptr->jobid == jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + nspace = job->nspace; } ret = PMIx_Resolve_peers(nodename, nspace, &array, &nprocs); rc = ext20_convert_rc(ret); if (NULL != array && 0 < nprocs) { - for (n=0; n < nprocs; n++) { - nm = OBJ_NEW(opal_namelist_t); - opal_list_append(procs, &nm->super); - if (mca_pmix_ext20_component.native_launch) { - /* if we were launched by the OMPI RTE, then - * the jobid is in a special format - so get it */ - opal_convert_string_to_jobid(&nm->name.jobid, array[n].nspace); - } else { - /* we were launched by someone else, so make the - * jobid just be the hash of the nspace */ - OPAL_HASH_STR(array[n].nspace, nm->name.jobid); - } - /* if we don't already have it, add this to our jobid tracker */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { - if (jptr->jobid == nm->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - job = OBJ_NEW(opal_ext20_jobid_trkr_t); - (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); - job->jobid = jobid; - opal_list_append(&mca_pmix_ext20_component.jobids, &job->super); - } - nm->name.vpid = ext20_convert_rank(array[n].rank); - } + for (n=0; n < nprocs; n++) { + nm = OBJ_NEW(opal_namelist_t); + opal_list_append(procs, &nm->super); + if (mca_pmix_ext20_component.native_launch) { + /* if we were launched by the OMPI RTE, then + * the jobid is in a special format - so get it */ + opal_convert_string_to_jobid(&nm->name.jobid, array[n].nspace); + } else { + /* we were launched by someone else, so make the + * jobid just be the hash of the nspace */ + OPAL_HASH_STR(array[n].nspace, nm->name.jobid); + } + /* if we don't already have it, add this to our jobid tracker */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { + if (jptr->jobid == nm->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + job = OBJ_NEW(opal_ext20_jobid_trkr_t); + (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); + job->jobid = jobid; + opal_list_append(&mca_pmix_ext20_component.jobids, &job->super); + } + nm->name.vpid = ext20_convert_rank(array[n].rank); + } } PMIX_PROC_FREE(array, nprocs); @@ -1263,19 +1263,19 @@ int ext20_resolve_nodes(opal_jobid_t jobid, char **nodelist) * and we are going to access framework-global lists/objects */ if (OPAL_JOBID_WILDCARD != jobid) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { - if (jptr->jobid == jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - nspace = job->nspace; + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_ext20_component.jobids, opal_ext20_jobid_trkr_t) { + if (jptr->jobid == jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + nspace = job->nspace; } ret = PMIx_Resolve_nodes(nspace, nodelist); diff --git a/opal/mca/pmix/pmix2x/pmix2x_client.c b/opal/mca/pmix/pmix2x/pmix2x_client.c index 5ed362bad4..95f38204dc 100644 --- a/opal/mca/pmix/pmix2x/pmix2x_client.c +++ b/opal/mca/pmix/pmix2x/pmix2x_client.c @@ -40,20 +40,20 @@ static size_t errhdler_ref = 0; #define PMIX_WAIT_FOR_COMPLETION(a) \ do { \ - while ((a)) { \ - usleep(10); \ - } \ + while ((a)) { \ + usleep(10); \ + } \ } while (0) static void errreg_cbfunc (pmix_status_t status, - size_t errhandler_ref, - void *cbdata) + size_t errhandler_ref, + void *cbdata) { errhdler_ref = errhandler_ref; opal_output_verbose(5, opal_pmix_base_framework.framework_output, - "PMIX client errreg_cbfunc - error handler registered status=%d, reference=%lu", - status, (unsigned long)errhandler_ref); + "PMIX client errreg_cbfunc - error handler registered status=%d, reference=%lu", + status, (unsigned long)errhandler_ref); } int pmix2x_client_init(void) @@ -64,28 +64,28 @@ int pmix2x_client_init(void) opal_pmix2x_jobid_trkr_t *job; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client init"); + "PMIx_client init"); if (0 < (dbg = opal_output_get_verbosity(opal_pmix_base_framework.framework_output))) { - asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg); - putenv(dbgvalue); + asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg); + putenv(dbgvalue); } rc = PMIx_Init(&my_proc, NULL, 0); if (PMIX_SUCCESS != rc) { - return pmix2x_convert_rc(rc); + return pmix2x_convert_rc(rc); } /* store our jobid and rank */ - if (NULL != getenv(OPAL_MCA_PREFIX"orte_launch")) { - /* if we were launched by the OMPI RTE, then - * the jobid is in a special format - so get it */ - mca_pmix_pmix2x_component.native_launch = true; - opal_convert_string_to_jobid(&pname.jobid, my_proc.nspace); + if (NULL != getenv(OPAL_MCA_PREFIX"orte_launch")) { + /* if we were launched by the OMPI RTE, then + * the jobid is in a special format - so get it */ + mca_pmix_pmix2x_component.native_launch = true; + opal_convert_string_to_jobid(&pname.jobid, my_proc.nspace); } else { - /* we were launched by someone else, so make the - * jobid just be the hash of the nspace */ - OPAL_HASH_STR(my_proc.nspace, pname.jobid); + /* we were launched by someone else, so make the + * jobid just be the hash of the nspace */ + OPAL_HASH_STR(my_proc.nspace, pname.jobid); } /* insert this into our list of jobids - it will be the * first, and so we'll check it first */ @@ -108,7 +108,7 @@ int pmix2x_client_finalize(void) pmix_status_t rc; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client finalize"); + "PMIx_client finalize"); /* deregister the default event handler */ PMIx_Deregister_event_handler(errhdler_ref, NULL, NULL); @@ -120,13 +120,13 @@ int pmix2x_client_finalize(void) int pmix2x_initialized(void) { opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client initialized"); + "PMIx_client initialized"); return PMIx_Initialized(); } int pmix2x_abort(int flag, const char *msg, - opal_list_t *procs) + opal_list_t *procs) { pmix_status_t rc; pmix_proc_t *parray=NULL; @@ -135,31 +135,31 @@ int pmix2x_abort(int flag, const char *msg, opal_pmix2x_jobid_trkr_t *job, *jptr; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client abort"); + "PMIx_client abort"); /* convert the list of procs to an array * of pmix_proc_t */ if (NULL != procs && 0 < (cnt = opal_list_get_size(procs))) { - PMIX_PROC_CREATE(parray, cnt); - n=0; - OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { - if (jptr->jobid == ptr->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - PMIX_PROC_FREE(parray, cnt); - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - parray[n].rank = pmix2x_convert_opalrank(ptr->name.vpid); - ++n; - } + PMIX_PROC_CREATE(parray, cnt); + n=0; + OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { + if (jptr->jobid == ptr->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + PMIX_PROC_FREE(parray, cnt); + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + parray[n].rank = pmix2x_convert_opalrank(ptr->name.vpid); + ++n; + } } /* call the library abort */ @@ -182,25 +182,25 @@ int pmix2x_store_local(const opal_process_name_t *proc, opal_value_t *val) * and we are going to access framework-global lists/objects */ if (NULL != proc) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { - if (jptr->jobid == proc->jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND); - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(p.nspace, job->nspace, PMIX_MAX_NSLEN); - p.rank = pmix2x_convert_opalrank(proc->vpid); + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { + if (jptr->jobid == proc->jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND); + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(p.nspace, job->nspace, PMIX_MAX_NSLEN); + p.rank = pmix2x_convert_opalrank(proc->vpid); } else { - /* use our name */ - (void)strncpy(p.nspace, my_proc.nspace, PMIX_MAX_NSLEN); - p.rank = pmix2x_convert_opalrank(OPAL_PROC_MY_NAME.vpid); + /* use our name */ + (void)strncpy(p.nspace, my_proc.nspace, PMIX_MAX_NSLEN); + p.rank = pmix2x_convert_opalrank(OPAL_PROC_MY_NAME.vpid); } PMIX_VALUE_CONSTRUCT(&kv); @@ -225,7 +225,7 @@ static void opcbfunc(pmix_status_t status, void *cbdata) pmix2x_opcaddy_t *op = (pmix2x_opcaddy_t*)cbdata; if (NULL != op->opcbfunc) { - op->opcbfunc(pmix2x_convert_rc(status), op->cbdata); + op->opcbfunc(pmix2x_convert_rc(status), op->cbdata); } OBJ_RELEASE(op); } @@ -240,41 +240,41 @@ int pmix2x_fence(opal_list_t *procs, int collect_data) opal_pmix2x_jobid_trkr_t *job, *jptr; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client fence"); + "PMIx_client fence"); /* convert the list of procs to an array * of pmix_proc_t */ if (NULL != procs && 0 < (cnt = opal_list_get_size(procs))) { - PMIX_PROC_CREATE(parray, cnt); - n=0; - OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { - if (jptr->jobid == ptr->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - parray[n].rank = pmix2x_convert_opalrank(ptr->name.vpid); - ++n; - } + PMIX_PROC_CREATE(parray, cnt); + n=0; + OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { + if (jptr->jobid == ptr->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + parray[n].rank = pmix2x_convert_opalrank(ptr->name.vpid); + ++n; + } } if (collect_data) { - PMIX_INFO_CONSTRUCT(&info); - (void)strncpy(info.key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN); - info.value.type = PMIX_BOOL; - info.value.data.flag = true; - iptr = &info; - n = 1; + PMIX_INFO_CONSTRUCT(&info); + (void)strncpy(info.key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN); + info.value.type = PMIX_BOOL; + info.value.data.flag = true; + iptr = &info; + n = 1; } else { - iptr = NULL; - n = 0; + iptr = NULL; + n = 0; } /* call the library function */ @@ -283,7 +283,7 @@ int pmix2x_fence(opal_list_t *procs, int collect_data) /* release the array */ PMIX_PROC_FREE(parray, cnt); if (NULL != iptr) { - PMIX_INFO_DESTRUCT(&info); + PMIX_INFO_DESTRUCT(&info); } return pmix2x_convert_rc(rc); @@ -291,7 +291,7 @@ int pmix2x_fence(opal_list_t *procs, int collect_data) } int pmix2x_fencenb(opal_list_t *procs, int collect_data, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, void *cbdata) { pmix_status_t rc; pmix_proc_t *parray=NULL; @@ -305,43 +305,43 @@ int pmix2x_fencenb(opal_list_t *procs, int collect_data, * and we are going to access framework-global lists/objects */ opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client fence_nb"); + "PMIx_client fence_nb"); /* convert the list of procs to an array * of pmix_proc_t */ if (NULL != procs && 0 < (cnt = opal_list_get_size(procs))) { - PMIX_PROC_CREATE(parray, cnt); - n=0; - OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { - if (jptr->jobid == ptr->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - PMIX_PROC_FREE(parray, cnt); - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - parray[n].rank = pmix2x_convert_opalrank(ptr->name.vpid); - ++n; - } + PMIX_PROC_CREATE(parray, cnt); + n=0; + OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { + if (jptr->jobid == ptr->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + PMIX_PROC_FREE(parray, cnt); + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + parray[n].rank = pmix2x_convert_opalrank(ptr->name.vpid); + ++n; + } } if (collect_data) { - PMIX_INFO_CONSTRUCT(&info); - (void)strncpy(info.key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN); - info.value.type = PMIX_BOOL; - info.value.data.flag = true; - iptr = &info; - n = 1; + PMIX_INFO_CONSTRUCT(&info); + (void)strncpy(info.key, PMIX_COLLECT_DATA, PMIX_MAX_KEYLEN); + info.value.type = PMIX_BOOL; + info.value.data.flag = true; + iptr = &info; + n = 1; } else { - iptr = NULL; - n = 0; + iptr = NULL; + n = 0; } /* create the caddy */ @@ -354,7 +354,7 @@ int pmix2x_fencenb(opal_list_t *procs, int collect_data, /* call the library function */ rc = PMIx_Fence_nb(parray, cnt, iptr, n, opcbfunc, op); if (PMIX_SUCCESS != rc) { - OBJ_RELEASE(op); + OBJ_RELEASE(op); } return pmix2x_convert_rc(rc); @@ -362,14 +362,14 @@ int pmix2x_fencenb(opal_list_t *procs, int collect_data, } int pmix2x_put(opal_pmix_scope_t opal_scope, - opal_value_t *val) + opal_value_t *val) { pmix_value_t kv; pmix_scope_t pmix_scope = pmix2x_convert_opalscope(opal_scope); pmix_status_t rc; opal_output_verbose(1, opal_pmix_base_framework.framework_output, - "PMIx_client put"); + "PMIx_client put"); PMIX_VALUE_CONSTRUCT(&kv); pmix2x_value_load(&kv, val); @@ -683,7 +683,7 @@ int pmix2x_lookup(opal_list_t *data, opal_list_t *info) } } if (NULL == job) { - job = OBJ_NEW(opal_pmix2x_jobid_trkr_t); + job = OBJ_NEW(opal_pmix2x_jobid_trkr_t); (void)strncpy(job->nspace, pdata[n].proc.nspace, PMIX_MAX_NSLEN); job->jobid = d->proc.jobid; opal_list_append(&mca_pmix_pmix2x_component.jobids, &job->super); @@ -713,11 +713,11 @@ static void lk_cbfunc(pmix_status_t status, size_t n; opal_pmix2x_jobid_trkr_t *job, *jptr; - /* this is in the PMIx local thread - need to threadshift to - * our own thread as we will be accessing framework-global - * lists and objects */ + /* this is in the PMIx local thread - need to threadshift to + * our own thread as we will be accessing framework-global + * lists and objects */ - if (NULL == op->lkcbfunc) { + if (NULL == op->lkcbfunc) { OBJ_RELEASE(op); return; } @@ -762,7 +762,7 @@ static void lk_cbfunc(pmix_status_t status, } r = &results; } - release: +release: /* execute the callback */ op->lkcbfunc(rc, r, op->cbdata); @@ -930,7 +930,7 @@ int pmix2x_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid) } static void spcbfunc(pmix_status_t status, - char *nspace, void *cbdata) + char *nspace, void *cbdata) { pmix2x_opcaddy_t *op = (pmix2x_opcaddy_t*)cbdata; int rc; @@ -943,20 +943,20 @@ static void spcbfunc(pmix_status_t status, rc = pmix2x_convert_rc(status); if (PMIX_SUCCESS == status) { - if (mca_pmix_pmix2x_component.native_launch) { - /* if we were launched by the OMPI RTE, then - * the jobid is in a special format - so get it */ - opal_convert_string_to_jobid(&jobid, nspace); - } else { - /* we were launched by someone else, so make the - * jobid just be the hash of the nspace */ - OPAL_HASH_STR(nspace, jobid); - } - /* add this to our jobid tracker */ - job = OBJ_NEW(opal_pmix2x_jobid_trkr_t); - (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); - job->jobid = jobid; - opal_list_append(&mca_pmix_pmix2x_component.jobids, &job->super); + if (mca_pmix_pmix2x_component.native_launch) { + /* if we were launched by the OMPI RTE, then + * the jobid is in a special format - so get it */ + opal_convert_string_to_jobid(&jobid, nspace); + } else { + /* we were launched by someone else, so make the + * jobid just be the hash of the nspace */ + OPAL_HASH_STR(nspace, jobid); + } + /* add this to our jobid tracker */ + job = OBJ_NEW(opal_pmix2x_jobid_trkr_t); + (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); + job->jobid = jobid; + opal_list_append(&mca_pmix_pmix2x_component.jobids, &job->super); } op->spcbfunc(rc, jobid, op->cbdata); @@ -964,7 +964,7 @@ static void spcbfunc(pmix_status_t status, } int pmix2x_spawnnb(opal_list_t *job_info, opal_list_t *apps, - opal_pmix_spawn_cbfunc_t cbfunc, void *cbdata) + opal_pmix_spawn_cbfunc_t cbfunc, void *cbdata) { pmix_status_t ret; pmix2x_opcaddy_t *op; @@ -978,34 +978,34 @@ int pmix2x_spawnnb(opal_list_t *job_info, opal_list_t *apps, op->cbdata = cbdata; if (NULL != job_info && 0 < (op->ninfo = opal_list_get_size(job_info))) { - PMIX_INFO_CREATE(op->info, op->ninfo); - n=0; - OPAL_LIST_FOREACH(info, job_info, opal_value_t) { - (void)strncpy(op->info[n].key, info->key, PMIX_MAX_KEYLEN); - pmix2x_value_load(&op->info[n].value, info); - ++n; - } + PMIX_INFO_CREATE(op->info, op->ninfo); + n=0; + OPAL_LIST_FOREACH(info, job_info, opal_value_t) { + (void)strncpy(op->info[n].key, info->key, PMIX_MAX_KEYLEN); + pmix2x_value_load(&op->info[n].value, info); + ++n; + } } op->sz = opal_list_get_size(apps); PMIX_APP_CREATE(op->apps, op->sz); n=0; OPAL_LIST_FOREACH(app, apps, opal_pmix_app_t) { - op->apps[n].cmd = strdup(app->cmd); - op->apps[n].argc = app->argc; - op->apps[n].argv = opal_argv_copy(app->argv); - op->apps[n].env = opal_argv_copy(app->env); - op->apps[n].maxprocs = app->maxprocs; - if (0 < (op->apps[n].ninfo = opal_list_get_size(&app->info))) { - PMIX_INFO_CREATE(op->apps[n].info, op->apps[n].ninfo); - m=0; - OPAL_LIST_FOREACH(info, &app->info, opal_value_t) { - (void)strncpy(op->apps[n].info[m].key, info->key, PMIX_MAX_KEYLEN); - pmix2x_value_load(&op->apps[n].info[m].value, info); - ++m; - } - } - ++n; + op->apps[n].cmd = strdup(app->cmd); + op->apps[n].argc = app->argc; + op->apps[n].argv = opal_argv_copy(app->argv); + op->apps[n].env = opal_argv_copy(app->env); + op->apps[n].maxprocs = app->maxprocs; + if (0 < (op->apps[n].ninfo = opal_list_get_size(&app->info))) { + PMIX_INFO_CREATE(op->apps[n].info, op->apps[n].ninfo); + m=0; + OPAL_LIST_FOREACH(info, &app->info, opal_value_t) { + (void)strncpy(op->apps[n].info[m].key, info->key, PMIX_MAX_KEYLEN); + pmix2x_value_load(&op->apps[n].info[m].value, info); + ++m; + } + } + ++n; } ret = PMIx_Spawn_nb(op->info, op->ninfo, op->apps, op->sz, spcbfunc, op); @@ -1023,7 +1023,7 @@ int pmix2x_connect(opal_list_t *procs) /* protect against bozo error */ if (NULL == procs || 0 == (cnt = opal_list_get_size(procs))) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* convert the list of procs to an array @@ -1031,23 +1031,23 @@ int pmix2x_connect(opal_list_t *procs) PMIX_PROC_CREATE(parray, cnt); n=0; OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { - if (jptr->jobid == ptr->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND); - PMIX_PROC_FREE(parray, cnt); - return OPAL_ERR_NOT_FOUND; - } - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { + if (jptr->jobid == ptr->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND); + PMIX_PROC_FREE(parray, cnt); + return OPAL_ERR_NOT_FOUND; + } + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); parray[n].rank = pmix2x_convert_opalrank(ptr->name.vpid); - ++n; + ++n; } ret = PMIx_Connect(parray, cnt, NULL, 0); @@ -1057,8 +1057,8 @@ int pmix2x_connect(opal_list_t *procs) } int pmix2x_connectnb(opal_list_t *procs, - opal_pmix_op_cbfunc_t cbfunc, - void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, + void *cbdata) { pmix_status_t ret; size_t n, cnt=0; @@ -1071,7 +1071,7 @@ int pmix2x_connectnb(opal_list_t *procs, /* protect against bozo error */ if (NULL == procs || 0 == (cnt = opal_list_get_size(procs))) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* create the caddy */ @@ -1085,16 +1085,16 @@ int pmix2x_connectnb(opal_list_t *procs, PMIX_PROC_CREATE(op->procs, op->nprocs); n=0; OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - OPAL_LIST_FOREACH(job, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { - if (job->jobid == ptr->name.jobid) { - (void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN); - break; - } - } + /* look thru our list of jobids and find the + * corresponding nspace */ + OPAL_LIST_FOREACH(job, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { + if (job->jobid == ptr->name.jobid) { + (void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN); + break; + } + } op->procs[n].rank = pmix2x_convert_opalrank(ptr->name.vpid); - ++n; + ++n; } ret = PMIx_Connect_nb(op->procs, op->nprocs, NULL, 0, opcbfunc, op); @@ -1112,7 +1112,7 @@ int pmix2x_disconnect(opal_list_t *procs) /* protect against bozo error */ if (NULL == procs || 0 == (cnt = opal_list_get_size(procs))) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* convert the list of procs to an array @@ -1120,16 +1120,16 @@ int pmix2x_disconnect(opal_list_t *procs) PMIX_PROC_CREATE(parray, cnt); n=0; OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - OPAL_LIST_FOREACH(job, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { - if (job->jobid == ptr->name.jobid) { - (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); - break; - } - } + /* look thru our list of jobids and find the + * corresponding nspace */ + OPAL_LIST_FOREACH(job, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { + if (job->jobid == ptr->name.jobid) { + (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN); + break; + } + } parray[n].rank = pmix2x_convert_opalrank(ptr->name.vpid); - ++n; + ++n; } ret = PMIx_Disconnect(parray, cnt, NULL, 0); @@ -1139,8 +1139,8 @@ int pmix2x_disconnect(opal_list_t *procs) } int pmix2x_disconnectnb(opal_list_t *procs, - opal_pmix_op_cbfunc_t cbfunc, - void *cbdata) + opal_pmix_op_cbfunc_t cbfunc, + void *cbdata) { pmix_status_t ret; size_t n, cnt=0; @@ -1153,7 +1153,7 @@ int pmix2x_disconnectnb(opal_list_t *procs, /* protect against bozo error */ if (NULL == procs || 0 == (cnt = opal_list_get_size(procs))) { - return OPAL_ERR_BAD_PARAM; + return OPAL_ERR_BAD_PARAM; } /* create the caddy */ @@ -1167,16 +1167,16 @@ int pmix2x_disconnectnb(opal_list_t *procs, PMIX_PROC_CREATE(op->procs, op->nprocs); n=0; OPAL_LIST_FOREACH(ptr, procs, opal_namelist_t) { - /* look thru our list of jobids and find the - * corresponding nspace */ - OPAL_LIST_FOREACH(job, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { - if (job->jobid == ptr->name.jobid) { - (void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN); - break; - } - } + /* look thru our list of jobids and find the + * corresponding nspace */ + OPAL_LIST_FOREACH(job, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { + if (job->jobid == ptr->name.jobid) { + (void)strncpy(op->procs[n].nspace, job->nspace, PMIX_MAX_NSLEN); + break; + } + } op->procs[n].rank = pmix2x_convert_opalrank(ptr->name.vpid); - ++n; + ++n; } ret = PMIx_Disconnect_nb(op->procs, op->nprocs, NULL, 0, opcbfunc, op); @@ -1186,7 +1186,7 @@ int pmix2x_disconnectnb(opal_list_t *procs, int pmix2x_resolve_peers(const char *nodename, opal_jobid_t jobid, - opal_list_t *procs) + opal_list_t *procs) { char *nspace; pmix_proc_t *array=NULL; @@ -1200,53 +1200,53 @@ int pmix2x_resolve_peers(const char *nodename, opal_jobid_t jobid, * and we are going to access framework-global lists/objects */ if (OPAL_JOBID_WILDCARD == jobid) { - nspace = NULL; + nspace = NULL; } else { - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { - if (jptr->jobid == jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - nspace = job->nspace; + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { + if (jptr->jobid == jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + nspace = job->nspace; } ret = PMIx_Resolve_peers(nodename, nspace, &array, &nprocs); rc = pmix2x_convert_rc(ret); if (NULL != array && 0 < nprocs) { - for (n=0; n < nprocs; n++) { - nm = OBJ_NEW(opal_namelist_t); - opal_list_append(procs, &nm->super); - if (mca_pmix_pmix2x_component.native_launch) { - /* if we were launched by the OMPI RTE, then - * the jobid is in a special format - so get it */ - opal_convert_string_to_jobid(&nm->name.jobid, array[n].nspace); - } else { - /* we were launched by someone else, so make the - * jobid just be the hash of the nspace */ - OPAL_HASH_STR(array[n].nspace, nm->name.jobid); - } - /* if we don't already have it, add this to our jobid tracker */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { - if (jptr->jobid == nm->name.jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - job = OBJ_NEW(opal_pmix2x_jobid_trkr_t); - (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); - job->jobid = jobid; - opal_list_append(&mca_pmix_pmix2x_component.jobids, &job->super); - } - nm->name.vpid = pmix2x_convert_rank(array[n].rank); - } + for (n=0; n < nprocs; n++) { + nm = OBJ_NEW(opal_namelist_t); + opal_list_append(procs, &nm->super); + if (mca_pmix_pmix2x_component.native_launch) { + /* if we were launched by the OMPI RTE, then + * the jobid is in a special format - so get it */ + opal_convert_string_to_jobid(&nm->name.jobid, array[n].nspace); + } else { + /* we were launched by someone else, so make the + * jobid just be the hash of the nspace */ + OPAL_HASH_STR(array[n].nspace, nm->name.jobid); + } + /* if we don't already have it, add this to our jobid tracker */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { + if (jptr->jobid == nm->name.jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + job = OBJ_NEW(opal_pmix2x_jobid_trkr_t); + (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN); + job->jobid = jobid; + opal_list_append(&mca_pmix_pmix2x_component.jobids, &job->super); + } + nm->name.vpid = pmix2x_convert_rank(array[n].rank); + } } PMIX_PROC_FREE(array, nprocs); @@ -1263,19 +1263,19 @@ int pmix2x_resolve_nodes(opal_jobid_t jobid, char **nodelist) * and we are going to access framework-global lists/objects */ if (OPAL_JOBID_WILDCARD != jobid) { - /* look thru our list of jobids and find the - * corresponding nspace */ - job = NULL; - OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { - if (jptr->jobid == jobid) { - job = jptr; - break; - } - } - if (NULL == job) { - return OPAL_ERR_NOT_FOUND; - } - nspace = job->nspace; + /* look thru our list of jobids and find the + * corresponding nspace */ + job = NULL; + OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix2x_component.jobids, opal_pmix2x_jobid_trkr_t) { + if (jptr->jobid == jobid) { + job = jptr; + break; + } + } + if (NULL == job) { + return OPAL_ERR_NOT_FOUND; + } + nspace = job->nspace; } ret = PMIx_Resolve_nodes(nspace, nodelist);