Merge pull request #4760 from rhc54/topic/map

Correct mapping errors

Author: Ralph Castain

opal/mca/pmix/pmix3x/pmix/VERSION

@@ -30,7 +30,7 @@ greek=
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git3bd2b2d
+repo_rev=gitefa7fe7
 
 # If tarball_version is not empty, it is used as the version string in
 # the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Feb 03, 2018"
+date="Feb 07, 2018"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix3x/pmix/contrib/pmix-valgrind.supp

@@ -1,6 +1,6 @@
 # -*- text -*-
 #
-# Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
+# Copyright (c) 2015      Intel, Inc. All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow

opal/mca/pmix/pmix3x/pmix/examples/debuggerd.c

@@ -13,7 +13,7 @@
  *                         All rights reserved.
  * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
  * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
@@ -41,7 +41,6 @@ typedef struct {
 } myquery_data_t;
 
 
-static volatile bool waiting_for_debugger = true;
 static pmix_proc_t myproc;
 
 /* this is a callback function for the PMIx_Query
@@ -134,11 +133,6 @@ int main(int argc, char **argv)
     size_t nq, n;
     myquery_data_t myquery_data;
 
-fprintf(stderr, "I AM HERE\n");
-fflush(stderr);
-    sleep(10);
-    exit(0);
-
     /* init us - since we were launched by the RM, our connection info
      * will have been provided at startup. */
     if (PMIX_SUCCESS != (rc = PMIx_tool_init(&myproc, NULL, 0))) {
@@ -216,7 +210,7 @@ fflush(stderr);
     n = 0;
     fprintf(stderr, "[%s:%u] Hanging around awhile, doing debugger magic\n", myproc.nspace, myproc.rank);
     while (n < 5) {
-        usleep(1000);
+        usleep(10);
         ++n;
     }
 

opal/mca/pmix/pmix3x/pmix/include/pmix.h

@@ -567,6 +567,7 @@ PMIX_EXPORT pmix_status_t PMIx_Process_monitor_nb(const pmix_info_t *monitor, pm
         PMIX_INFO_DESTRUCT(&_in);                                           \
     } while(0)
 
+
 /* Request a credential from the PMIx server/SMS.
  * Input values include:
  *
@@ -631,87 +632,6 @@ PMIX_EXPORT pmix_status_t PMIx_Validate_credential(const pmix_byte_object_t *cre
                                                    const pmix_info_t info[], size_t ninfo,
                                                    pmix_validation_cbfunc_t cbfunc, void *cbdata);
 
-/* Define a callback function for delivering forwarded IO to a process
- * This function will be called whenever data becomes available, or a
- * specified buffering size and/or time has been met. The function
- * will be passed the following values:
- *
- * iofhdlr - the returned registration number of the handler being invoked.
- *           This is required when deregistering the handler.
- *
- * channel - a bitmask identifying the channel the data arrived on
- *
- * source - the nspace/rank of the process that generated the data
- *
- * payload - pointer to character array containing the data. Note that
- *           multiple strings may be included, and that the array may
- *           _not_ be NULL terminated
- *
- * info - an optional array of info provided by the source containing
- *        metadata about the payload. This could include PMIX_IOF_COMPLETE
- *
- * ninfo - number of elements in the optional info array
- */
- typedef void (*pmix_iof_cbfunc_t)(size_t iofhdlr, pmix_iof_channel_t channel,
-                                   pmix_proc_t *source, char *payload,
-                                   pmix_info_t info[], size_t ninfo);
-
-
-/* Register to receive IO forwarded from a remote process.
- *
- * procs - array of identifiers for sources whose IO is being
- *         requested. Wildcard rank indicates that all procs
- *         in the specified nspace are included in the request
- *
- * nprocs - number of identifiers in the procs array
- *
- * directives - optional array of attributes to control the
- *              behavior of the request. For example, this
- *              might include directives on buffering IO
- *              before delivery, and/or directives to include
- *              or exclude any backlogged data
- *
- * ndirs - number of elements in the directives array
- *
- * channel - bitmask of IO channels included in the request
- *
- * cbfunc - function to be called when relevant IO is received
- *
- * regcbfunc - since registration is async, this is the
- *             function to be called when registration is
- *             completed. The function itself will return
- *             a non-success error if the registration cannot
- *             be submitted - in this case, the regcbfunc
- *             will _not_ be called.
- *
- * cbdata - pointer to object to be returned in regcbfunc
- */
-PMIX_EXPORT pmix_status_t PMIx_IOF_register(const pmix_proc_t procs[], size_t nprocs,
-                                            const pmix_info_t directives[], size_t ndirs,
-                                            pmix_iof_channel_t channel, pmix_iof_cbfunc_t cbfunc,
-                                            pmix_hdlr_reg_cbfunc_t regcbfunc, void *regcbdata);
-
-/* Deregister from IO forwarded from a remote process.
- *
- * iofhdlr - the registration number returned from the
- *           call to PMIx_IOF_register
- *
- * directives - optional array of attributes to control the
- *              behavior of the request. For example, this
- *              might include directives regarding what to
- *              do with any data currently in the IO buffer
- *              for this process
- *
- * cbfunc - function to be called when deregistration has
- *          been completed. Note that any IO to be flushed
- *          may continue to be received after deregistration
- *          has completed.
- *
- * cbdata - pointer to object to be returned in cbfunc
- */
-PMIX_EXPORT pmix_status_t PMIx_IOF_deregister(size_t iofhdlr,
-                                              const pmix_info_t directives[], size_t ndirs,
-                                              pmix_op_cbfunc_t cbfunc, void *cbdata);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }

