2017-05-05 06:03:35 +03:00
|
|
|
/* -*- Mode: C; c-basic-offset:4 ; -*- */
|
|
|
|
/*
|
|
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
|
|
* University Research and Technology
|
|
|
|
* Corporation. All rights reserved.
|
|
|
|
* Copyright (c) 2004-2017 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) 2008-2012 Cisco Systems, Inc. All rights reserved.
|
|
|
|
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
|
|
|
|
* Copyright (c) 2015 Research Organization for Information Science
|
|
|
|
* and Technology (RIST). All rights reserved.
|
|
|
|
* Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
|
fixes for Dave's get/set info code
The expected sequence of events for processing info during object creation
is that if there's an incoming info arg, it is opal_info_dup()ed into the obj
at obj->s_info first. Then interested components register callbacks for
keys they want to know about using opal_infosubscribe_infosubscribe().
Inside info_subscribe_subscribe() the specified callback() is called with
whatever matching k/v is in the object's info, or with the default. The
return string from the callback goes into the new k/v stored in info, and
the input k/v is saved as __IN_<key>/<val>. It's saved the same way
whether the input came from info or whether it was a default. A null return
from the callback indicates an ignored key/val, and no k/v is stored for
it, but an __IN_<key>/<val> is still kept so we still have access to the
original.
At MPI_*_set_info() time, opal_infosubscribe_change_info() is used. That
function calls the registered callbacks for each item in the provided info.
If the callback returns non-null, the info is updated with that k/v, or if
the callback returns null, that key is deleted from info. An __IN_<key>/<val>
is saved either way, and overwrites any previously saved value.
When MPI_*_get_info() is called, opal_info_dup_mpistandard() is used, which
allows relatively easy changes in interpretation of the standard, by looking
at both the <key>/<val> and __IN_<key>/<val> in info. Right now it does
1. includes system extras, eg k/v defaults not expliclty set by the user
2. omits ignored keys
3. shows input values, not callback modifications, eg not the internal values
Currently the callbacks are doing things like
return some_condition ? "true" : "false"
that is, returning static strings that are not to be freed. If the return
strings start becoming more dynamic in the future I don't see how unallocated
strings could support that, so I'd propose a change for the future that
the callback()s registered with info_subscribe_subscribe() do a strdup on
their return, and we change the callers of callback() to free the strings
it returns (there are only two callers).
Rough outline of the smaller changes spread over the less central files:
comm.c
initialize comm->super.s_info to NULL
copy into comm->super.s_info in comm creation calls that provide info
OBJ_RELEASE comm->super.s_info at free time
comm_init.c
initialize comm->super.s_info to NULL
file.c
copy into file->super.s_info if file creation provides info
OBJ_RELEASE file->super.s_info at free time
win.c
copy into win->super.s_info if win creation provides info
OBJ_RELEASE win->super.s_info at free time
comm_get_info.c
file_get_info.c
win_get_info.c
change_info() if there's no info attached (shouldn't happen if callbacks
are registered)
copy the info for the user
The other category of change is generally addressing compiler warnings where
ompi_info_t and opal_info_t were being used a little too interchangably. An
ompi_info_t* contains an opal_info_t*, at &(ompi_info->super)
Also this commit updates the copyrights.
Signed-off-by: Mark Allen <markalle@us.ibm.com>
2017-01-31 04:29:50 +03:00
|
|
|
* Copyright (c) 2017 IBM Corporation. All rights reserved.
|
2017-05-05 06:03:35 +03:00
|
|
|
* $COPYRIGHT$
|
|
|
|
*
|
|
|
|
* Additional copyrights may follow
|
|
|
|
*
|
|
|
|
* $HEADER$
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "ompi_config.h"
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "opal/mca/pmix/pmix.h"
|
|
|
|
#include "ompi/mca/rte/rte.h"
|
|
|
|
#include "ompi/interlib/interlib.h"
|
|
|
|
|
fixes for Dave's get/set info code
The expected sequence of events for processing info during object creation
is that if there's an incoming info arg, it is opal_info_dup()ed into the obj
at obj->s_info first. Then interested components register callbacks for
keys they want to know about using opal_infosubscribe_infosubscribe().
Inside info_subscribe_subscribe() the specified callback() is called with
whatever matching k/v is in the object's info, or with the default. The
return string from the callback goes into the new k/v stored in info, and
the input k/v is saved as __IN_<key>/<val>. It's saved the same way
whether the input came from info or whether it was a default. A null return
from the callback indicates an ignored key/val, and no k/v is stored for
it, but an __IN_<key>/<val> is still kept so we still have access to the
original.
At MPI_*_set_info() time, opal_infosubscribe_change_info() is used. That
function calls the registered callbacks for each item in the provided info.
If the callback returns non-null, the info is updated with that k/v, or if
the callback returns null, that key is deleted from info. An __IN_<key>/<val>
is saved either way, and overwrites any previously saved value.
When MPI_*_get_info() is called, opal_info_dup_mpistandard() is used, which
allows relatively easy changes in interpretation of the standard, by looking
at both the <key>/<val> and __IN_<key>/<val> in info. Right now it does
1. includes system extras, eg k/v defaults not expliclty set by the user
2. omits ignored keys
3. shows input values, not callback modifications, eg not the internal values
Currently the callbacks are doing things like
return some_condition ? "true" : "false"
that is, returning static strings that are not to be freed. If the return
strings start becoming more dynamic in the future I don't see how unallocated
strings could support that, so I'd propose a change for the future that
the callback()s registered with info_subscribe_subscribe() do a strdup on
their return, and we change the callers of callback() to free the strings
it returns (there are only two callers).
Rough outline of the smaller changes spread over the less central files:
comm.c
initialize comm->super.s_info to NULL
copy into comm->super.s_info in comm creation calls that provide info
OBJ_RELEASE comm->super.s_info at free time
comm_init.c
initialize comm->super.s_info to NULL
file.c
copy into file->super.s_info if file creation provides info
OBJ_RELEASE file->super.s_info at free time
win.c
copy into win->super.s_info if win creation provides info
OBJ_RELEASE win->super.s_info at free time
comm_get_info.c
file_get_info.c
win_get_info.c
change_info() if there's no info attached (shouldn't happen if callbacks
are registered)
copy the info for the user
The other category of change is generally addressing compiler warnings where
ompi_info_t and opal_info_t were being used a little too interchangably. An
ompi_info_t* contains an opal_info_t*, at &(ompi_info->super)
Also this commit updates the copyrights.
Signed-off-by: Mark Allen <markalle@us.ibm.com>
2017-01-31 04:29:50 +03:00
|
|
|
#include "mpi.h"
|
2017-05-05 06:03:35 +03:00
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
int status;
|
|
|
|
volatile bool active;
|
|
|
|
} myreg_t;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* errhandler id
|
|
|
|
*/
|
|
|
|
static size_t interlibhandler_id = SIZE_MAX;
|
|
|
|
|
|
|
|
|
|
|
|
static void model_registration_callback(int status,
|
|
|
|
size_t errhandler_ref,
|
|
|
|
void *cbdata)
|
|
|
|
{
|
|
|
|
myreg_t *trk = (myreg_t*)cbdata;
|
|
|
|
|
|
|
|
trk->status = status;
|
|
|
|
interlibhandler_id = errhandler_ref;
|
|
|
|
trk->active = false;
|
|
|
|
}
|
|
|
|
static void model_callback(int status,
|
|
|
|
const opal_process_name_t *source,
|
|
|
|
opal_list_t *info, opal_list_t *results,
|
|
|
|
opal_pmix_notification_complete_fn_t cbfunc,
|
|
|
|
void *cbdata)
|
|
|
|
{
|
|
|
|
opal_value_t *val;
|
|
|
|
|
2017-10-23 21:27:42 +03:00
|
|
|
if (NULL != getenv("OMPI_SHOW_MODEL_CALLBACK")) {
|
|
|
|
/* we can ignore our own callback as we obviously
|
|
|
|
* know that we are MPI */
|
|
|
|
if (NULL != info) {
|
|
|
|
OPAL_LIST_FOREACH(val, info, opal_value_t) {
|
|
|
|
if (0 == strcmp(val->key, OPAL_PMIX_PROGRAMMING_MODEL) &&
|
|
|
|
0 == strcmp(val->data.string, "MPI")) {
|
2017-05-05 06:03:35 +03:00
|
|
|
goto cback;
|
|
|
|
}
|
2017-10-23 21:27:42 +03:00
|
|
|
if (OPAL_STRING == val->type) {
|
|
|
|
opal_output(0, "OMPI Model Callback Key: %s Val %s", val->key, val->data.string);
|
|
|
|
}
|
2017-05-05 06:03:35 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* otherwise, do something clever here */
|
|
|
|
|
|
|
|
cback:
|
|
|
|
/* we must NOT tell the event handler state machine that we
|
|
|
|
* are the last step as that will prevent it from notifying
|
|
|
|
* anyone else that might be listening for declarations */
|
|
|
|
if (NULL != cbfunc) {
|
|
|
|
cbfunc(OMPI_SUCCESS, NULL, NULL, NULL, cbdata);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int ompi_interlib_declare(int threadlevel, char *version)
|
|
|
|
{
|
|
|
|
opal_list_t info, directives;
|
|
|
|
opal_value_t *kv;
|
|
|
|
myreg_t trk;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* Register an event handler for library model declarations */
|
|
|
|
trk.status = OPAL_ERROR;
|
|
|
|
trk.active = true;
|
|
|
|
/* give it a name so we can distinguish it */
|
|
|
|
OBJ_CONSTRUCT(&directives, opal_list_t);
|
|
|
|
kv = OBJ_NEW(opal_value_t);
|
|
|
|
kv->key = strdup(OPAL_PMIX_EVENT_HDLR_NAME);
|
|
|
|
kv->type = OPAL_STRING;
|
|
|
|
kv->data.string = strdup("MPI-Model-Declarations");
|
|
|
|
opal_list_append(&directives, &kv->super);
|
|
|
|
/* specify the event code */
|
|
|
|
OBJ_CONSTRUCT(&info, opal_list_t);
|
|
|
|
kv = OBJ_NEW(opal_value_t);
|
|
|
|
kv->key = strdup("status"); // the key here is irrelevant
|
|
|
|
kv->type = OPAL_INT;
|
|
|
|
kv->data.integer = OPAL_ERR_MODEL_DECLARED;
|
|
|
|
opal_list_append(&info, &kv->super);
|
|
|
|
/* we could constrain the range to proc_local - technically, this
|
|
|
|
* isn't required so long as the code that generates
|
|
|
|
* the event stipulates its range as proc_local. We rely
|
|
|
|
* on that here */
|
|
|
|
opal_pmix.register_evhandler(&info, &directives, model_callback,
|
|
|
|
model_registration_callback,
|
|
|
|
(void*)&trk);
|
|
|
|
OMPI_LAZY_WAIT_FOR_COMPLETION(trk.active);
|
|
|
|
|
|
|
|
OPAL_LIST_DESTRUCT(&directives);
|
|
|
|
OPAL_LIST_DESTRUCT(&info);
|
|
|
|
if (OPAL_SUCCESS != trk.status) {
|
|
|
|
return trk.status;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* declare that we are present and active */
|
|
|
|
OBJ_CONSTRUCT(&info, opal_list_t);
|
|
|
|
kv = OBJ_NEW(opal_value_t);
|
|
|
|
kv->key = strdup(OPAL_PMIX_PROGRAMMING_MODEL);
|
|
|
|
kv->type = OPAL_STRING;
|
|
|
|
kv->data.string = strdup("MPI");
|
|
|
|
opal_list_append(&info, &kv->super);
|
|
|
|
kv = OBJ_NEW(opal_value_t);
|
|
|
|
kv->key = strdup(OPAL_PMIX_MODEL_LIBRARY_NAME);
|
|
|
|
kv->type = OPAL_STRING;
|
|
|
|
kv->data.string = strdup("OpenMPI");
|
|
|
|
opal_list_append(&info, &kv->super);
|
|
|
|
kv = OBJ_NEW(opal_value_t);
|
|
|
|
kv->key = strdup(OPAL_PMIX_MODEL_LIBRARY_VERSION);
|
|
|
|
kv->type = OPAL_STRING;
|
|
|
|
kv->data.string = strdup(version);
|
|
|
|
opal_list_append(&info, &kv->super);
|
|
|
|
kv = OBJ_NEW(opal_value_t);
|
|
|
|
kv->key = strdup(OPAL_PMIX_THREADING_MODEL);
|
|
|
|
kv->type = OPAL_STRING;
|
|
|
|
if (MPI_THREAD_SINGLE == threadlevel) {
|
|
|
|
kv->data.string = strdup("NONE");
|
|
|
|
} else {
|
|
|
|
kv->data.string = strdup("PTHREAD");
|
|
|
|
}
|
|
|
|
opal_list_append(&info, &kv->super);
|
|
|
|
/* call pmix to initialize these values */
|
2017-06-13 02:54:35 +03:00
|
|
|
ret = opal_pmix.init(&info);
|
2017-05-05 06:03:35 +03:00
|
|
|
OPAL_LIST_DESTRUCT(&info);
|
2017-06-13 02:54:35 +03:00
|
|
|
/* account for our refcount on pmix_init */
|
|
|
|
opal_pmix.finalize();
|
|
|
|
return ret;
|
2017-05-05 06:03:35 +03:00
|
|
|
}
|