Now that we are hiding symbols in the internal PMIx component, we cannot reuse that component for integration to the external PMIx master as the symbols don't match. So create a new "ext3x" component and copy the PMIx v3 integration over there.
Also, remove a couple of build-product files from the pmix3x component.
Этот коммит содержится в:
Ralph Castain
родитель
7be607582e
Коммит
8113a8d1b0
2
.gitignore
поставляемый
2
.gitignore
поставляемый
@ -314,6 +314,8 @@ opal/mca/pmix/pmix3x/pmix/src/include/pmix_config.h
|
|||||||
opal/mca/pmix/pmix3x/pmix/src/include/pmix_config.h.in
|
opal/mca/pmix/pmix3x/pmix/src/include/pmix_config.h.in
|
||||||
opal/mca/pmix/pmix3x/pmix/include/pmix_rename.h
|
opal/mca/pmix/pmix3x/pmix/include/pmix_rename.h
|
||||||
opal/mca/pmix/pmix3x/pmix/include/pmix_version.h
|
opal/mca/pmix/pmix3x/pmix/include/pmix_version.h
|
||||||
|
opal/mca/pmix/pmix3x/pmix/src/util/keyval/keyval_lex.c
|
||||||
|
opal/mca/pmix/pmix3x/pmix/src/util/show_help_lex.c
|
||||||
|
|
||||||
opal/tools/opal-checkpoint/opal-checkpoint
|
opal/tools/opal-checkpoint/opal-checkpoint
|
||||||
opal/tools/opal-checkpoint/opal-checkpoint.1
|
opal/tools/opal-checkpoint/opal-checkpoint.1
|
||||||
|
|||||||
46
opal/mca/pmix/ext3x/Makefile.am
Обычный файл
46
opal/mca/pmix/ext3x/Makefile.am
Обычный файл
@ -0,0 +1,46 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
|
||||||
|
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
|
||||||
|
# Copyright (c) 2015 Research Organization for Information Science
|
||||||
|
# and Technology (RIST). All rights reserved.
|
||||||
|
# $COPYRIGHT$
|
||||||
|
#
|
||||||
|
# Additional copyrights may follow
|
||||||
|
#
|
||||||
|
# $HEADER$
|
||||||
|
#
|
||||||
|
|
||||||
|
sources = \
|
||||||
|
pmix3x.h \
|
||||||
|
pmix3x_component.c \
|
||||||
|
pmix3x.c \
|
||||||
|
pmix3x_client.c \
|
||||||
|
pmix3x_server_south.c \
|
||||||
|
pmix3x_server_north.c
|
||||||
|
|
||||||
|
# Make the output library in this directory, and name it either
|
||||||
|
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
|
||||||
|
# (for static builds).
|
||||||
|
|
||||||
|
if MCA_BUILD_opal_pmix_ext3x_DSO
|
||||||
|
component_noinst =
|
||||||
|
component_install = mca_pmix_ext3x.la
|
||||||
|
else
|
||||||
|
component_noinst = libmca_pmix_ext3x.la
|
||||||
|
component_install =
|
||||||
|
endif
|
||||||
|
|
||||||
|
mcacomponentdir = $(opallibdir)
|
||||||
|
mcacomponent_LTLIBRARIES = $(component_install)
|
||||||
|
mca_pmix_ext3x_la_SOURCES = $(sources)
|
||||||
|
mca_pmix_ext3x_la_CFLAGS = $(opal_pmix_ext3x_CFLAGS)
|
||||||
|
mca_pmix_ext3x_la_CPPFLAGS =$(opal_pmix_ext3x_CPPFLAGS)
|
||||||
|
mca_pmix_ext3x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext3x_LDFLAGS)
|
||||||
|
mca_pmix_ext3x_la_LIBADD = $(opal_pmix_ext3x_LIBS)
|
||||||
|
|
||||||
|
noinst_LTLIBRARIES = $(component_noinst)
|
||||||
|
libmca_pmix_ext3x_la_SOURCES =$(sources)
|
||||||
|
libmca_pmix_ext3x_la_CFLAGS = $(opal_pmix_ext3x_CFLAGS)
|
||||||
|
libmca_pmix_ext3x_la_CPPFLAGS = $(opal_pmix_ext3x_CPPFLAGS)
|
||||||
|
libmca_pmix_ext3x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext3x_LDFLAGS)
|
||||||
|
libmca_pmix_ext3x_la_LIBADD = $(opal_pmix_ext3x_LIBS)
|
||||||
6
opal/mca/pmix/ext3x/common_sym_whitelist.txt
Обычный файл
6
opal/mca/pmix/ext3x/common_sym_whitelist.txt
Обычный файл
@ -0,0 +1,6 @@
|
|||||||
|
# Ignore symbols in this component that are auto-generated and we
|
||||||
|
# can't do anything about them (e.g., flex/bison symbols).
|
||||||
|
pmix_util_keyval_yyleng
|
||||||
|
pmix_util_keyval_yytext
|
||||||
|
pmix_show_help_yyleng
|
||||||
|
pmix_show_help_yytext
|
||||||
60
opal/mca/pmix/ext3x/configure.m4
Обычный файл
60
opal/mca/pmix/ext3x/configure.m4
Обычный файл
@ -0,0 +1,60 @@
|
|||||||
|
# -*- shell-script -*-
|
||||||
|
#
|
||||||
|
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||||
|
# University Research and Technology
|
||||||
|
# Corporation. All rights reserved.
|
||||||
|
# Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||||
|
# of Tennessee Research Foundation. All rights
|
||||||
|
# reserved.
|
||||||
|
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||||
|
# University of Stuttgart. All rights reserved.
|
||||||
|
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
|
# All rights reserved.
|
||||||
|
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
|
||||||
|
# All rights reserved.
|
||||||
|
# Copyright (c) 2010-2016 Cisco Systems, Inc. All rights reserved.
|
||||||
|
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
|
||||||
|
# Copyright (c) 2015-2016 Research Organization for Information Science
|
||||||
|
# and Technology (RIST). All rights reserved.
|
||||||
|
# $COPYRIGHT$
|
||||||
|
#
|
||||||
|
# Additional copyrights may follow
|
||||||
|
#
|
||||||
|
# $HEADER$
|
||||||
|
#
|
||||||
|
|
||||||
|
# MCA_pmix_ext3x_CONFIG([action-if-found], [action-if-not-found])
|
||||||
|
# -----------------------------------------------------------
|
||||||
|
AC_DEFUN([MCA_opal_pmix_ext3x_CONFIG],[
|
||||||
|
AC_CONFIG_FILES([opal/mca/pmix/ext3x/Makefile])
|
||||||
|
|
||||||
|
# check to see
|
||||||
|
# if we are linking to an external v3.x library. If not, then
|
||||||
|
# do not use this component.
|
||||||
|
AC_MSG_CHECKING([if external v3.x component is to be used])
|
||||||
|
AS_IF([test "$opal_external_pmix_happy" = "yes"],
|
||||||
|
[AS_IF([test "$opal_external_pmix_version" = "3X"],
|
||||||
|
[AC_MSG_RESULT([yes - using an external v3.x library])
|
||||||
|
opal_pmix_ext3x_happy=1
|
||||||
|
# Build flags for our Makefile.am
|
||||||
|
opal_pmix_ext3x_CPPFLAGS=$opal_external_pmix_CPPFLAGS
|
||||||
|
opal_pmix_ext3x_LDFLAGS=$opal_external_pmix_LDFLAGS
|
||||||
|
opal_pmix_ext3x_LIBS=$opal_external_pmix_LIBS
|
||||||
|
# setup wrapper flags
|
||||||
|
pmix_ext3x_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
|
||||||
|
pmix_ext3x_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
|
||||||
|
[AC_MSG_RESULT([no - disqualifying this component])
|
||||||
|
opal_pmix_ext3x_happy=0])],
|
||||||
|
[AC_MSG_RESULT([no - disqualifying this component])
|
||||||
|
opal_pmix_ext3x_happy=0])
|
||||||
|
|
||||||
|
AC_SUBST([opal_pmix_ext3x_LIBS])
|
||||||
|
AC_SUBST([opal_pmix_ext3x_CPPFLAGS])
|
||||||
|
AC_SUBST([opal_pmix_ext3x_LDFLAGS])
|
||||||
|
AC_SUBST([opal_pmix_ext3x_DEPENDENCIES])
|
||||||
|
|
||||||
|
AS_IF([test $opal_pmix_ext3x_happy -eq 1],
|
||||||
|
[$1],
|
||||||
|
[$2])
|
||||||
|
|
||||||
|
])dnl
|
||||||
1489
opal/mca/pmix/ext3x/pmix3x.c
Обычный файл
1489
opal/mca/pmix/ext3x/pmix3x.c
Обычный файл
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
323
opal/mca/pmix/ext3x/pmix3x.h
Обычный файл
323
opal/mca/pmix/ext3x/pmix3x.h
Обычный файл
@ -0,0 +1,323 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2014-2016 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
|
||||||
|
*
|
||||||
|
* $HEADER$
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef MCA_PMIX_PMIX2X_H
|
||||||
|
#define MCA_PMIX_PMIX2X_H
|
||||||
|
|
||||||
|
#include "opal_config.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_SYS_SOCKET_H
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_SYS_UN_H
|
||||||
|
#include <sys/un.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "opal/class/opal_list.h"
|
||||||
|
#include "opal/mca/mca.h"
|
||||||
|
#include "opal/mca/event/event.h"
|
||||||
|
#include "opal/util/proc.h"
|
||||||
|
|
||||||
|
#include "opal/mca/pmix/pmix.h"
|
||||||
|
#include "pmix_server.h"
|
||||||
|
#include "pmix_common.h"
|
||||||
|
|
||||||
|
BEGIN_C_DECLS
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
opal_pmix_base_component_t super;
|
||||||
|
opal_list_t jobids;
|
||||||
|
bool native_launch;
|
||||||
|
size_t evindex;
|
||||||
|
opal_list_t single_events;
|
||||||
|
opal_list_t multi_events;
|
||||||
|
opal_list_t default_events;
|
||||||
|
int cache_size;
|
||||||
|
opal_list_t cache;
|
||||||
|
} mca_pmix_pmix3x_component_t;
|
||||||
|
|
||||||
|
OPAL_DECLSPEC extern mca_pmix_pmix3x_component_t mca_pmix_pmix3x_component;
|
||||||
|
|
||||||
|
OPAL_DECLSPEC extern const opal_pmix_base_module_t opal_pmix_pmix3x_module;
|
||||||
|
|
||||||
|
/**** INTERNAL OBJECTS ****/
|
||||||
|
typedef struct {
|
||||||
|
opal_list_item_t super;
|
||||||
|
opal_jobid_t jobid;
|
||||||
|
char nspace[PMIX_MAX_NSLEN + 1];
|
||||||
|
} opal_pmix3x_jobid_trkr_t;
|
||||||
|
OBJ_CLASS_DECLARATION(opal_pmix3x_jobid_trkr_t);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
opal_list_item_t super;
|
||||||
|
size_t index;
|
||||||
|
int code;
|
||||||
|
opal_pmix_notification_fn_t handler;
|
||||||
|
} opal_pmix3x_single_event_t;
|
||||||
|
OBJ_CLASS_DECLARATION(opal_pmix3x_single_event_t);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
opal_list_item_t super;
|
||||||
|
size_t index;
|
||||||
|
int *codes;
|
||||||
|
size_t ncodes;
|
||||||
|
opal_pmix_notification_fn_t handler;
|
||||||
|
} opal_pmix3x_multi_event_t;
|
||||||
|
OBJ_CLASS_DECLARATION(opal_pmix3x_multi_event_t);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
opal_list_item_t super;
|
||||||
|
size_t index;
|
||||||
|
opal_pmix_notification_fn_t handler;
|
||||||
|
} opal_pmix3x_default_event_t;
|
||||||
|
OBJ_CLASS_DECLARATION(opal_pmix3x_default_event_t);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
opal_list_item_t super;
|
||||||
|
int status;
|
||||||
|
bool nondefault;
|
||||||
|
opal_process_name_t source;
|
||||||
|
pmix_data_range_t range;
|
||||||
|
opal_list_t *info;
|
||||||
|
opal_list_t results;
|
||||||
|
opal_pmix3x_single_event_t *sing;
|
||||||
|
opal_pmix3x_multi_event_t *multi;
|
||||||
|
opal_pmix3x_default_event_t *def;
|
||||||
|
opal_pmix_op_cbfunc_t final_cbfunc;
|
||||||
|
void *final_cbdata;
|
||||||
|
} opal_pmix3x_event_chain_t;
|
||||||
|
OBJ_CLASS_DECLARATION(opal_pmix3x_event_chain_t);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
opal_object_t super;
|
||||||
|
pmix_status_t status;
|
||||||
|
pmix_proc_t p;
|
||||||
|
pmix_proc_t *procs;
|
||||||
|
size_t nprocs;
|
||||||
|
pmix_proc_t *error_procs;
|
||||||
|
size_t nerror_procs;
|
||||||
|
pmix_info_t *info;
|
||||||
|
size_t ninfo;
|
||||||
|
pmix_app_t *apps;
|
||||||
|
size_t sz;
|
||||||
|
volatile bool active;
|
||||||
|
opal_pmix_op_cbfunc_t opcbfunc;
|
||||||
|
opal_pmix_modex_cbfunc_t mdxcbfunc;
|
||||||
|
opal_pmix_value_cbfunc_t valcbfunc;
|
||||||
|
opal_pmix_lookup_cbfunc_t lkcbfunc;
|
||||||
|
opal_pmix_spawn_cbfunc_t spcbfunc;
|
||||||
|
void *cbdata;
|
||||||
|
} pmix3x_opcaddy_t;
|
||||||
|
OBJ_CLASS_DECLARATION(pmix3x_opcaddy_t);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
opal_object_t super;
|
||||||
|
opal_list_t procs;
|
||||||
|
opal_list_t info;
|
||||||
|
opal_list_t apps;
|
||||||
|
pmix_op_cbfunc_t opcbfunc;
|
||||||
|
pmix_dmodex_response_fn_t dmdxfunc;
|
||||||
|
pmix_modex_cbfunc_t mdxcbfunc;
|
||||||
|
pmix_lookup_cbfunc_t lkupcbfunc;
|
||||||
|
pmix_spawn_cbfunc_t spwncbfunc;
|
||||||
|
pmix_info_cbfunc_t infocbfunc;
|
||||||
|
pmix_tool_connection_cbfunc_t toolcbfunc;
|
||||||
|
void *cbdata;
|
||||||
|
opal_pmix_release_cbfunc_t odmdxfunc;
|
||||||
|
void *ocbdata;
|
||||||
|
} pmix3x_opalcaddy_t;
|
||||||
|
OBJ_CLASS_DECLARATION(pmix3x_opalcaddy_t);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
opal_object_t super;
|
||||||
|
opal_event_t ev;
|
||||||
|
volatile bool active;
|
||||||
|
size_t id;
|
||||||
|
int status;
|
||||||
|
opal_process_name_t pname;
|
||||||
|
opal_jobid_t jobid;
|
||||||
|
const opal_process_name_t *source;
|
||||||
|
opal_pmix_data_range_t range;
|
||||||
|
bool nondefault;
|
||||||
|
size_t handler;
|
||||||
|
opal_list_t *event_codes;
|
||||||
|
opal_list_t *info;
|
||||||
|
opal_pmix_notification_fn_t evhandler;
|
||||||
|
opal_pmix_evhandler_reg_cbfunc_t cbfunc;
|
||||||
|
opal_pmix_op_cbfunc_t opcbfunc;
|
||||||
|
void *cbdata;
|
||||||
|
} pmix3x_threadshift_t;
|
||||||
|
OBJ_CLASS_DECLARATION(pmix3x_threadshift_t);
|
||||||
|
|
||||||
|
#define OPAL_PMIX_OPCD_THREADSHIFT(i, s, sr, if, nif, fn, cb, cd) \
|
||||||
|
do { \
|
||||||
|
pmix3x_opalcaddy_t *_cd; \
|
||||||
|
_cd = OBJ_NEW(pmix3x_opalcaddy_t); \
|
||||||
|
_cd->id = (i); \
|
||||||
|
_cd->status = (s); \
|
||||||
|
_cd->source = (sr); \
|
||||||
|
_cd->info = (i); \
|
||||||
|
_cd->evcbfunc = (cb); \
|
||||||
|
_cd->cbdata = (cd); \
|
||||||
|
event_assign(&((_cd)->ev), opal_pmix_base.evbase, \
|
||||||
|
-1, EV_WRITE, (fn), (_cd)); \
|
||||||
|
event_active(&((_cd)->ev), EV_WRITE, 1); \
|
||||||
|
} while(0)
|
||||||
|
|
||||||
|
#define OPAL_PMIX_OP_THREADSHIFT(e, fn, cb, cd) \
|
||||||
|
do { \
|
||||||
|
pmix3x_threadshift_t *_cd; \
|
||||||
|
_cd = OBJ_NEW(pmix3x_threadshift_t); \
|
||||||
|
_cd->handler = (e); \
|
||||||
|
_cd->opcbfunc = (cb); \
|
||||||
|
_cd->cbdata = (cd); \
|
||||||
|
event_assign(&((_cd)->ev), opal_pmix_base.evbase, \
|
||||||
|
-1, EV_WRITE, (fn), (_cd)); \
|
||||||
|
event_active(&((_cd)->ev), EV_WRITE, 1); \
|
||||||
|
} while(0)
|
||||||
|
|
||||||
|
#define OPAL_PMIX_THREADSHIFT(e, i, eh, fn, cb, cd) \
|
||||||
|
do { \
|
||||||
|
pmix3x_threadshift_t *_cd; \
|
||||||
|
_cd = OBJ_NEW(pmix3x_threadshift_t); \
|
||||||
|
_cd->event_codes = (e); \
|
||||||
|
_cd->info = (i); \
|
||||||
|
_cd->evhandler = (eh); \
|
||||||
|
_cd->cbfunc = (cb); \
|
||||||
|
_cd->cbdata = (cd); \
|
||||||
|
event_assign(&((_cd)->ev), opal_pmix_base.evbase, \
|
||||||
|
-1, EV_WRITE, (fn), (_cd)); \
|
||||||
|
event_active(&((_cd)->ev), EV_WRITE, 1); \
|
||||||
|
} while(0)
|
||||||
|
|
||||||
|
#define OPAL_PMIX_NOTIFY_THREADSHIFT(s, sr, r, i, fn, cb, cd) \
|
||||||
|
do { \
|
||||||
|
pmix3x_threadshift_t *_cd; \
|
||||||
|
_cd = OBJ_NEW(pmix3x_threadshift_t); \
|
||||||
|
_cd->status = (s); \
|
||||||
|
_cd->source = (sr); \
|
||||||
|
_cd->range = (r); \
|
||||||
|
_cd->info = (i); \
|
||||||
|
_cd->opcbfunc = (cb); \
|
||||||
|
_cd->cbdata = (cd); \
|
||||||
|
event_assign(&((_cd)->ev), opal_pmix_base.evbase, \
|
||||||
|
-1, EV_WRITE, (fn), (_cd)); \
|
||||||
|
event_active(&((_cd)->ev), EV_WRITE, 1); \
|
||||||
|
} while(0)
|
||||||
|
|
||||||
|
/**** CLIENT FUNCTIONS ****/
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_client_init(void);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_client_finalize(void);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_initialized(void);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_abort(int flag, const char *msg,
|
||||||
|
opal_list_t *procs);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_commit(void);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_fence(opal_list_t *procs, int collect_data);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_fencenb(opal_list_t *procs, int collect_data,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc, void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_put(opal_pmix_scope_t scope,
|
||||||
|
opal_value_t *val);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_get(const opal_process_name_t *proc, const char *key,
|
||||||
|
opal_list_t *info, opal_value_t **val);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_getnb(const opal_process_name_t *proc, const char *key,
|
||||||
|
opal_list_t *info,
|
||||||
|
opal_pmix_value_cbfunc_t cbfunc, void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_publish(opal_list_t *info);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_publishnb(opal_list_t *info,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc, void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_lookup(opal_list_t *data, opal_list_t *info);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_lookupnb(char **keys, opal_list_t *info,
|
||||||
|
opal_pmix_lookup_cbfunc_t cbfunc, void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_unpublish(char **keys, opal_list_t *info);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_unpublishnb(char **keys, opal_list_t *info,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc, void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_spawnnb(opal_list_t *job_info, opal_list_t *apps,
|
||||||
|
opal_pmix_spawn_cbfunc_t cbfunc, void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_connect(opal_list_t *procs);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_connectnb(opal_list_t *procs,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc,
|
||||||
|
void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_disconnect(opal_list_t *procs);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_disconnectnb(opal_list_t *procs,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc,
|
||||||
|
void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_resolve_peers(const char *nodename, opal_jobid_t jobid,
|
||||||
|
opal_list_t *procs);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_resolve_nodes(opal_jobid_t jobid, char **nodelist);
|
||||||
|
|
||||||
|
/**** COMMON FUNCTIONS ****/
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_store_local(const opal_process_name_t *proc,
|
||||||
|
opal_value_t *val);
|
||||||
|
|
||||||
|
/**** SERVER SOUTHBOUND FUNCTIONS ****/
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_server_init(opal_pmix_server_module_t *module,
|
||||||
|
opal_list_t *info);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_server_finalize(void);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_server_gen_regex(const char *input, char **regex);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_server_gen_ppn(const char *input, char **ppn);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_server_register_nspace(opal_jobid_t jobid,
|
||||||
|
int nlocalprocs,
|
||||||
|
opal_list_t *info,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc,
|
||||||
|
void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC void pmix3x_server_deregister_nspace(opal_jobid_t jobid,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc,
|
||||||
|
void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_server_register_client(const opal_process_name_t *proc,
|
||||||
|
uid_t uid, gid_t gid,
|
||||||
|
void *server_object,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc,
|
||||||
|
void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC void pmix3x_server_deregister_client(const opal_process_name_t *proc,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc,
|
||||||
|
void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_server_setup_fork(const opal_process_name_t *proc, char ***env);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_server_dmodex(const opal_process_name_t *proc,
|
||||||
|
opal_pmix_modex_cbfunc_t cbfunc, void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_server_notify_event(int status,
|
||||||
|
const opal_process_name_t *source,
|
||||||
|
opal_list_t *info,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc, void *cbdata);
|
||||||
|
|
||||||
|
|
||||||
|
/**** COMPONENT UTILITY FUNCTIONS ****/
|
||||||
|
OPAL_MODULE_DECLSPEC void pmix3x_event_hdlr(size_t evhdlr_registration_id,
|
||||||
|
pmix_status_t status, const pmix_proc_t *source,
|
||||||
|
pmix_info_t info[], size_t ninfo,
|
||||||
|
pmix_info_t results[], size_t nresults,
|
||||||
|
pmix_event_notification_cbfunc_fn_t cbfunc,
|
||||||
|
void *cbdata);
|
||||||
|
OPAL_MODULE_DECLSPEC pmix_status_t pmix3x_convert_opalrc(int rc);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_convert_rc(pmix_status_t rc);
|
||||||
|
|
||||||
|
OPAL_MODULE_DECLSPEC opal_vpid_t pmix3x_convert_rank(int rank);
|
||||||
|
OPAL_MODULE_DECLSPEC pmix_rank_t pmix3x_convert_opalrank(opal_vpid_t vpid);
|
||||||
|
|
||||||
|
OPAL_MODULE_DECLSPEC opal_pmix_scope_t pmix3x_convert_scope(pmix_scope_t scope);
|
||||||
|
OPAL_MODULE_DECLSPEC pmix_scope_t pmix3x_convert_opalscope(opal_pmix_scope_t scope);
|
||||||
|
|
||||||
|
OPAL_MODULE_DECLSPEC pmix_data_range_t pmix3x_convert_opalrange(opal_pmix_data_range_t range);
|
||||||
|
OPAL_MODULE_DECLSPEC opal_pmix_data_range_t pmix3x_convert_range(pmix_data_range_t range);
|
||||||
|
|
||||||
|
OPAL_MODULE_DECLSPEC opal_pmix_persistence_t pmix3x_convert_persist(pmix_persistence_t scope);
|
||||||
|
OPAL_MODULE_DECLSPEC pmix_persistence_t pmix3x_convert_opalpersist(opal_pmix_persistence_t scope);
|
||||||
|
|
||||||
|
OPAL_MODULE_DECLSPEC void pmix3x_value_load(pmix_value_t *v,
|
||||||
|
opal_value_t *kv);
|
||||||
|
OPAL_MODULE_DECLSPEC int pmix3x_value_unload(opal_value_t *kv,
|
||||||
|
const pmix_value_t *v);
|
||||||
|
|
||||||
|
END_C_DECLS
|
||||||
|
|
||||||
|
#endif /* MCA_PMIX_EXTERNAL_H */
|
||||||
1285
opal/mca/pmix/ext3x/pmix3x_client.c
Обычный файл
1285
opal/mca/pmix/ext3x/pmix3x_client.c
Обычный файл
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
131
opal/mca/pmix/ext3x/pmix3x_component.c
Обычный файл
131
opal/mca/pmix/ext3x/pmix3x_component.c
Обычный файл
@ -0,0 +1,131 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
|
||||||
|
* Copyright (c) 2014-2015 Research Organization for Information Science
|
||||||
|
* and Technology (RIST). All rights reserved.
|
||||||
|
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
|
||||||
|
* $COPYRIGHT$
|
||||||
|
*
|
||||||
|
* Additional copyrights may follow
|
||||||
|
*
|
||||||
|
* $HEADER$
|
||||||
|
*
|
||||||
|
* These symbols are in a file by themselves to provide nice linker
|
||||||
|
* semantics. Since linkers generally pull in symbols by object
|
||||||
|
* files, keeping these symbols as the only symbols in this file
|
||||||
|
* prevents utility programs such as "ompi_info" from having to import
|
||||||
|
* entire components just to query their version and parameters.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "opal_config.h"
|
||||||
|
|
||||||
|
#include "opal/constants.h"
|
||||||
|
#include "opal/class/opal_list.h"
|
||||||
|
#include "opal/util/proc.h"
|
||||||
|
#include "opal/mca/pmix/pmix.h"
|
||||||
|
#include "pmix3x.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Public string showing the pmix external component version number
|
||||||
|
*/
|
||||||
|
const char *opal_pmix_pmix3x_component_version_string =
|
||||||
|
"OPAL pmix3x MCA component version " OPAL_VERSION;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Local function
|
||||||
|
*/
|
||||||
|
static int external_open(void);
|
||||||
|
static int external_close(void);
|
||||||
|
static int external_component_query(mca_base_module_t **module, int *priority);
|
||||||
|
static int external_register(void);
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Instantiate the public struct with all of our public information
|
||||||
|
* and pointers to our public functions in it
|
||||||
|
*/
|
||||||
|
|
||||||
|
mca_pmix_pmix3x_component_t mca_pmix_pmix3x_component = {
|
||||||
|
{
|
||||||
|
/* First, the mca_component_t struct containing meta information
|
||||||
|
about the component itself */
|
||||||
|
|
||||||
|
.base_version = {
|
||||||
|
/* Indicate that we are a pmix v1.1.0 component (which also
|
||||||
|
implies a specific MCA version) */
|
||||||
|
|
||||||
|
OPAL_PMIX_BASE_VERSION_2_0_0,
|
||||||
|
|
||||||
|
/* Component name and version */
|
||||||
|
|
||||||
|
.mca_component_name = "pmix3x",
|
||||||
|
MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION,
|
||||||
|
OPAL_RELEASE_VERSION),
|
||||||
|
|
||||||
|
/* Component open and close functions */
|
||||||
|
|
||||||
|
.mca_open_component = external_open,
|
||||||
|
.mca_close_component = external_close,
|
||||||
|
.mca_query_component = external_component_query,
|
||||||
|
.mca_register_component_params = external_register,
|
||||||
|
},
|
||||||
|
/* Next the MCA v1.0.0 component meta data */
|
||||||
|
.base_data = {
|
||||||
|
/* The component is checkpoint ready */
|
||||||
|
MCA_BASE_METADATA_PARAM_CHECKPOINT
|
||||||
|
}
|
||||||
|
},
|
||||||
|
.native_launch = false
|
||||||
|
};
|
||||||
|
|
||||||
|
static int external_register(void)
|
||||||
|
{
|
||||||
|
mca_pmix_pmix3x_component.cache_size = 256;
|
||||||
|
mca_base_component_var_register(&mca_pmix_pmix3x_component.super.base_version,
|
||||||
|
"cache_size", "Size of the ring buffer cache for events",
|
||||||
|
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, OPAL_INFO_LVL_5,
|
||||||
|
MCA_BASE_VAR_SCOPE_CONSTANT,
|
||||||
|
&mca_pmix_pmix3x_component.cache_size);
|
||||||
|
|
||||||
|
return OPAL_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int external_open(void)
|
||||||
|
{
|
||||||
|
mca_pmix_pmix3x_component.evindex = 0;
|
||||||
|
OBJ_CONSTRUCT(&mca_pmix_pmix3x_component.jobids, opal_list_t);
|
||||||
|
OBJ_CONSTRUCT(&mca_pmix_pmix3x_component.single_events, opal_list_t);
|
||||||
|
OBJ_CONSTRUCT(&mca_pmix_pmix3x_component.multi_events, opal_list_t);
|
||||||
|
OBJ_CONSTRUCT(&mca_pmix_pmix3x_component.default_events, opal_list_t);
|
||||||
|
OBJ_CONSTRUCT(&mca_pmix_pmix3x_component.cache, opal_list_t);
|
||||||
|
|
||||||
|
return OPAL_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int external_close(void)
|
||||||
|
{
|
||||||
|
OPAL_LIST_DESTRUCT(&mca_pmix_pmix3x_component.jobids);
|
||||||
|
OPAL_LIST_DESTRUCT(&mca_pmix_pmix3x_component.single_events);
|
||||||
|
OPAL_LIST_DESTRUCT(&mca_pmix_pmix3x_component.multi_events);
|
||||||
|
OPAL_LIST_DESTRUCT(&mca_pmix_pmix3x_component.default_events);
|
||||||
|
OPAL_LIST_DESTRUCT(&mca_pmix_pmix3x_component.cache);
|
||||||
|
return OPAL_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int external_component_query(mca_base_module_t **module, int *priority)
|
||||||
|
{
|
||||||
|
char *t, *id;
|
||||||
|
|
||||||
|
/* see if a PMIx server is present */
|
||||||
|
if (NULL != (t = getenv("PMIX_SERVER_URI")) ||
|
||||||
|
NULL != (id = getenv("PMIX_ID"))) {
|
||||||
|
/* if PMIx is present, then we are a client and need to use it */
|
||||||
|
*priority = 100;
|
||||||
|
} else {
|
||||||
|
/* we could be a server, so we still need to be considered */
|
||||||
|
*priority = 5;
|
||||||
|
}
|
||||||
|
*module = (mca_base_module_t *)&opal_pmix_pmix3x_module;
|
||||||
|
return OPAL_SUCCESS;
|
||||||
|
}
|
||||||
1047
opal/mca/pmix/ext3x/pmix3x_server_north.c
Обычный файл
1047
opal/mca/pmix/ext3x/pmix3x_server_north.c
Обычный файл
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
519
opal/mca/pmix/ext3x/pmix3x_server_south.c
Обычный файл
519
opal/mca/pmix/ext3x/pmix3x_server_south.c
Обычный файл
@ -0,0 +1,519 @@
|
|||||||
|
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
|
||||||
|
* Copyright (c) 2014-2016 Research Organization for Information Science
|
||||||
|
* and Technology (RIST). All rights reserved.
|
||||||
|
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
|
||||||
|
* Copyright (c) 2014 Mellanox Technologies, Inc.
|
||||||
|
* All rights reserved.
|
||||||
|
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
|
||||||
|
* $COPYRIGHT$
|
||||||
|
*
|
||||||
|
* Additional copyrights may follow
|
||||||
|
*
|
||||||
|
* $HEADER$
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "opal_config.h"
|
||||||
|
#include "opal/constants.h"
|
||||||
|
#include "opal/types.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_STRING_H
|
||||||
|
#include <string.h>
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_UNISTD_H
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "opal/dss/dss.h"
|
||||||
|
#include "opal/mca/event/event.h"
|
||||||
|
#include "opal/mca/hwloc/base/base.h"
|
||||||
|
#include "opal/runtime/opal.h"
|
||||||
|
#include "opal/runtime/opal_progress_threads.h"
|
||||||
|
#include "opal/util/argv.h"
|
||||||
|
#include "opal/util/error.h"
|
||||||
|
#include "opal/util/output.h"
|
||||||
|
#include "opal/util/proc.h"
|
||||||
|
#include "opal/util/show_help.h"
|
||||||
|
#include "opal/mca/pmix/base/base.h"
|
||||||
|
#include "pmix3x.h"
|
||||||
|
|
||||||
|
#include "pmix.h"
|
||||||
|
#include "pmix_server.h"
|
||||||
|
|
||||||
|
/**** S.O.U.T.H.B.O.U.N.D I.N.T.E.R.F.A.C.E.S ****/
|
||||||
|
|
||||||
|
/* These are the interfaces used by the OMPI/ORTE/OPAL layer to call
|
||||||
|
* down into the embedded PMIx server. */
|
||||||
|
|
||||||
|
extern pmix_server_module_t mymodule;
|
||||||
|
extern opal_pmix_server_module_t *host_module;
|
||||||
|
static char *dbgvalue=NULL;
|
||||||
|
static size_t errhdler_ref = 0;
|
||||||
|
|
||||||
|
#define PMIX_WAIT_FOR_COMPLETION(a) \
|
||||||
|
do { \
|
||||||
|
while ((a)) { \
|
||||||
|
usleep(10); \
|
||||||
|
} \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
static void errreg_cbfunc (pmix_status_t status,
|
||||||
|
size_t errhandler_ref,
|
||||||
|
void *cbdata)
|
||||||
|
{
|
||||||
|
volatile bool *active = (volatile bool*)cbdata;
|
||||||
|
|
||||||
|
errhdler_ref = errhandler_ref;
|
||||||
|
opal_output_verbose(5, opal_pmix_base_framework.framework_output,
|
||||||
|
"PMIX server errreg_cbfunc - error handler registered status=%d, reference=%lu",
|
||||||
|
status, (unsigned long)errhandler_ref);
|
||||||
|
*active = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
int pmix3x_server_init(opal_pmix_server_module_t *module,
|
||||||
|
opal_list_t *info)
|
||||||
|
{
|
||||||
|
pmix_status_t rc;
|
||||||
|
int dbg;
|
||||||
|
opal_value_t *kv;
|
||||||
|
pmix_info_t *pinfo;
|
||||||
|
size_t sz, n;
|
||||||
|
volatile bool active;
|
||||||
|
opal_pmix3x_jobid_trkr_t *job;
|
||||||
|
|
||||||
|
if (0 < (dbg = opal_output_get_verbosity(opal_pmix_base_framework.framework_output))) {
|
||||||
|
asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg);
|
||||||
|
putenv(dbgvalue);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* convert the list to an array of pmix_info_t */
|
||||||
|
if (NULL != info) {
|
||||||
|
sz = opal_list_get_size(info);
|
||||||
|
PMIX_INFO_CREATE(pinfo, sz);
|
||||||
|
n = 0;
|
||||||
|
OPAL_LIST_FOREACH(kv, info, opal_value_t) {
|
||||||
|
(void)strncpy(pinfo[n].key, kv->key, PMIX_MAX_KEYLEN);
|
||||||
|
pmix3x_value_load(&pinfo[n].value, kv);
|
||||||
|
++n;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
sz = 0;
|
||||||
|
pinfo = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* insert ourselves into our list of jobids - it will be the
|
||||||
|
* first, and so we'll check it first */
|
||||||
|
job = OBJ_NEW(opal_pmix3x_jobid_trkr_t);
|
||||||
|
(void)opal_snprintf_jobid(job->nspace, PMIX_MAX_NSLEN, OPAL_PROC_MY_NAME.jobid);
|
||||||
|
job->jobid = OPAL_PROC_MY_NAME.jobid;
|
||||||
|
opal_list_append(&mca_pmix_pmix3x_component.jobids, &job->super);
|
||||||
|
|
||||||
|
if (PMIX_SUCCESS != (rc = PMIx_server_init(&mymodule, pinfo, sz))) {
|
||||||
|
PMIX_INFO_FREE(pinfo, sz);
|
||||||
|
return pmix3x_convert_rc(rc);
|
||||||
|
}
|
||||||
|
PMIX_INFO_FREE(pinfo, sz);
|
||||||
|
|
||||||
|
/* record the host module */
|
||||||
|
host_module = module;
|
||||||
|
|
||||||
|
/* register the default event handler */
|
||||||
|
active = true;
|
||||||
|
PMIx_Register_event_handler(NULL, 0, NULL, 0, pmix3x_event_hdlr, errreg_cbfunc, (void*)&active);
|
||||||
|
PMIX_WAIT_FOR_COMPLETION(active);
|
||||||
|
|
||||||
|
return OPAL_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void fincb(pmix_status_t status, void *cbdata)
|
||||||
|
{
|
||||||
|
volatile bool *active = (volatile bool*)cbdata;
|
||||||
|
*active = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
int pmix3x_server_finalize(void)
|
||||||
|
{
|
||||||
|
pmix_status_t rc;
|
||||||
|
volatile bool active;
|
||||||
|
|
||||||
|
/* deregister the default event handler */
|
||||||
|
active = true;
|
||||||
|
PMIx_Deregister_event_handler(errhdler_ref, fincb, (void*)&active);
|
||||||
|
PMIX_WAIT_FOR_COMPLETION(active);
|
||||||
|
|
||||||
|
rc = PMIx_server_finalize();
|
||||||
|
return pmix3x_convert_rc(rc);
|
||||||
|
}
|
||||||
|
|
||||||
|
int pmix3x_server_gen_regex(const char *input, char **regex)
|
||||||
|
{
|
||||||
|
pmix_status_t rc;
|
||||||
|
|
||||||
|
rc = PMIx_generate_regex(input, regex);
|
||||||
|
return pmix3x_convert_rc(rc);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int pmix3x_server_gen_ppn(const char *input, char **ppn)
|
||||||
|
{
|
||||||
|
pmix_status_t rc;
|
||||||
|
|
||||||
|
rc = PMIx_generate_ppn(input, ppn);
|
||||||
|
return pmix3x_convert_rc(rc);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void opcbfunc(pmix_status_t status, void *cbdata)
|
||||||
|
{
|
||||||
|
pmix3x_opcaddy_t *op = (pmix3x_opcaddy_t*)cbdata;
|
||||||
|
|
||||||
|
if (NULL != op->opcbfunc) {
|
||||||
|
op->opcbfunc(pmix3x_convert_rc(status), op->cbdata);
|
||||||
|
}
|
||||||
|
if (op->active) {
|
||||||
|
op->status = status;
|
||||||
|
op->active = false;
|
||||||
|
} else {
|
||||||
|
OBJ_RELEASE(op);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void _reg_nspace(int sd, short args, void *cbdata)
|
||||||
|
{
|
||||||
|
pmix3x_threadshift_t *cd = (pmix3x_threadshift_t*)cbdata;
|
||||||
|
opal_value_t *kv, *k2;
|
||||||
|
pmix_info_t *pinfo = NULL, *pmap;
|
||||||
|
size_t sz, szmap, m, n;
|
||||||
|
char nspace[PMIX_MAX_NSLEN];
|
||||||
|
pmix_status_t rc;
|
||||||
|
opal_list_t *pmapinfo;
|
||||||
|
opal_pmix3x_jobid_trkr_t *job;
|
||||||
|
pmix3x_opcaddy_t op;
|
||||||
|
|
||||||
|
/* we must threadshift this request as we might not be in an event
|
||||||
|
* and we are going to access framework-global lists/objects */
|
||||||
|
|
||||||
|
/* convert the jobid */
|
||||||
|
(void)opal_snprintf_jobid(nspace, PMIX_MAX_NSLEN, cd->jobid);
|
||||||
|
|
||||||
|
/* store this job in our list of known nspaces */
|
||||||
|
job = OBJ_NEW(opal_pmix3x_jobid_trkr_t);
|
||||||
|
(void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN);
|
||||||
|
job->jobid = cd->jobid;
|
||||||
|
opal_list_append(&mca_pmix_pmix3x_component.jobids, &job->super);
|
||||||
|
|
||||||
|
/* convert the list to an array of pmix_info_t */
|
||||||
|
if (NULL != cd->info) {
|
||||||
|
sz = opal_list_get_size(cd->info);
|
||||||
|
PMIX_INFO_CREATE(pinfo, sz);
|
||||||
|
n = 0;
|
||||||
|
OPAL_LIST_FOREACH(kv, cd->info, opal_value_t) {
|
||||||
|
(void)strncpy(pinfo[n].key, kv->key, PMIX_MAX_KEYLEN);
|
||||||
|
if (0 == strcmp(kv->key, OPAL_PMIX_PROC_DATA)) {
|
||||||
|
pinfo[n].value.type = PMIX_DATA_ARRAY;
|
||||||
|
/* the value contains a list of values - convert
|
||||||
|
* that list to another array */
|
||||||
|
pmapinfo = (opal_list_t*)kv->data.ptr;
|
||||||
|
szmap = opal_list_get_size(pmapinfo);
|
||||||
|
PMIX_INFO_CREATE(pmap, szmap);
|
||||||
|
pinfo[n].value.data.darray = (pmix_data_array_t*)calloc(1, sizeof(pmix_data_array_t));
|
||||||
|
pinfo[n].value.data.darray->type = PMIX_INFO;
|
||||||
|
pinfo[n].value.data.darray->array = (struct pmix_info_t*)pmap;
|
||||||
|
pinfo[n].value.data.darray->size = szmap;
|
||||||
|
m = 0;
|
||||||
|
OPAL_LIST_FOREACH(k2, pmapinfo, opal_value_t) {
|
||||||
|
(void)strncpy(pmap[m].key, k2->key, PMIX_MAX_KEYLEN);
|
||||||
|
pmix3x_value_load(&pmap[m].value, k2);
|
||||||
|
++m;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
pmix3x_value_load(&pinfo[n].value, kv);
|
||||||
|
}
|
||||||
|
++n;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
sz = 0;
|
||||||
|
pinfo = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
OBJ_CONSTRUCT(&op, pmix3x_opcaddy_t);
|
||||||
|
op.active = true;
|
||||||
|
rc = PMIx_server_register_nspace(nspace, cd->status, pinfo, sz,
|
||||||
|
opcbfunc, (void*)&op);
|
||||||
|
if (PMIX_SUCCESS == rc) {
|
||||||
|
PMIX_WAIT_FOR_COMPLETION(op.active);
|
||||||
|
} else {
|
||||||
|
op.status = rc;
|
||||||
|
}
|
||||||
|
/* ensure we execute the cbfunc so the caller doesn't hang */
|
||||||
|
if (NULL != cd->opcbfunc) {
|
||||||
|
cd->opcbfunc(pmix3x_convert_rc(op.status), cd->cbdata);
|
||||||
|
}
|
||||||
|
if (NULL != pinfo) {
|
||||||
|
PMIX_INFO_FREE(pinfo, sz);
|
||||||
|
}
|
||||||
|
OBJ_DESTRUCT(&op);
|
||||||
|
OBJ_RELEASE(cd);
|
||||||
|
}
|
||||||
|
|
||||||
|
int pmix3x_server_register_nspace(opal_jobid_t jobid,
|
||||||
|
int nlocalprocs,
|
||||||
|
opal_list_t *info,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc,
|
||||||
|
void *cbdata)
|
||||||
|
{
|
||||||
|
pmix3x_threadshift_t *cd;
|
||||||
|
|
||||||
|
/* we must threadshift this request as it touches
|
||||||
|
* shared lists of objects */
|
||||||
|
cd = OBJ_NEW(pmix3x_threadshift_t);
|
||||||
|
cd->jobid = jobid;
|
||||||
|
cd->status = nlocalprocs;
|
||||||
|
cd->info = info;
|
||||||
|
cd->opcbfunc = cbfunc;
|
||||||
|
cd->cbdata = cbdata;
|
||||||
|
/* if the cbfunc is NULL, then the caller is in an event
|
||||||
|
* and we can directly call the processing function */
|
||||||
|
if (NULL == cbfunc) {
|
||||||
|
_reg_nspace(0, 0, cd);
|
||||||
|
} else {
|
||||||
|
event_assign(&cd->ev, opal_pmix_base.evbase,
|
||||||
|
-1, EV_WRITE, _reg_nspace, cd);
|
||||||
|
event_active(&cd->ev, EV_WRITE, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return OPAL_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void tdcbfunc(pmix_status_t status, void *cbdata)
|
||||||
|
{
|
||||||
|
pmix3x_threadshift_t *cd = (pmix3x_threadshift_t*)cbdata;
|
||||||
|
|
||||||
|
if (NULL != cd->opcbfunc) {
|
||||||
|
cd->opcbfunc(pmix3x_convert_rc(status), cd->cbdata);
|
||||||
|
}
|
||||||
|
if (cd->active) {
|
||||||
|
cd->active = false;
|
||||||
|
} else {
|
||||||
|
OBJ_RELEASE(cd);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void _dereg_nspace(int sd, short args, void *cbdata)
|
||||||
|
{
|
||||||
|
pmix3x_threadshift_t *cd = (pmix3x_threadshift_t*)cbdata;
|
||||||
|
opal_pmix3x_jobid_trkr_t *jptr;
|
||||||
|
|
||||||
|
/* if we don't already have it, we can ignore this */
|
||||||
|
OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix3x_component.jobids, opal_pmix3x_jobid_trkr_t) {
|
||||||
|
if (jptr->jobid == cd->jobid) {
|
||||||
|
/* found it - tell the server to deregister */
|
||||||
|
cd->active = true;
|
||||||
|
PMIx_server_deregister_nspace(jptr->nspace, tdcbfunc, cd);
|
||||||
|
PMIX_WAIT_FOR_COMPLETION(cd->active);
|
||||||
|
OBJ_RELEASE(cd);
|
||||||
|
/* now get rid of it from our list */
|
||||||
|
opal_list_remove_item(&mca_pmix_pmix3x_component.jobids, &jptr->super);
|
||||||
|
OBJ_RELEASE(jptr);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* must release the caller */
|
||||||
|
tdcbfunc(PMIX_ERR_NOT_FOUND, cd);
|
||||||
|
}
|
||||||
|
|
||||||
|
void pmix3x_server_deregister_nspace(opal_jobid_t jobid,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc,
|
||||||
|
void *cbdata)
|
||||||
|
{
|
||||||
|
pmix3x_threadshift_t *cd;
|
||||||
|
|
||||||
|
/* we must threadshift this request as it touches
|
||||||
|
* shared lists of objects */
|
||||||
|
cd = OBJ_NEW(pmix3x_threadshift_t);
|
||||||
|
cd->jobid = jobid;
|
||||||
|
cd->opcbfunc = cbfunc;
|
||||||
|
cd->cbdata = cbdata;
|
||||||
|
if (NULL == cbfunc) {
|
||||||
|
_dereg_nspace(0, 0, cd);
|
||||||
|
} else {
|
||||||
|
event_assign(&cd->ev, opal_pmix_base.evbase,
|
||||||
|
-1, EV_WRITE, _dereg_nspace, cd);
|
||||||
|
event_active(&cd->ev, EV_WRITE, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int pmix3x_server_register_client(const opal_process_name_t *proc,
|
||||||
|
uid_t uid, gid_t gid,
|
||||||
|
void *server_object,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc,
|
||||||
|
void *cbdata)
|
||||||
|
{
|
||||||
|
pmix_status_t rc;
|
||||||
|
pmix_proc_t p;
|
||||||
|
pmix3x_opcaddy_t op;
|
||||||
|
|
||||||
|
/* convert the jobid */
|
||||||
|
(void)opal_snprintf_jobid(p.nspace, PMIX_MAX_NSLEN, proc->jobid);
|
||||||
|
p.rank = pmix3x_convert_opalrank(proc->vpid);
|
||||||
|
|
||||||
|
OBJ_CONSTRUCT(&op, pmix3x_opcaddy_t);
|
||||||
|
op.active = true;
|
||||||
|
rc = PMIx_server_register_client(&p, uid, gid, server_object,
|
||||||
|
opcbfunc, (void*)&op);
|
||||||
|
if (PMIX_SUCCESS == rc) {
|
||||||
|
PMIX_WAIT_FOR_COMPLETION(op.active);
|
||||||
|
rc = op.status;
|
||||||
|
}
|
||||||
|
OBJ_DESTRUCT(&op);
|
||||||
|
return pmix3x_convert_rc(rc);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void _dereg_client(int sd, short args, void *cbdata)
|
||||||
|
{
|
||||||
|
pmix3x_threadshift_t *cd = (pmix3x_threadshift_t*)cbdata;
|
||||||
|
opal_pmix3x_jobid_trkr_t *jptr;
|
||||||
|
pmix_proc_t p;
|
||||||
|
|
||||||
|
/* if we don't already have it, we can ignore this */
|
||||||
|
OPAL_LIST_FOREACH(jptr, &mca_pmix_pmix3x_component.jobids, opal_pmix3x_jobid_trkr_t) {
|
||||||
|
if (jptr->jobid == cd->source->jobid) {
|
||||||
|
/* found it - tell the server to deregister */
|
||||||
|
(void)strncpy(p.nspace, jptr->nspace, PMIX_MAX_NSLEN);
|
||||||
|
p.rank = pmix3x_convert_opalrank(cd->source->vpid);
|
||||||
|
cd->active = true;
|
||||||
|
PMIx_server_deregister_client(&p, tdcbfunc, (void*)cd);
|
||||||
|
PMIX_WAIT_FOR_COMPLETION(cd->active);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
OBJ_RELEASE(cd);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* tell the local PMIx server to cleanup this client as it is
|
||||||
|
* done executing */
|
||||||
|
void pmix3x_server_deregister_client(const opal_process_name_t *proc,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc,
|
||||||
|
void *cbdata)
|
||||||
|
{
|
||||||
|
pmix3x_threadshift_t *cd;
|
||||||
|
|
||||||
|
/* we must threadshift this request as we might not be in an event
|
||||||
|
* and we are going to access framework-global lists/objects */
|
||||||
|
cd = OBJ_NEW(pmix3x_threadshift_t);
|
||||||
|
cd->source = proc;
|
||||||
|
cd->opcbfunc = cbfunc;
|
||||||
|
cd->cbdata = cbdata;
|
||||||
|
if (NULL == cbfunc) {
|
||||||
|
_dereg_client(0, 0, cd);
|
||||||
|
} else {
|
||||||
|
event_assign(&cd->ev, opal_pmix_base.evbase,
|
||||||
|
-1, EV_WRITE, _dereg_client, cd);
|
||||||
|
event_active(&cd->ev, EV_WRITE, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* have the local PMIx server setup the environment for this client */
|
||||||
|
int pmix3x_server_setup_fork(const opal_process_name_t *proc, char ***env)
|
||||||
|
{
|
||||||
|
pmix_status_t rc;
|
||||||
|
pmix_proc_t p;
|
||||||
|
|
||||||
|
/* convert the jobid */
|
||||||
|
(void)opal_snprintf_jobid(p.nspace, PMIX_MAX_NSLEN, proc->jobid);
|
||||||
|
p.rank = pmix3x_convert_opalrank(proc->vpid);
|
||||||
|
|
||||||
|
rc = PMIx_server_setup_fork(&p, env);
|
||||||
|
return pmix3x_convert_rc(rc);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* this is the call back up from the embedded PMIx server that
|
||||||
|
* will contain the returned data. Note that the embedded server
|
||||||
|
* "owns" the data and will free it upon return from this function */
|
||||||
|
static void dmdx_response(pmix_status_t status, char *data, size_t sz, void *cbdata)
|
||||||
|
{
|
||||||
|
int rc;
|
||||||
|
pmix3x_opcaddy_t *op = (pmix3x_opcaddy_t*)cbdata;
|
||||||
|
|
||||||
|
rc = pmix3x_convert_rc(status);
|
||||||
|
if (NULL != op->mdxcbfunc) {
|
||||||
|
op->mdxcbfunc(rc, data, sz, op->cbdata, NULL, NULL);
|
||||||
|
}
|
||||||
|
OBJ_RELEASE(op);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* request modex data for a local proc from the PMIx server */
|
||||||
|
int pmix3x_server_dmodex(const opal_process_name_t *proc,
|
||||||
|
opal_pmix_modex_cbfunc_t cbfunc, void *cbdata)
|
||||||
|
{
|
||||||
|
pmix3x_opcaddy_t *op;
|
||||||
|
pmix_status_t rc;
|
||||||
|
|
||||||
|
/* setup the caddy */
|
||||||
|
op = OBJ_NEW(pmix3x_opcaddy_t);
|
||||||
|
op->mdxcbfunc = cbfunc;
|
||||||
|
op->cbdata = cbdata;
|
||||||
|
|
||||||
|
/* convert the jobid */
|
||||||
|
(void)opal_snprintf_jobid(op->p.nspace, PMIX_MAX_NSLEN, proc->jobid);
|
||||||
|
op->p.rank = pmix3x_convert_opalrank(proc->vpid);
|
||||||
|
|
||||||
|
/* find the internally-cached data for this proc */
|
||||||
|
rc = PMIx_server_dmodex_request(&op->p, dmdx_response, op);
|
||||||
|
if (PMIX_SUCCESS != rc) {
|
||||||
|
OBJ_RELEASE(op);
|
||||||
|
}
|
||||||
|
return pmix3x_convert_rc(rc);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* tell the PMIx server to notify its local clients of an event */
|
||||||
|
int pmix3x_server_notify_event(int status,
|
||||||
|
const opal_process_name_t *source,
|
||||||
|
opal_list_t *info,
|
||||||
|
opal_pmix_op_cbfunc_t cbfunc, void *cbdata)
|
||||||
|
{
|
||||||
|
opal_value_t *kv;
|
||||||
|
pmix_info_t *pinfo;
|
||||||
|
size_t sz, n;
|
||||||
|
pmix_status_t rc;
|
||||||
|
pmix3x_opcaddy_t *op;
|
||||||
|
|
||||||
|
/* convert the list to an array of pmix_info_t */
|
||||||
|
if (NULL != info) {
|
||||||
|
sz = opal_list_get_size(info);
|
||||||
|
PMIX_INFO_CREATE(pinfo, sz);
|
||||||
|
n = 0;
|
||||||
|
OPAL_LIST_FOREACH(kv, info, opal_value_t) {
|
||||||
|
(void)strncpy(pinfo[n].key, kv->key, PMIX_MAX_KEYLEN);
|
||||||
|
pmix3x_value_load(&pinfo[n].value, kv);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
sz = 0;
|
||||||
|
pinfo = NULL;
|
||||||
|
}
|
||||||
|
/* setup the caddy */
|
||||||
|
op = OBJ_NEW(pmix3x_opcaddy_t);
|
||||||
|
op->info = pinfo;
|
||||||
|
op->sz = sz;
|
||||||
|
op->opcbfunc = cbfunc;
|
||||||
|
op->cbdata = cbdata;
|
||||||
|
/* convert the jobid */
|
||||||
|
if (NULL == source) {
|
||||||
|
(void)opal_snprintf_jobid(op->p.nspace, PMIX_MAX_NSLEN, OPAL_JOBID_INVALID);
|
||||||
|
op->p.rank = pmix3x_convert_opalrank(OPAL_VPID_INVALID);
|
||||||
|
} else {
|
||||||
|
(void)opal_snprintf_jobid(op->p.nspace, PMIX_MAX_NSLEN, source->jobid);
|
||||||
|
op->p.rank = pmix3x_convert_opalrank(source->vpid);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
rc = pmix3x_convert_opalrc(status);
|
||||||
|
/* the range is irrelevant here as the server is passing
|
||||||
|
* the event down to its local clients */
|
||||||
|
rc = PMIx_Notify_event(rc, &op->p, PMIX_RANGE_LOCAL,
|
||||||
|
pinfo, sz, opcbfunc, op);
|
||||||
|
if (PMIX_SUCCESS != rc) {
|
||||||
|
OBJ_RELEASE(op);
|
||||||
|
}
|
||||||
|
return pmix3x_convert_rc(rc);
|
||||||
|
}
|
||||||
@ -77,18 +77,8 @@ AC_DEFUN([MCA_opal_pmix_pmix3x_CONFIG],[
|
|||||||
# distclean" infrastructure to work properly).
|
# distclean" infrastructure to work properly).
|
||||||
AC_MSG_CHECKING([if v3.x component is to be used])
|
AC_MSG_CHECKING([if v3.x component is to be used])
|
||||||
AS_IF([test "$opal_external_pmix_happy" = "yes"],
|
AS_IF([test "$opal_external_pmix_happy" = "yes"],
|
||||||
[AS_IF([test "$opal_external_pmix_version" = "3X"],
|
[AC_MSG_RESULT([no - disqualifying this component])
|
||||||
[AC_MSG_RESULT([yes - using an external v3.x library])
|
opal_pmix_pmix3x_happy=0],
|
||||||
# Build flags for our Makefile.am
|
|
||||||
opal_pmix_pmix3x_CPPFLAGS=$opal_external_pmix_CPPFLAGS
|
|
||||||
opal_pmix_pmix3x_LDFLAGS=$opal_external_pmix_LDFLAGS
|
|
||||||
opal_pmix_pmix3x_LIBS=$opal_external_pmix_LIBS
|
|
||||||
opal_pmix_pmix3x_DEPENDENCIES=
|
|
||||||
# setup wrapper flags
|
|
||||||
pmix_pmix3x_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
|
|
||||||
pmix_pmix3x_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
|
|
||||||
[AC_MSG_RESULT([no - disqualifying this component])
|
|
||||||
opal_pmix_pmix3x_happy=0])],
|
|
||||||
[AC_MSG_RESULT([yes - using the internal v3.x library])
|
[AC_MSG_RESULT([yes - using the internal v3.x library])
|
||||||
# Build flags for our Makefile.am
|
# Build flags for our Makefile.am
|
||||||
opal_pmix_pmix3x_LDFLAGS=
|
opal_pmix_pmix3x_LDFLAGS=
|
||||||
|
|||||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Загрузка…
x
Ссылка в новой задаче
Block a user