1
1

Strike down a few more stray places that were registering

mpi_leave_pinned and replace them with the one central global
variable.

This commit was SVN r13349.
Этот коммит содержится в:
Jeff Squyres 2007-01-29 20:24:31 +00:00
родитель 93a2f31932
Коммит c9f072b84f
2 изменённых файлов: 6 добавлений и 12 удалений

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

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -26,6 +27,7 @@
#include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/btl.h"
#include "ompi/request/request.h" #include "ompi/request/request.h"
#include "ompi/runtime/params.h"
#include "opal/mca/base/mca_base_param.h" #include "opal/mca/base/mca_base_param.h"
#include "orte/mca/errmgr/errmgr.h" #include "orte/mca/errmgr/errmgr.h"
@ -114,8 +116,6 @@ static inline int mca_btl_gm_param_register_int(
int mca_btl_gm_component_open(void) int mca_btl_gm_component_open(void)
{ {
int param, value;
/* initialize state */ /* initialize state */
mca_btl_gm_component.gm_num_btls=0; mca_btl_gm_component.gm_num_btls=0;
mca_btl_gm_component.gm_btls=NULL; mca_btl_gm_component.gm_btls=NULL;
@ -187,10 +187,7 @@ int mca_btl_gm_component_open(void)
sizeof(mca_btl_base_header_t); sizeof(mca_btl_base_header_t);
/* leave pinned option */ /* leave pinned option */
value = 0; mca_btl_gm_component.leave_pinned = (int) ompi_mpi_leave_pinned;
param = mca_base_param_find("mpi", NULL, "leave_pinned");
mca_base_param_lookup_int(param, &value);
mca_btl_gm_component.leave_pinned = value;
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }

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

@ -12,6 +12,7 @@
* Copyright (c) 2006 Sandia National Laboratories. All rights * Copyright (c) 2006 Sandia National Laboratories. All rights
* reserved. * reserved.
* Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
* *
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -29,6 +30,7 @@
#include "opal/util/output.h" #include "opal/util/output.h"
#include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/btl.h"
#include "ompi/runtime/params.h"
#include "opal/mca/base/mca_base_param.h" #include "opal/mca/base/mca_base_param.h"
#include "orte/mca/errmgr/errmgr.h" #include "orte/mca/errmgr/errmgr.h"
@ -140,8 +142,6 @@ static inline int mca_btl_udapl_param_register_int(
int mca_btl_udapl_component_open(void) int mca_btl_udapl_component_open(void)
{ {
int param, value;
/* initialize state */ /* initialize state */
mca_btl_udapl_component.udapl_num_btls=0; mca_btl_udapl_component.udapl_num_btls=0;
mca_btl_udapl_component.udapl_btls=NULL; mca_btl_udapl_component.udapl_btls=NULL;
@ -220,10 +220,7 @@ int mca_btl_udapl_component_open(void)
mca_btl_udapl_component.udapl_eager_frag_size; mca_btl_udapl_component.udapl_eager_frag_size;
/* leave pinned option */ /* leave pinned option */
value = 0; mca_btl_udapl_component.leave_pinned = (int) ompi_mpi_leave_pinned;
param = mca_base_param_find("mpi", NULL, "leave_pinned");
mca_base_param_lookup_int(param, &value);
mca_btl_udapl_component.leave_pinned = value;
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }