1
1

pml_base: whitespace cleanup; no code changes

Этот коммит содержится в:
Jeff Squyres 2015-02-06 11:27:23 -08:00
родитель 46a1722dfc
Коммит f38f2a159b

Просмотреть файл

@ -6,18 +6,18 @@
* Copyright (c) 2004-2007 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* 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) 2012 Los Alamos National Security, LLC. All rights
* reserved.
* reserved.
* Copyright (c) 2013-2014 Intel, Inc. All rights reserved
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
*
* Additional copyrights may follow
*
*
* $HEADER$
*/
@ -86,25 +86,25 @@ int mca_pml_base_select(bool enable_progress_threads,
/* if there is an include list - item must be in the list to be included */
found_pml = false;
for( i = 0; i < opal_pointer_array_get_size(&mca_pml_base_pml); i++) {
for( i = 0; i < opal_pointer_array_get_size(&mca_pml_base_pml); i++) {
char * tmp_val = NULL;
tmp_val = (char *) opal_pointer_array_get_item(&mca_pml_base_pml, i);
if( NULL == tmp_val) {
continue;
}
if(0 == strncmp(component->pmlm_version.mca_component_name,
if(0 == strncmp(component->pmlm_version.mca_component_name,
tmp_val, strlen(component->pmlm_version.mca_component_name)) ) {
found_pml = true;
break;
}
}
if(!found_pml && opal_pointer_array_get_size(&mca_pml_base_pml)) {
if(!found_pml && opal_pointer_array_get_size(&mca_pml_base_pml)) {
opal_output_verbose( 10, ompi_pml_base_framework.framework_output,
"select: component %s not in the include list",
component->pmlm_version.mca_component_name );
continue;
}
@ -120,7 +120,7 @@ int mca_pml_base_select(bool enable_progress_threads,
num_pml++;
/* Init component to get its priority */
opal_output_verbose( 10, ompi_pml_base_framework.framework_output,
opal_output_verbose( 10, ompi_pml_base_framework.framework_output,
"select: initializing %s component %s",
component->pmlm_version.mca_type_name,
component->pmlm_version.mca_component_name );
@ -147,14 +147,14 @@ int mca_pml_base_select(bool enable_progress_threads,
continue;
}
/* Otherwise determine if this is the best component */
else
else
#endif
if (priority > best_priority) {
best_priority = priority;
best_component = component;
best_module = module;
}
om = (opened_component_t*)malloc(sizeof(opened_component_t));
if (NULL == om) {
return OMPI_ERR_OUT_OF_RESOURCE;
@ -165,13 +165,13 @@ int mca_pml_base_select(bool enable_progress_threads,
}
/* Finished querying all components. Check for the bozo case. */
if( NULL == best_component ) {
opal_show_help("help-mca-base.txt", "find-available:none found",
true, "pml",
opal_process_info.nodename,
"pml");
for( i = 0; i < opal_pointer_array_get_size(&mca_pml_base_pml); i++) {
for( i = 0; i < opal_pointer_array_get_size(&mca_pml_base_pml); i++) {
char * tmp_val = NULL;
tmp_val = (char *) opal_pointer_array_get_item(&mca_pml_base_pml, i);
if( NULL == tmp_val) {
@ -179,22 +179,22 @@ int mca_pml_base_select(bool enable_progress_threads,
}
ompi_rte_abort(1, "PML %s cannot be selected", tmp_val);
}
if(0 == i) {
if(0 == i) {
ompi_rte_abort(2, "No pml component available. This shouldn't happen.");
}
}
}
opal_output_verbose( 10, ompi_pml_base_framework.framework_output,
"selected %s best priority %d\n",
"selected %s best priority %d\n",
best_component->pmlm_version.mca_component_name, best_priority);
/* if more than one PML could be considered, then we still need the
* modex since we cannot know which one will be selected on all procs
*/
if (1 < num_pml) {
modex_reqd = true;
}
/* Finalize all non-selected components */
for (item = opal_list_remove_first(&opened);
@ -208,15 +208,15 @@ int mca_pml_base_select(bool enable_progress_threads,
#endif
) {
/* Finalize */
if (NULL != om->om_component->pmlm_finalize) {
/* Blatently ignore the return code (what would we do to
recover, anyway? This component is going away, so errors
don't matter anymore) */
om->om_component->pmlm_finalize();
opal_output_verbose(10, ompi_pml_base_framework.framework_output,
opal_output_verbose(10, ompi_pml_base_framework.framework_output,
"select: component %s not selected / finalized",
om->om_component->pmlm_version.mca_component_name);
}
@ -233,7 +233,7 @@ int mca_pml_base_select(bool enable_progress_threads,
if( NULL != wrapper_component ) {
OPAL_LIST_FOREACH(cli, &ompi_pml_base_framework.framework_components, mca_base_component_list_item_t) {
component = (mca_pml_base_component_t *) cli->cli_component;
if( component == wrapper_component ) {
opal_list_remove_item(&ompi_pml_base_framework.framework_components, item);
}
@ -245,7 +245,7 @@ int mca_pml_base_select(bool enable_progress_threads,
mca_pml_base_selected_component = *best_component;
mca_pml = *best_module;
opal_output_verbose( 10, ompi_pml_base_framework.framework_output,
opal_output_verbose( 10, ompi_pml_base_framework.framework_output,
"select: component %s selected",
mca_pml_base_selected_component.pmlm_version.mca_component_name );
@ -253,16 +253,16 @@ int mca_pml_base_select(bool enable_progress_threads,
available list all unselected components. The available list will
contain only the selected component. */
mca_base_components_close(ompi_pml_base_framework.framework_output,
&ompi_pml_base_framework.framework_components,
mca_base_components_close(ompi_pml_base_framework.framework_output,
&ompi_pml_base_framework.framework_components,
(mca_base_component_t *) best_component);
#if OPAL_ENABLE_FT_CR == 1
/* If we have a wrapper then initalize it */
if( NULL != wrapper_component ) {
priority = PML_SELECT_WRAPPER_PRIORITY;
opal_output_verbose( 10, ompi_pml_base_framework.framework_output,
"pml:select: Wrapping: Component %s [%d] is being wrapped by component %s [%d]",
"pml:select: Wrapping: Component %s [%d] is being wrapped by component %s [%d]",
mca_pml_base_selected_component.pmlm_version.mca_component_name,
best_priority,
wrapper_component->pmlm_version.mca_component_name,
@ -337,18 +337,18 @@ mca_pml_base_pml_check_selected(const char *my_pml,
"check:select: modex not reqd");
return OMPI_SUCCESS;
}
/* if we are rank=0, then we can also assume success */
if (0 == OMPI_PROC_MY_NAME->vpid) {
opal_output_verbose( 10, ompi_pml_base_framework.framework_output,
"check:select: rank=0");
return OMPI_SUCCESS;
}
/* get the name of the PML module selected by rank=0 */
OPAL_MODEX_RECV(ret, &pml_base_component,
&procs[0]->super, (void**) &remote_pml, &size);
/* if this key wasn't found, then just assume all is well... */
if (OMPI_SUCCESS != ret) {
opal_output_verbose( 10, ompi_pml_base_framework.framework_output,
@ -365,11 +365,11 @@ mca_pml_base_pml_check_selected(const char *my_pml,
"check:select: got a NULL pml from rank=0");
return OMPI_ERR_UNREACH;
}
opal_output_verbose( 10, ompi_pml_base_framework.framework_output,
"check:select: checking my pml %s against rank=0 pml %s",
my_pml, remote_pml);
/* if that module doesn't match my own, return an error */
if ((size != strlen(my_pml) + 1) ||
(0 != strcmp(my_pml, remote_pml))) {
@ -381,7 +381,7 @@ mca_pml_base_pml_check_selected(const char *my_pml,
free(remote_pml); /* cleanup before returning */
return OMPI_ERR_UNREACH;
}
free(remote_pml);
return OMPI_SUCCESS;
}