opal/mca/pmix/pmix3x/pmix/include/pmix_common.h.in

@@ -147,7 +147,6 @@ typedef uint32_t pmix_rank_t;
 #define PMIX_CONNECT_RETRY_DELAY            "pmix.tool.retry"       // (uint32_t) time in seconds between connection attempts
 #define PMIX_TOOL_DO_NOT_CONNECT            "pmix.tool.nocon"       // (bool) the tool wants to use internal PMIx support, but does
                                                                     //        not want to connect to a PMIx server
-                                                                    //        from the specified processes to this tool
 
 /* identification attributes */
 #define PMIX_USERID                         "pmix.euid"             // (uint32_t) effective user id
@@ -221,9 +220,7 @@ typedef uint32_t pmix_rank_t;
 #define PMIX_LOCAL_CPUSETS                  "pmix.lcpus"            // (char*) colon-delimited cpusets of local peers within the specified nspace
 #define PMIX_PROC_URI                       "pmix.puri"             // (char*) URI containing contact info for proc
 #define PMIX_LOCALITY                       "pmix.loc"              // (uint16_t) relative locality of two procs
-#define PMIX_PARENT_ID                      "pmix.parent"           // (pmix_proc_t*) identifier of the process that called PMIx_Spawn
-                                                                    //                to launch this proc's application
-
+#define PMIX_PARENT_ID                      "pmix.parent"           // (pmix_proc_t) process identifier of my parent process
 
 /* size info */
 #define PMIX_UNIV_SIZE                      "pmix.univ.size"        // (uint32_t) #procs in this nspace
@@ -327,7 +324,7 @@ typedef uint32_t pmix_rank_t;
 #define PMIX_EVENT_WANT_TERMINATION         "pmix.evterm"           // (bool) indicates that the handler has determined that the application should be terminated
 
 
-/* attributes used to describe "spawn" directives */
+/* attributes used to describe "spawn" attributes */
 #define PMIX_PERSONALITY                    "pmix.pers"             // (char*) name of personality to use
 #define PMIX_HOST                           "pmix.host"             // (char*) comma-delimited list of hosts to use for spawned procs
 #define PMIX_HOSTFILE                       "pmix.hostfile"         // (char*) hostfile to use for spawned procs
