From aa1d7b9c5076a57a72b5f0c9997b7afea0f5fc42 Mon Sep 17 00:00:00 2001 From: hppritcha Date: Thu, 28 Apr 2016 12:48:52 -0500 Subject: [PATCH] pmix/cray: set fence_nb to NULL Rather than have a stub function for the pmix fence_nb operation, just set to NULL. Causes fewer problems. Fixes #1597 Fixes #1527 Signed-off-by: hppritcha --- opal/mca/pmix/cray/pmix_cray.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/opal/mca/pmix/cray/pmix_cray.c b/opal/mca/pmix/cray/pmix_cray.c index 72ff4ceff5..9af1c19303 100644 --- a/opal/mca/pmix/cray/pmix_cray.c +++ b/opal/mca/pmix/cray/pmix_cray.c @@ -58,8 +58,6 @@ static int cray_resolve_peers(const char *nodename, static int cray_resolve_nodes(opal_jobid_t jobid, char **nodelist); static int cray_put(opal_pmix_scope_t scope, opal_value_t *kv); static int cray_fence(opal_list_t *procs, int collect_data); -static int cray_fence_nb(opal_list_t *procs, int collect_data, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata); static int cray_commit(void); static int cray_get(const opal_process_name_t *id, const char *key, opal_list_t *info, @@ -93,7 +91,7 @@ const opal_pmix_base_module_t opal_pmix_cray_module = { .abort = cray_abort, .commit = cray_commit, .fence = cray_fence, - .fence_nb = cray_fence_nb, + .fence_nb = NULL, .put = cray_put, .get = cray_get, .get_nb = cray_get_nb, @@ -737,12 +735,6 @@ fn_exit: return rc; } -static int cray_fence_nb(opal_list_t *procs, int collect_data, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata) -{ - return OPAL_ERR_NOT_IMPLEMENTED; -} - static int cray_get(const opal_process_name_t *id, const char *key, opal_list_t *info, opal_value_t **kv) { int rc;