From 43700faba18b7555d7e79e1a5391d7cfd5ca2075 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 31 Jan 2018 23:45:42 +0900 Subject: [PATCH] pmix/ext3x: remove autogenerated ext3x.h header file This header file was meant to be autogenerated, and for some reasons, was never removed from the repository. Update .gitignore as well Signed-off-by: Gilles Gouaillardet --- .gitignore | 1 + opal/mca/pmix/ext3x/ext3x.h | 346 ------------------------------------ 2 files changed, 1 insertion(+), 346 deletions(-) delete mode 100644 opal/mca/pmix/ext3x/ext3x.h diff --git a/.gitignore b/.gitignore index 846095eda0..71ea6928eb 100644 --- a/.gitignore +++ b/.gitignore @@ -337,6 +337,7 @@ opal/mca/pmix/pmix*/pmix/examples/server opal/mca/pmix/pmix*/pmix/examples/tool opal/mca/pmix/ext3x/ext3x.c +opal/mca/pmix/ext3x/ext3x.h opal/mca/pmix/ext3x/ext3x_client.c opal/mca/pmix/ext3x/ext3x_component.c opal/mca/pmix/ext3x/ext3x_server_north.c diff --git a/opal/mca/pmix/ext3x/ext3x.h b/opal/mca/pmix/ext3x/ext3x.h deleted file mode 100644 index 53929f0743..0000000000 --- a/opal/mca/pmix/ext3x/ext3x.h +++ /dev/null @@ -1,346 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ -/* - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2015 Mellanox Technologies, Inc. - * All rights reserved. - * Copyright (c) 2016-2018 Research Organization for Information Science - * and Technology (RIST). All rights reserved. - * Copyright (c) 2017 Los Alamos National Security, LLC. 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 -#endif -#ifdef HAVE_SYS_UN_H -#include -#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/base/base.h" -#include "pmix_server.h" -#include "pmix_common.h" - -BEGIN_C_DECLS - -#ifdef OPAL_C_HAVE_VISIBILITY -#define PMIX_HAVE_VISIBILITY 1 -#else -#undef PMIX_HAVE_VISIBILITY -#endif - -typedef struct { - opal_pmix_base_component_t super; - pmix_proc_t myproc; - opal_list_t jobids; - bool native_launch; - size_t evindex; - opal_list_t events; - int cache_size; - opal_list_t cache; - opal_list_t dmdx; - bool silence_warning; -} mca_pmix_ext3x_component_t; - -OPAL_DECLSPEC extern mca_pmix_ext3x_component_t mca_pmix_ext3x_component; - -OPAL_DECLSPEC extern const opal_pmix_base_module_t opal_pmix_ext3x_module; - -/**** INTERNAL OBJECTS ****/ -typedef struct { - opal_list_item_t super; - opal_jobid_t jobid; - char nspace[PMIX_MAX_NSLEN + 1]; -} opal_ext3x_jobid_trkr_t; -OBJ_CLASS_DECLARATION(opal_ext3x_jobid_trkr_t); - -typedef struct { - opal_list_item_t super; - opal_pmix_lock_t lock; - size_t index; - opal_pmix_notification_fn_t handler; - void *cbdata; -} opal_ext3x_event_t; -OBJ_CLASS_DECLARATION(opal_ext3x_event_t); - -typedef struct { - opal_list_item_t super; - char *nspace; - pmix_modex_cbfunc_t cbfunc; - void *cbdata; -} opal_ext3x_dmx_trkr_t; -OBJ_CLASS_DECLARATION(opal_ext3x_dmx_trkr_t); - -typedef struct { - opal_object_t super; - opal_event_t ev; - pmix_status_t status; - char *nspace; - pmix_proc_t p; - pmix_proc_t *procs; - size_t nprocs; - pmix_pdata_t *pdata; - size_t npdata; - pmix_proc_t *error_procs; - size_t nerror_procs; - pmix_info_t *info; - size_t ninfo; - pmix_app_t *apps; - size_t sz; - opal_pmix_lock_t lock; - opal_list_t *codes; - pmix_status_t *pcodes; - size_t ncodes; - pmix_query_t *queries; - size_t nqueries; - opal_ext3x_event_t *event; - 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; - opal_pmix_evhandler_reg_cbfunc_t evregcbfunc; - opal_pmix_info_cbfunc_t qcbfunc; - void *cbdata; -} ext3x_opcaddy_t; -OBJ_CLASS_DECLARATION(ext3x_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; - pmix_connect_cbfunc_t cnctcbfunc; - void *cbdata; - opal_pmix_release_cbfunc_t odmdxfunc; - void *ocbdata; -} ext3x_opalcaddy_t; -OBJ_CLASS_DECLARATION(ext3x_opalcaddy_t); - -typedef struct { - opal_object_t super; - opal_event_t ev; - opal_pmix_lock_t lock; - const char *msg; - char *strings; - 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_value_t *val; - opal_list_t *event_codes; - opal_list_t *info; - opal_list_t results; - opal_pmix_notification_fn_t evhandler; - opal_pmix_evhandler_reg_cbfunc_t cbfunc; - opal_pmix_op_cbfunc_t opcbfunc; - pmix_event_notification_cbfunc_fn_t pmixcbfunc; - opal_pmix_value_cbfunc_t valcbfunc; - opal_pmix_lookup_cbfunc_t lkcbfunc; - void *cbdata; -} ext3x_threadshift_t; -OBJ_CLASS_DECLARATION(ext3x_threadshift_t); - -#define OPAL_PMIX_OP_THREADSHIFT(e, fn, cb, cd) \ - do { \ - ext3x_threadshift_t *_cd; \ - _cd = OBJ_NEW(ext3x_threadshift_t); \ - _cd->handler = (e); \ - _cd->opcbfunc = (cb); \ - _cd->cbdata = (cd); \ - opal_event_assign(&((_cd)->ev), opal_pmix_base.evbase, \ - -1, EV_WRITE, (fn), (_cd)); \ - OPAL_POST_OBJECT(_cd); \ - opal_event_active(&((_cd)->ev), EV_WRITE, 1); \ - } while(0) - -#define OPAL_PMIX_THREADSHIFT(e, i, eh, fn, cb, cd) \ - do { \ - ext3x_threadshift_t *_cd; \ - _cd = OBJ_NEW(ext3x_threadshift_t); \ - _cd->event_codes = (e); \ - _cd->info = (i); \ - _cd->evhandler = (eh); \ - _cd->cbfunc = (cb); \ - _cd->cbdata = (cd); \ - opal_event_assign(&((_cd)->ev), opal_pmix_base.evbase, \ - -1, EV_WRITE, (fn), (_cd)); \ - OPAL_POST_OBJECT(_cd); \ - opal_event_active(&((_cd)->ev), EV_WRITE, 1); \ - } while(0) - -#define OPAL_PMIX_NOTIFY_THREADSHIFT(s, sr, r, i, fn, cb, cd) \ - do { \ - ext3x_threadshift_t *_cd; \ - _cd = OBJ_NEW(ext3x_threadshift_t); \ - _cd->status = (s); \ - _cd->source = (sr); \ - _cd->range = (r); \ - _cd->info = (i); \ - _cd->opcbfunc = (cb); \ - _cd->cbdata = (cd); \ - opal_event_assign(&((_cd)->ev), opal_pmix_base.evbase, \ - -1, EV_WRITE, (fn), (_cd)); \ - OPAL_POST_OBJECT(_cd); \ - opal_event_active(&((_cd)->ev), EV_WRITE, 1); \ - } while(0) - -#define OPAL_PMIX2X_THREADSHIFT(p, cb) \ - do { \ - opal_event_assign(&((p)->ev), opal_pmix_base.evbase, \ - -1, EV_WRITE, (cb), (p)); \ - OPAL_POST_OBJECT(p); \ - opal_event_active(&((p)->ev), EV_WRITE, 1); \ - } while(0) - -/**** CLIENT FUNCTIONS ****/ -OPAL_MODULE_DECLSPEC int ext3x_client_init(opal_list_t *ilist); -OPAL_MODULE_DECLSPEC int ext3x_client_finalize(void); -OPAL_MODULE_DECLSPEC int ext3x_initialized(void); -OPAL_MODULE_DECLSPEC int ext3x_abort(int flag, const char *msg, - opal_list_t *procs); -OPAL_MODULE_DECLSPEC int ext3x_commit(void); -OPAL_MODULE_DECLSPEC int ext3x_fence(opal_list_t *procs, int collect_data); -OPAL_MODULE_DECLSPEC int ext3x_fencenb(opal_list_t *procs, int collect_data, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata); -OPAL_MODULE_DECLSPEC int ext3x_put(opal_pmix_scope_t scope, - opal_value_t *val); -OPAL_MODULE_DECLSPEC int ext3x_get(const opal_process_name_t *proc, const char *key, - opal_list_t *info, opal_value_t **val); -OPAL_MODULE_DECLSPEC int ext3x_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 ext3x_publish(opal_list_t *info); -OPAL_MODULE_DECLSPEC int ext3x_publishnb(opal_list_t *info, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata); -OPAL_MODULE_DECLSPEC int ext3x_lookup(opal_list_t *data, opal_list_t *info); -OPAL_MODULE_DECLSPEC int ext3x_lookupnb(char **keys, opal_list_t *info, - opal_pmix_lookup_cbfunc_t cbfunc, void *cbdata); -OPAL_MODULE_DECLSPEC int ext3x_unpublish(char **keys, opal_list_t *info); -OPAL_MODULE_DECLSPEC int ext3x_unpublishnb(char **keys, opal_list_t *info, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata); -OPAL_MODULE_DECLSPEC int ext3x_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid); -OPAL_MODULE_DECLSPEC int ext3x_spawnnb(opal_list_t *job_info, opal_list_t *apps, - opal_pmix_spawn_cbfunc_t cbfunc, void *cbdata); -OPAL_MODULE_DECLSPEC int ext3x_connect(opal_list_t *procs); -OPAL_MODULE_DECLSPEC int ext3x_connectnb(opal_list_t *procs, - opal_pmix_op_cbfunc_t cbfunc, - void *cbdata); -OPAL_MODULE_DECLSPEC int ext3x_disconnect(opal_list_t *procs); -OPAL_MODULE_DECLSPEC int ext3x_disconnectnb(opal_list_t *procs, - opal_pmix_op_cbfunc_t cbfunc, - void *cbdata); -OPAL_MODULE_DECLSPEC int ext3x_resolve_peers(const char *nodename, opal_jobid_t jobid, - opal_list_t *procs); -OPAL_MODULE_DECLSPEC int ext3x_resolve_nodes(opal_jobid_t jobid, char **nodelist); -OPAL_MODULE_DECLSPEC int ext3x_allocate(opal_pmix_alloc_directive_t directive, - opal_list_t *info, - opal_pmix_info_cbfunc_t cbfunc, void *cbdata); -OPAL_MODULE_DECLSPEC int ext3x_job_control(opal_list_t *targets, - opal_list_t *directives, - opal_pmix_info_cbfunc_t cbfunc, void *cbdata); - -/**** TOOL FUNCTIONS ****/ -OPAL_MODULE_DECLSPEC int ext3x_tool_init(opal_list_t *info); -OPAL_MODULE_DECLSPEC int ext3x_tool_fini(void); - -/**** COMMON FUNCTIONS ****/ -OPAL_MODULE_DECLSPEC int ext3x_store_local(const opal_process_name_t *proc, - opal_value_t *val); - -/**** SERVER SOUTHBOUND FUNCTIONS ****/ -OPAL_MODULE_DECLSPEC int ext3x_server_init(opal_pmix_server_module_t *module, - opal_list_t *info); -OPAL_MODULE_DECLSPEC int ext3x_server_finalize(void); -OPAL_MODULE_DECLSPEC int ext3x_server_gen_regex(const char *input, char **regex); -OPAL_MODULE_DECLSPEC int ext3x_server_gen_ppn(const char *input, char **ppn); -OPAL_MODULE_DECLSPEC int ext3x_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 ext3x_server_deregister_nspace(opal_jobid_t jobid, - opal_pmix_op_cbfunc_t cbfunc, - void *cbdata); -OPAL_MODULE_DECLSPEC int ext3x_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 ext3x_server_deregister_client(const opal_process_name_t *proc, - opal_pmix_op_cbfunc_t cbfunc, - void *cbdata); -OPAL_MODULE_DECLSPEC int ext3x_server_setup_fork(const opal_process_name_t *proc, char ***env); -OPAL_MODULE_DECLSPEC int ext3x_server_dmodex(const opal_process_name_t *proc, - opal_pmix_modex_cbfunc_t cbfunc, void *cbdata); -OPAL_MODULE_DECLSPEC int ext3x_server_notify_event(int status, - const opal_process_name_t *source, - opal_list_t *info, - opal_pmix_op_cbfunc_t cbfunc, void *cbdata); - -OPAL_MODULE_DECLSPEC int ext3x_server_iof_push(const opal_process_name_t *source, - opal_pmix_iof_channel_t channel, - unsigned char *data, size_t nbytes); - - -/**** COMPONENT UTILITY FUNCTIONS ****/ -OPAL_MODULE_DECLSPEC int opal_pmix_ext3x_check_evars(void); - -OPAL_MODULE_DECLSPEC void ext3x_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 ext3x_convert_opalrc(int rc); -OPAL_MODULE_DECLSPEC int ext3x_convert_rc(pmix_status_t rc); - -OPAL_MODULE_DECLSPEC opal_vpid_t ext3x_convert_rank(pmix_rank_t rank); -OPAL_MODULE_DECLSPEC pmix_rank_t ext3x_convert_opalrank(opal_vpid_t vpid); - -OPAL_MODULE_DECLSPEC opal_pmix_scope_t ext3x_convert_scope(pmix_scope_t scope); -OPAL_MODULE_DECLSPEC pmix_scope_t ext3x_convert_opalscope(opal_pmix_scope_t scope); - -OPAL_MODULE_DECLSPEC pmix_data_range_t ext3x_convert_opalrange(opal_pmix_data_range_t range); -OPAL_MODULE_DECLSPEC opal_pmix_data_range_t ext3x_convert_range(pmix_data_range_t range); - -OPAL_MODULE_DECLSPEC opal_pmix_persistence_t ext3x_convert_persist(pmix_persistence_t scope); -OPAL_MODULE_DECLSPEC pmix_persistence_t ext3x_convert_opalpersist(opal_pmix_persistence_t scope); - -OPAL_MODULE_DECLSPEC void ext3x_value_load(pmix_value_t *v, - opal_value_t *kv); -OPAL_MODULE_DECLSPEC int ext3x_value_unload(opal_value_t *kv, - const pmix_value_t *v); - -OPAL_MODULE_DECLSPEC opal_pmix_alloc_directive_t ext3x_convert_allocdir(pmix_alloc_directive_t dir); - -OPAL_MODULE_DECLSPEC char* ext3x_convert_jobid(opal_jobid_t jobid); - -END_C_DECLS - -#endif /* MCA_PMIX_EXTERNAL_H */