@@ -345,6 +342,9 @@ typedef uint32_t pmix_rank_t;
 #define PMIX_PRELOAD_FILES                  "pmix.preloadfiles"     // (char*) comma-delimited list of files to pre-position
 #define PMIX_NON_PMI                        "pmix.nonpmi"           // (bool) spawned procs will not call PMIx_Init
 #define PMIX_STDIN_TGT                      "pmix.stdin"            // (uint32_t) spawned proc rank that is to receive stdin
+#define PMIX_FWD_STDIN                      "pmix.fwd.stdin"        // (bool) forward my stdin to the designated proc
+#define PMIX_FWD_STDOUT                     "pmix.fwd.stdout"       // (bool) forward stdout from spawned procs to me
+#define PMIX_FWD_STDERR                     "pmix.fwd.stderr"       // (bool) forward stderr from spawned procs to me
 #define PMIX_DEBUGGER_DAEMONS               "pmix.debugger"         // (bool) spawned app consists of debugger daemons
 #define PMIX_COSPAWN_APP                    "pmix.cospawn"          // (bool) designated app is to be spawned as a disconnected
                                                                     //        job - i.e., not part of the "comm_world" of the job
@@ -364,11 +364,6 @@ typedef uint32_t pmix_rank_t;
 #define PMIX_JOB_CONTINUOUS                 "pmix.continuous"       // (bool) application is continuous, all failed procs should
                                                                         //        be immediately restarted
 #define PMIX_MAX_RESTARTS                   "pmix.maxrestarts"      // (uint32_t) max number of times to restart a job
-#define PMIX_FWD_STDIN                      "pmix.fwd.stdin"        // (bool) forward the stdin from this process to the spawned processes
-#define PMIX_FWD_STDOUT                     "pmix.fwd.stdout"       // (bool) forward stdout from the spawned processes to this process (typically used by a tool)
-#define PMIX_FWD_STDERR                     "pmix.fwd.stderr"       // (bool) forward stderr from the spawned processes to this process (typically used by a tool)
-#define PMIX_FWD_STDDIAG                    "pmix.fwd.stddiag"      // (bool) if a diagnostic channel exists, forward any output on it
-                                                                    //        from the spawned processes to this process (typically used by a tool)
 
 
 /* connect attributes */
@@ -421,11 +416,6 @@ typedef uint32_t pmix_rank_t;
 #define PMIX_DEBUG_WAIT_FOR_NOTIFY          "pmix.dbg.notify"       // (bool) block at desired point until receiving debugger release notification
 #define PMIX_DEBUG_JOB                      "pmix.dbg.job"          // (char*) nspace of the job to be debugged - the RM/PMIx server are
 #define PMIX_DEBUG_WAITING_FOR_NOTIFY       "pmix.dbg.waiting"      // (bool) job to be debugged is waiting for a release
-#define PMIX_PREPEND_LD_PRELOAD             "pmix.prepend.preload"  // (char*) prepend the named library to any existing
-                                                                    //         LD_PRELOAD directive
-#define PMIX_APPEND_LD_PRELOAD              "pmix.append.preload"   // (char*) append the named library to any existing
-                                                                    //         LD_PRELOAD directive
-
 
 /* Resource Manager identification */
 #define PMIX_RM_NAME                        "pmix.rm.name"          // (char*) string name of the resource manager
@@ -730,8 +720,6 @@ typedef uint16_t pmix_data_type_t;
 #define PMIX_ALLOC_DIRECTIVE    43
 /**** DEPRECATED ****/
 #define PMIX_INFO_ARRAY         44
-/****            ****/
-#define PMIX_IOF_CHANNEL        45
 /********************/
 
 /* define a boundary for implementers so they can add their own data types */
@@ -798,18 +786,6 @@ typedef uint8_t pmix_alloc_directive_t;
 #define PMIX_ALLOC_EXTERNAL     128
 
 
