ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Merge pull request #753 from hjelmn/verbose_standard

Просмотр исходного кода 
Standardize verbosity levels
Этот коммит содержится в:
Nathan Hjelm 2015-08-18 09:43:28 -06:00
родитель 5ef0632f9d 0a968de53f
Коммит 145bac088d
13 изменённых файлов: 245 добавлений и 90 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
ompi/mca/bml/r2/bml_r2.c
Просмотреть файл

@ -284,7 +284,7 @@ static int mca_bml_r2_add_procs( size_t nprocs,
/* skip this btl if the exclusivity is less than the previous only if the btl does not provide full rdma (for one-sided) */
if(bml_btl->btl->btl_exclusivity > btl->btl_exclusivity && ((btl_flags & MCA_BTL_FLAGS_RDMA) != MCA_BTL_FLAGS_RDMA)) {
btl->btl_del_procs(btl, 1, (opal_proc_t**)&proc, &btl_endpoints[p]);
opal_output_verbose(20, opal_btl_base_framework.framework_output,
opal_output_verbose(MCA_BASE_VERBOSE_INFO, ompi_bml_base_framework.framework_output,
"mca: bml: Not using %s btl to %s on node %s "
"because %s btl has higher exclusivity (%d > %d)",
btl->btl_component->btl_version.mca_component_name,
@ -295,7 +295,7 @@ static int mca_bml_r2_add_procs( size_t nprocs,
continue;
}
}
opal_output_verbose(1, opal_btl_base_framework.framework_output,
opal_output_verbose(MCA_BASE_VERBOSE_INFO, ompi_bml_base_framework.framework_output,
"mca: bml: Using %s btl to %s on node %s",
btl->btl_component->btl_version.mca_component_name,
OMPI_NAME_PRINT(&proc->super.proc_name),

26
opal/mca/base/base.h
Просмотреть файл

@ -11,7 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
@ -69,6 +69,30 @@ OPAL_DECLSPEC extern bool mca_base_component_disable_dlopen;
OPAL_DECLSPEC extern char *mca_base_system_default_path;
OPAL_DECLSPEC extern char *mca_base_user_default_path;
/*
* Standard verbosity levels
*/
enum {
/** total silence */
MCA_BASE_VERBOSE_NONE = -1,
/** only errors are printed */
MCA_BASE_VERBOSE_ERROR = 0,
/** emit messages about component selection, open, and unloading */
MCA_BASE_VERBOSE_COMPONENT = 10,
/** also emit warnings */
MCA_BASE_VERBOSE_WARN = 20,
/** also emit general, user-relevant information, such as rationale as to why certain choices
* or code paths were taken, information gleaned from probing the local system, etc. */
MCA_BASE_VERBOSE_INFO = 40,
/** also emit relevant tracing information (e.g., which functions were invoked /
* call stack entry/exit info) */
MCA_BASE_VERBOSE_TRACE = 60,
/** also emit Open MPI-developer-level (i.e,. highly detailed) information */
MCA_BASE_VERBOSE_DEBUG = 80,
/** also output anything else that might be useful */
MCA_BASE_VERBOSE_MAX = 100,
};
/*
* Public functions
*/

24
opal/mca/base/mca_base_component_find.c
Просмотреть файл

@ -14,6 +14,8 @@
* Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -133,7 +135,7 @@ int mca_base_component_find (const char *directory, mca_base_framework_t *framew
find_dyn_components(directory, framework, (const char**)requested_component_names,
include_mode);
} else {
opal_output_verbose(40, 0,
opal_output_verbose (MCA_BASE_VERBOSE_INFO, 0,
"mca: base: component_find: dso loading for %s MCA components disabled",
framework->framework_name);
}
@ -193,11 +195,11 @@ int mca_base_components_filter (mca_base_framework_t *framework, uint32_t filter
if (!can_use || (filter_flags & dummy->data.param_field) != filter_flags) {
if (can_use && (filter_flags & MCA_BASE_METADATA_PARAM_CHECKPOINT) &&
!(MCA_BASE_METADATA_PARAM_CHECKPOINT & dummy->data.param_field)) {
opal_output_verbose(10, output_id,
"mca: base: components_filter: "
"(%s) Component %s is *NOT* Checkpointable - Disabled",
component->reserved,
component->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca: base: components_filter: "
"(%s) Component %s is *NOT* Checkpointable - Disabled",
component->reserved,
component->mca_component_name);
}
opal_list_remove_item (components, &cli->super);
@ -206,11 +208,11 @@ int mca_base_components_filter (mca_base_framework_t *framework, uint32_t filter
OBJ_RELEASE(cli);
} else if (filter_flags & MCA_BASE_METADATA_PARAM_CHECKPOINT) {
opal_output_verbose(10, output_id,
"mca: base: components_filter: "
"(%s) Component %s is Checkpointable",
component->reserved,
component->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca: base: components_filter: "
"(%s) Component %s is Checkpointable",
component->reserved,
component->mca_component_name);
}
}

14
opal/mca/base/mca_base_component_repository.c
Просмотреть файл

@ -314,10 +314,10 @@ int mca_base_component_repository_open (mca_base_framework_t *framework,
char *struct_name = NULL;
int vl, ret;
opal_output_verbose(40, 0, "mca_base_component_repository_open: examining dynamic %s MCA component \"%s\" at path %s",
ri->ri_type, ri->ri_name, ri->ri_path);
opal_output_verbose(MCA_BASE_VERBOSE_INFO, 0, "mca_base_component_repository_open: examining dynamic "
"%s MCA component \"%s\" at path %s", ri->ri_type, ri->ri_name, ri->ri_path);
vl = mca_base_component_show_load_errors ? 0 : 40;
vl = mca_base_component_show_load_errors ? MCA_BASE_VERBOSE_ERROR : MCA_BASE_VERBOSE_INFO;
/* Ensure that this component is not already loaded (should only happen
if it was statically loaded). It's an error if it's already
@ -327,7 +327,7 @@ int mca_base_component_repository_open (mca_base_framework_t *framework,
OPAL_LIST_FOREACH(mitem, &framework->framework_components, mca_base_component_list_item_t) {
if (0 == strcmp(mitem->cli_component->mca_component_name, ri->ri_name)) {
opal_output_verbose(40, 0, "mca_base_component_repository_open: already loaded (ignored)");
opal_output_verbose (MCA_BASE_VERBOSE_INFO, 0, "mca_base_component_repository_open: already loaded (ignored)");
return OPAL_ERR_BAD_PARAM;
}
}
@ -336,7 +336,7 @@ int mca_base_component_repository_open (mca_base_framework_t *framework,
mitem = NULL;
if (NULL != ri->ri_dlhandle) {
opal_output_verbose(40, 0, "mca_base_component_repository_open: already loaded. returning cached component");
opal_output_verbose (MCA_BASE_VERBOSE_INFO, 0, "mca_base_component_repository_open: already loaded. returning cached component");
mitem = OBJ_NEW(mca_base_component_list_item_t);
if (NULL == mitem) {
return OPAL_ERR_OUT_OF_RESOURCE;
@ -445,8 +445,8 @@ int mca_base_component_repository_open (mca_base_framework_t *framework,
ri->ri_component_struct = mitem->cli_component = component_struct;
opal_list_append(&framework->framework_components, &mitem->super);
opal_output_verbose(40, 0, "mca_base_component_repository_open: opened dynamic %s MCA component \"%s\"",
ri->ri_type, ri->ri_name);
opal_output_verbose (MCA_BASE_VERBOSE_INFO, 0, "mca_base_component_repository_open: opened dynamic %s MCA "
"component \"%s\"", ri->ri_type, ri->ri_name);
return OPAL_SUCCESS;
} while (0);

14
opal/mca/base/mca_base_components_close.c
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2006 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
@ -33,9 +33,9 @@ void mca_base_component_unload (const mca_base_component_t *component, int outpu
int ret;
/* Unload */
opal_output_verbose(10, output_id,
"mca: base: close: unloading component %s",
component->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca: base: close: unloading component %s",
component->mca_component_name);
ret = mca_base_var_group_find (component->mca_project_name, component->mca_type_name,
component->mca_component_name);
@ -51,9 +51,9 @@ void mca_base_component_close (const mca_base_component_t *component, int output
/* Close */
if (NULL != component->mca_close_component) {
component->mca_close_component();
opal_output_verbose(10, output_id,
"mca: base: close: component %s closed",
component->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca: base: close: component %s closed",
component->mca_component_name);
}
mca_base_component_unload (component, output_id);

35
opal/mca/base/mca_base_components_open.c
Просмотреть файл

@ -109,26 +109,26 @@ static int open_components(mca_base_framework_t *framework)
}
/* Announce */
opal_output_verbose(10, output_id, "mca: base: components_open: opening %s components",
framework->framework_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id, "mca: base: components_open: opening %s components",
framework->framework_name);
/* Traverse the list of components */
OPAL_LIST_FOREACH_SAFE(cli, next, components, mca_base_component_list_item_t) {
const mca_base_component_t *component = cli->cli_component;
opal_output_verbose(10, output_id,
"mca: base: components_open: found loaded component %s",
component->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca: base: components_open: found loaded component %s",
component->mca_component_name);
if (NULL != component->mca_open_component) {
/* Call open if register didn't call it already */
ret = component->mca_open_component();
if (OPAL_SUCCESS == ret) {
opal_output_verbose(10, output_id,
"mca: base: components_open: "
"component %s open function successful",
component->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca: base: components_open: "
"component %s open function successful",
component->mca_component_name);
} else {
if (OPAL_ERR_NOT_AVAILABLE != ret) {
/* If the component returns OPAL_ERR_NOT_AVAILABLE,
@ -143,15 +143,16 @@ static int open_components(mca_base_framework_t *framework)
expected. */
if (mca_base_component_show_load_errors) {
opal_output(0, "mca: base: components_open: "
"component %s / %s open function failed",
component->mca_type_name,
component->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_ERROR, output_id,
"mca: base: components_open: component %s "
"/ %s open function failed",
component->mca_type_name,
component->mca_component_name);
}
opal_output_verbose(10, output_id,
"mca: base: components_open: "
"component %s open function failed",
component->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca: base: components_open: "
"component %s open function failed",
component->mca_component_name);
}
mca_base_component_close (component, output_id);

35
opal/mca/base/mca_base_components_register.c
Просмотреть файл

@ -76,25 +76,25 @@ static int register_components(mca_base_framework_t *framework)
int output_id = framework->framework_output;
/* Announce */
opal_output_verbose(10, output_id,
"mca: base: components_register: registering framework %s components",
framework->framework_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca: base: components_register: registering framework %s components",
framework->framework_name);
/* Traverse the list of found components */
OPAL_LIST_FOREACH_SAFE(cli, next, &framework->framework_components, mca_base_component_list_item_t) {
component = (mca_base_component_t *)cli->cli_component;
opal_output_verbose(10, output_id,
opal_output_verbose(MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca: base: components_register: found loaded component %s",
component->mca_component_name);
/* Call the component's MCA parameter registration function (or open if register doesn't exist) */
if (NULL == component->mca_register_component_params) {
opal_output_verbose(10, output_id,
"mca: base: components_register: "
"component %s has no register or open function",
component->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca: base: components_register: "
"component %s has no register or open function",
component->mca_component_name);
ret = OPAL_SUCCESS;
} else {
ret = component->mca_register_component_params();
@ -114,16 +114,17 @@ static int register_components(mca_base_framework_t *framework)
expected. */
if (mca_base_component_show_load_errors) {
opal_output(0, "mca: base: components_register: "
"component %s / %s register function failed",
component->mca_type_name,
component->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_ERROR, output_id,
"mca: base: components_register: component %s "
"/ %s register function failed",
component->mca_type_name,
component->mca_component_name);
}
opal_output_verbose(10, output_id,
"mca: base: components_register: "
"component %s register function failed",
component->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca: base: components_register: "
"component %s register function failed",
component->mca_component_name);
}
opal_list_remove_item (&framework->framework_components, &cli->super);
@ -134,7 +135,7 @@ static int register_components(mca_base_framework_t *framework)
}
if (NULL != component->mca_register_component_params) {
opal_output_verbose (10, output_id, "mca: base: components_register: "
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id, "mca: base: components_register: "
"component %s register function successful",
component->mca_component_name);
}

40
opal/mca/base/mca_base_components_select.c
Просмотреть файл

@ -2,6 +2,8 @@
* Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -40,9 +42,9 @@ int mca_base_select(const char *type_name, int output_id,
*best_module = NULL;
*best_component = NULL;
opal_output_verbose(10, output_id,
"mca:base:select: Auto-selecting %s components",
type_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca:base:select: Auto-selecting %s components",
type_name);
/*
* Traverse the list of available components.
@ -55,18 +57,18 @@ int mca_base_select(const char *type_name, int output_id,
* If there is a query function then use it.
*/
if (NULL == component->mca_query_component) {
opal_output_verbose(5, output_id,
"mca:base:select:(%5s) Skipping component [%s]. It does not implement a query function",
type_name, component->mca_component_name );
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca:base:select:(%5s) Skipping component [%s]. It does not implement a query function",
type_name, component->mca_component_name );
continue;
}
/*
* Query this component for the module and priority
*/
opal_output_verbose(5, output_id,
"mca:base:select:(%5s) Querying component [%s]",
type_name, component->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca:base:select:(%5s) Querying component [%s]",
type_name, component->mca_component_name);
component->mca_query_component(&module, &priority);
@ -74,18 +76,18 @@ int mca_base_select(const char *type_name, int output_id,
* If no module was returned, then skip component
*/
if (NULL == module) {
opal_output_verbose(5, output_id,
"mca:base:select:(%5s) Skipping component [%s]. Query failed to return a module",
type_name, component->mca_component_name );
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca:base:select:(%5s) Skipping component [%s]. Query failed to return a module",
type_name, component->mca_component_name );
continue;
}
/*
* Determine if this is the best module we have seen by looking the priority
*/
opal_output_verbose(5, output_id,
"mca:base:select:(%5s) Query of component [%s] set priority to %d",
type_name, component->mca_component_name, priority);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca:base:select:(%5s) Query of component [%s] set priority to %d",
type_name, component->mca_component_name, priority);
if (priority > best_priority) {
best_priority = priority;
*best_component = component;
@ -99,7 +101,7 @@ int mca_base_select(const char *type_name, int output_id,
* Make sure we found something in the process.
*/
if (NULL == *best_component) {
opal_output_verbose(5, output_id,
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca:base:select:(%5s) No component selected!",
type_name);
/*
@ -111,9 +113,9 @@ int mca_base_select(const char *type_name, int output_id,
return OPAL_ERR_NOT_FOUND;
}
opal_output_verbose(5, output_id,
"mca:base:select:(%5s) Selected component [%s]",
type_name, (*best_component)->mca_component_name);
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, output_id,
"mca:base:select:(%5s) Selected component [%s]",
type_name, (*best_component)->mca_component_name);
/*
* Close the non-selected components

12
opal/mca/base/mca_base_framework.c
Просмотреть файл

@ -92,10 +92,16 @@ int mca_base_framework_register (struct mca_base_framework_t *framework,
}
/* register a verbosity variable for this framework */
asprintf (&desc, "Verbosity level for the %s framework (0 = no verbosity)",
framework->framework_name);
ret = asprintf (&desc, "Verbosity level for the %s framework (default: 0)",
framework->framework_name);
if (0 > ret) {
return OPAL_ERR_OUT_OF_RESOURCE;
}
framework->framework_verbose = MCA_BASE_VERBOSE_ERROR;
ret = mca_base_framework_var_register (framework, "verbose", desc,
MCA_BASE_VAR_TYPE_INT, NULL, 0,
MCA_BASE_VAR_TYPE_INT,
&mca_base_var_enum_verbose, 0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_8,
MCA_BASE_VAR_SCOPE_LOCAL,

2
opal/mca/base/mca_base_open.c
Просмотреть файл

@ -140,7 +140,7 @@ int mca_base_open(void)
gethostname(hostname, 64);
asprintf(&lds.lds_prefix, "[%s:%05d] ", hostname, getpid());
opal_output_reopen(0, &lds);
opal_output_verbose(5, 0, "mca: base: opening components");
opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, 0, "mca: base: opening components");
free(lds.lds_prefix);
/* Open up the component repository */

9
opal/mca/base/mca_base_var.c
Просмотреть файл

@ -852,7 +852,7 @@ int mca_base_var_deregister(int vari)
var->mbv_storage->stringval) {
free (var->mbv_storage->stringval);
var->mbv_storage->stringval = NULL;
} else if (MCA_BASE_VAR_TYPE_BOOL != var->mbv_type && NULL != var->mbv_enumerator) {
} else if (var->mbv_enumerator && !var->mbv_enumerator->enum_is_static) {
OBJ_RELEASE(var->mbv_enumerator);
}
@ -1486,7 +1486,9 @@ static int register_variable (const char *project_name, const char *framework_na
OBJ_RELEASE (var->mbv_enumerator);
}
OBJ_RETAIN(enumerator);
if (!enumerator->enum_is_static) {
OBJ_RETAIN(enumerator);
}
}
var->mbv_enumerator = enumerator;
@ -1847,7 +1849,7 @@ static void var_destructor(mca_base_var_t *var)
}
/* don't release the boolean enumerator */
if (MCA_BASE_VAR_TYPE_BOOL != var->mbv_type && NULL != var->mbv_enumerator) {
if (var->mbv_enumerator && !var->mbv_enumerator->enum_is_static) {
OBJ_RELEASE(var->mbv_enumerator);
}
@ -1860,6 +1862,7 @@ static void var_destructor(mca_base_var_t *var)
if (NULL != var->mbv_long_name) {
free(var->mbv_long_name);
}
if (NULL != var->mbv_description) {
free(var->mbv_description);
}

111
opal/mca/base/mca_base_var_enum.c
Просмотреть файл

@ -11,7 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2012-2014 Los Alamos National Security, LLC. All rights
* Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
@ -23,6 +23,7 @@
#include "opal_config.h"
#include "opal/mca/base/mca_base_var_enum.h"
#include "opal/mca/base/base.h"
#include <stdio.h>
#include <string.h>
@ -33,6 +34,10 @@ static void mca_base_var_enum_destructor (mca_base_var_enum_t *enumerator);
OBJ_CLASS_INSTANCE(mca_base_var_enum_t, opal_object_t, mca_base_var_enum_constructor,
mca_base_var_enum_destructor);
static int enum_dump (mca_base_var_enum_t *self, char **out);
static int enum_get_count (mca_base_var_enum_t *self, int *count);
static int enum_get_value (mca_base_var_enum_t *self, int index, int *value, const char **string_value);
static int mca_base_var_enum_bool_get_count (mca_base_var_enum_t *enumerator, int *count)
{
*count = 2;
@ -97,6 +102,7 @@ static int mca_base_var_enum_bool_dump (mca_base_var_enum_t *self, char **out)
mca_base_var_enum_t mca_base_var_enum_bool = {
.super = OPAL_OBJ_STATIC_INIT(opal_object_t),
.enum_is_static = true,
.enum_name = "boolean",
.get_count = mca_base_var_enum_bool_get_count,
.get_value = mca_base_var_enum_bool_get_value,
@ -105,6 +111,108 @@ mca_base_var_enum_t mca_base_var_enum_bool = {
.dump = mca_base_var_enum_bool_dump
};
/* verbosity enumerator */
static mca_base_var_enum_value_t verbose_values[] = {
{MCA_BASE_VERBOSE_NONE, "none"},
{MCA_BASE_VERBOSE_ERROR, "error"},
{MCA_BASE_VERBOSE_COMPONENT, "component"},
{MCA_BASE_VERBOSE_WARN, "warn"},
{MCA_BASE_VERBOSE_INFO, "info"},
{MCA_BASE_VERBOSE_TRACE, "trace"},
{MCA_BASE_VERBOSE_DEBUG, "debug"},
{MCA_BASE_VERBOSE_MAX, "max"},
{-1, NULL}
};
static int mca_base_var_enum_verbose_vfs (mca_base_var_enum_t *self, const char *string_value,
int *value)
{
char *tmp;
int v;
/* skip whitespace */
string_value += strspn (string_value, " \t\n\v\f\r");
v = strtol (string_value, &tmp, 10);
if (*tmp != '\0') {
for (int i = 0 ; verbose_values[i].string ; ++i) {
if (0 == strcmp (verbose_values[i].string, string_value)) {
*value = verbose_values[i].value;
return OPAL_SUCCESS;
}
}
return OPAL_ERR_NOT_FOUND;
} else if (v < MCA_BASE_VERBOSE_NONE) {
v = MCA_BASE_VERBOSE_NONE;
} else if (v > MCA_BASE_VERBOSE_MAX) {
v = MCA_BASE_VERBOSE_MAX;
}
*value = v;
return OPAL_SUCCESS;
}
static int mca_base_var_enum_verbose_sfv (mca_base_var_enum_t *self, const int value,
const char **string_value)
{
static char buffer[4];
if (value < 0 || value > 100) {
return OPAL_ERR_VALUE_OUT_OF_BOUNDS;
}
for (int i = 0 ; verbose_values[i].string ; ++i) {
if (verbose_values[i].value == value) {
*string_value = verbose_values[i].string;
return OPAL_SUCCESS;
}
}
snprintf (buffer, 4, "%d", value);
if (string_value) {
*string_value = buffer;
}
return OPAL_SUCCESS;
}
static int mca_base_var_enum_verbose_dump (mca_base_var_enum_t *self, char **out)
{
char *tmp;
int ret;
ret = enum_dump (self, out);
if (OPAL_SUCCESS != ret) {
return ret;
}
ret = asprintf (&tmp, "%s, 0 - 100", *out);
free (*out);
if (0 > ret) {
*out = NULL;
return OPAL_ERR_OUT_OF_RESOURCE;
}
*out = tmp;
return OPAL_SUCCESS;
}
mca_base_var_enum_t mca_base_var_enum_verbose = {
.super = OPAL_OBJ_STATIC_INIT(opal_object_t),
.enum_is_static = true,
.enum_name = "verbosity",
.get_count = enum_get_count,
.get_value = enum_get_value,
.value_from_string = mca_base_var_enum_verbose_vfs,
.string_from_value = mca_base_var_enum_verbose_sfv,
.dump = mca_base_var_enum_verbose_dump,
.enum_value_count = 8,
.enum_values = verbose_values,
};
int mca_base_var_enum_create (const char *name, const mca_base_var_enum_value_t *values, mca_base_var_enum_t **enumerator)
{
@ -264,6 +372,7 @@ static void mca_base_var_enum_constructor (mca_base_var_enum_t *enumerator)
enumerator->value_from_string = enum_value_from_string;
enumerator->string_from_value = enum_string_from_value;
enumerator->dump = enum_dump;
enumerator->enum_is_static = false;
}
static void mca_base_var_enum_destructor (mca_base_var_enum_t *enumerator)

9
opal/mca/base/mca_base_var_enum.h
Просмотреть файл

@ -11,7 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008-2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
* Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
@ -106,6 +106,9 @@ typedef struct mca_base_var_enum_value_t mca_base_var_enum_value_t;
struct mca_base_var_enum_t {
opal_object_t super;
/** Is the enumerator statically allocated */
bool enum_is_static;
/** Name of this enumerator. This value is duplicated from the argument provided to
mca_base_var_enum_create() */
char *enum_name;
@ -176,5 +179,9 @@ OPAL_DECLSPEC int mca_base_var_enum_create (const char *name, const mca_base_var
*/
extern mca_base_var_enum_t mca_base_var_enum_bool;
/**
* Verbosity level enumerator
*/
extern mca_base_var_enum_t mca_base_var_enum_verbose;
#endif /* !defined(MCA_BASE_VAR_ENUM_H) */