482d84b6e5
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>
107 строки
2.9 KiB
C
107 строки
2.9 KiB
C
/*
|
|
* Copyright (c) 2013 Mellanox Technologies, Inc.
|
|
* All rights reserved.
|
|
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
|
|
* Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "oshmem_config.h"
|
|
|
|
#include "oshmem/include/oshmem/constants.h"
|
|
#include "oshmem/include/oshmem/frameworks.h"
|
|
|
|
#include "oshmem/runtime/params.h"
|
|
#include "oshmem/runtime/runtime.h"
|
|
|
|
#include "opal/runtime/opal_info_support.h"
|
|
#include "ompi/runtime/ompi_info_support.h"
|
|
#include "oshmem/runtime/oshmem_info_support.h"
|
|
#include "opal/util/show_help.h"
|
|
#include "ompi/include/ompi/constants.h"
|
|
|
|
const char *oshmem_info_type_oshmem = "oshmem";
|
|
|
|
static bool oshmem_info_registered = false;
|
|
|
|
void oshmem_info_register_types(opal_pointer_array_t *mca_types)
|
|
{
|
|
int i;
|
|
|
|
/* add the top-level type */
|
|
opal_pointer_array_add(mca_types, (void *)oshmem_info_type_oshmem);
|
|
|
|
/* push all the types found by autogen */
|
|
for (i = 0; NULL != oshmem_frameworks[i]; i++) {
|
|
opal_pointer_array_add(mca_types, oshmem_frameworks[i]->framework_name);
|
|
}
|
|
}
|
|
|
|
int oshmem_info_register_framework_params(opal_pointer_array_t *component_map)
|
|
{
|
|
int rc;
|
|
|
|
if (oshmem_info_registered) {
|
|
return OSHMEM_SUCCESS;
|
|
}
|
|
|
|
oshmem_info_registered = true;
|
|
|
|
/* Register the OSHMEM layer's MCA parameters */
|
|
if (OSHMEM_SUCCESS != (rc = oshmem_shmem_register_params())) {
|
|
fprintf(stderr, "oshmem_info_register: oshmem_register_params failed\n");
|
|
return rc;
|
|
}
|
|
|
|
/* Do OMPI interface call */
|
|
rc = opal_info_register_framework_params(component_map);
|
|
if (OMPI_SUCCESS != rc) {
|
|
return rc;
|
|
}
|
|
|
|
return opal_info_register_project_frameworks(oshmem_info_type_oshmem, oshmem_frameworks, component_map);
|
|
}
|
|
|
|
void oshmem_info_close_components(void)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; NULL != oshmem_frameworks[i]; i++) {
|
|
(void) mca_base_framework_close(oshmem_frameworks[i]);
|
|
}
|
|
|
|
/* Do OMPI interface call */
|
|
opal_info_close_components();
|
|
}
|
|
|
|
void oshmem_info_show_oshmem_version(const char *scope)
|
|
{
|
|
char *tmp, *tmp2;
|
|
|
|
if (0 < asprintf(&tmp, "%s:version:full", oshmem_info_type_oshmem)) {
|
|
tmp2 = opal_info_make_version_str(scope,
|
|
OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION,
|
|
OSHMEM_RELEASE_VERSION,
|
|
OSHMEM_GREEK_VERSION,
|
|
OSHMEM_REPO_REV);
|
|
opal_info_out("Open SHMEM", tmp, tmp2);
|
|
free(tmp);
|
|
free(tmp2);
|
|
}
|
|
if(0 < asprintf(&tmp, "%s:version:repo", oshmem_info_type_oshmem)) {
|
|
opal_info_out("Open SHMEM repo revision", tmp, OSHMEM_REPO_REV);
|
|
free(tmp);
|
|
}
|
|
if (0 < asprintf(&tmp, "%s:version:release_date", oshmem_info_type_oshmem)) {
|
|
opal_info_out("Open SHMEM release date", tmp, OSHMEM_RELEASE_DATE);
|
|
free(tmp);
|
|
}
|
|
|
|
/* Do OMPI interface call */
|
|
ompi_info_show_ompi_version(scope);
|
|
}
|