-/* define a set of bit-mask flags for specifying IO
- * forwarding channels. These can be OR'd together
- * to reference multiple channels */
-typedef uint16_t pmix_iof_channel_t;
-#define PMIX_FWD_NO_CHANNELS        0x00
-#define PMIX_FWD_STDIN_CHANNEL      0x01
-#define PMIX_FWD_STDOUT_CHANNEL     0x02
-#define PMIX_FWD_STDERR_CHANNEL     0x04
-#define PMIX_FWD_STDDIAG_CHANNEL    0x08
-#define PMIX_FWD_ALL_CHANNELS       0xff
-
-
 /****    PMIX BYTE OBJECT    ****/
 typedef struct pmix_byte_object {
     char *bytes;
@@ -839,6 +815,14 @@ typedef struct pmix_byte_object {
         free((m));                          \
     } while(0)
 
+#define PMIX_BYTE_OBJECT_LOAD(b, d, s)      \
+    do {                                    \
+        (b)->bytes = (d);                   \
+        (d) = NULL;                         \
+        (b)->size = (s);                    \
+        (s) = 0;                            \
+    } while(0)
+
 
 /****    PMIX DATA BUFFER    ****/
 typedef struct pmix_data_buffer {
@@ -1645,19 +1629,14 @@ typedef void (*pmix_notification_fn_t)(size_t evhdlr_registration_id,
                                        pmix_event_notification_cbfunc_fn_t cbfunc,
                                        void *cbdata);
 
-/* define a callback function for calls to register handlers, e.g., event
- * notification and IOF requests
- *
- * status - PMIX_SUCCESS or an appropriate error constant
- *
- * refid - reference identifier assigned to the handler by PMIx,
- *         used to deregister the handler
- *
- * cbdata - object provided to the registration call
- */
-typedef void (*pmix_hdlr_reg_cbfunc_t)(pmix_status_t status,
-                                       size_t refid,
-                                       void *cbdata);
+/* define a callback function for calls to PMIx_Register_evhdlr. The
+ * status indicates if the request was successful or not, evhdlr_ref is
+ * an integer reference assigned to the event handler by PMIx, this reference
+ * must be used to deregister the err handler. A ptr to the original
+ * cbdata is returned. */
+typedef void (*pmix_evhdlr_reg_cbfunc_t)(pmix_status_t status,
+                                         size_t evhdlr_ref,
+                                         void *cbdata);
 
 /* define a callback function for calls to PMIx_Get_nb. The status
  * indicates if the requested data was found or not - a pointer to the
@@ -1782,7 +1761,7 @@ typedef void (*pmix_validation_cbfunc_t)(pmix_status_t status,
 PMIX_EXPORT void PMIx_Register_event_handler(pmix_status_t codes[], size_t ncodes,
                                              pmix_info_t info[], size_t ninfo,
                                              pmix_notification_fn_t evhdlr,
-                                             pmix_hdlr_reg_cbfunc_t cbfunc,
+                                             pmix_evhdlr_reg_cbfunc_t cbfunc,
                                              void *cbdata);
 
 /* Deregister an event handler
@@ -1840,7 +1819,6 @@ PMIX_EXPORT pmix_status_t PMIx_Notify_event(pmix_status_t status,
  * - pmix_info_directives_t   (PMIX_INFO_DIRECTIVES)
  * - pmix_data_type_t   (PMIX_DATA_TYPE)
  * - pmix_alloc_directive_t  (PMIX_ALLOC_DIRECTIVE)
- * - pmix_iof_channel_t  (PMIX_IOF_CHANNEL)
  */
 PMIX_EXPORT const char* PMIx_Error_string(pmix_status_t status);
 PMIX_EXPORT const char* PMIx_Proc_state_string(pmix_proc_state_t state);
@@ -1850,7 +1828,6 @@ PMIX_EXPORT const char* PMIx_Data_range_string(pmix_data_range_t range);
 PMIX_EXPORT const char* PMIx_Info_directives_string(pmix_info_directives_t directives);
 PMIX_EXPORT const char* PMIx_Data_type_string(pmix_data_type_t type);
 PMIX_EXPORT const char* PMIx_Alloc_directive_string(pmix_alloc_directive_t directive);
-PMIX_EXPORT const char* PMIx_IOF_channel_string(pmix_iof_channel_t channel);
 
 /* Get the PMIx version string. Note that the provided string is
  * statically defined and must NOT be free'd  */