From 6f450630d836d9cbede4afce08bde1ead964ac0c Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 30 Mar 2016 10:24:42 +0900 Subject: [PATCH] pmix/external: fix misc missing conversion and type issues --- opal/mca/pmix/external/pmix_ext.c | 16 +++++++++++++++- opal/mca/pmix/external/pmix_ext.h | 3 +++ opal/mca/pmix/external/pmix_ext_client.c | 12 +++++------- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/opal/mca/pmix/external/pmix_ext.c b/opal/mca/pmix/external/pmix_ext.c index 49c466b669..cebcf176bf 100644 --- a/opal/mca/pmix/external/pmix_ext.c +++ b/opal/mca/pmix/external/pmix_ext.c @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2015 Research Organization for Information Science + * Copyright (c) 2014-2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014-2015 Mellanox Technologies, Inc. * All rights reserved. @@ -36,6 +36,7 @@ #include "pmix_ext.h" #include "opal/mca/pmix/base/base.h" +#include "opal/mca/pmix/pmix_types.h" #include "pmix_common.h" @@ -269,6 +270,19 @@ int pmix1_convert_rc(pmix_status_t rc) } } +pmix_scope_t pmix1_convert_opalscope(opal_pmix_scope_t scope) { + switch(scope) { + case OPAL_PMIX_LOCAL: + return PMIX_LOCAL; + case OPAL_PMIX_REMOTE: + return PMIX_REMOTE; + case OPAL_PMIX_GLOBAL: + return PMIX_GLOBAL; + default: + return PMIX_SCOPE_UNDEF; + } +} + void pmix1_value_load(pmix_value_t *v, opal_value_t *kv) { diff --git a/opal/mca/pmix/external/pmix_ext.h b/opal/mca/pmix/external/pmix_ext.h index 2d658fb07e..c4f9f30a5c 100644 --- a/opal/mca/pmix/external/pmix_ext.h +++ b/opal/mca/pmix/external/pmix_ext.h @@ -2,6 +2,8 @@ * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2016 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -163,6 +165,7 @@ OPAL_MODULE_DECLSPEC int pmix1_server_notify_error(int status, /**** COMPONENT UTILITY FUNCTIONS ****/ OPAL_MODULE_DECLSPEC pmix_status_t pmix1_convert_opalrc(int rc); OPAL_MODULE_DECLSPEC int pmix1_convert_rc(pmix_status_t rc); +OPAL_MODULE_DECLSPEC pmix_scope_t pmix1_convert_opalscope(opal_pmix_scope_t scope); OPAL_MODULE_DECLSPEC void pmix1_value_load(pmix_value_t *v, opal_value_t *kv); OPAL_MODULE_DECLSPEC int pmix1_value_unload(opal_value_t *kv, diff --git a/opal/mca/pmix/external/pmix_ext_client.c b/opal/mca/pmix/external/pmix_ext_client.c index b9da10c177..80a5b814f6 100644 --- a/opal/mca/pmix/external/pmix_ext_client.c +++ b/opal/mca/pmix/external/pmix_ext_client.c @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2015 Research Organization for Information Science + * Copyright (c) 2014-2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014-2015 Mellanox Technologies, Inc. * All rights reserved. @@ -161,13 +161,10 @@ int pmix1_client_finalize(void) int pmix1_initialized(void) { - pmix_status_t rc; - opal_output_verbose(1, opal_pmix_base_framework.framework_output, "PMIx_client initialized"); - rc = PMIx_Initialized(); - return pmix1_convert_rc(rc); + return PMIx_Initialized(); } int pmix1_abort(int flag, const char *msg, @@ -396,10 +393,11 @@ int pmix1_fencenb(opal_list_t *procs, int collect_data, } -int pmix1_put(opal_pmix_scope_t scope, +int pmix1_put(opal_pmix_scope_t opal_scope, 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, @@ -408,7 +406,7 @@ int pmix1_put(opal_pmix_scope_t scope, PMIX_VALUE_CONSTRUCT(&kv); pmix1_value_load(&kv, val); - rc = PMIx_Put(scope, val->key, &kv); + rc = PMIx_Put(pmix_scope, val->key, &kv); PMIX_VALUE_DESTRUCT(&kv); return pmix1_convert_rc(rc); }