Turns out that the leave_pinned stuff isn't used in these BTLs at
all. So just remove it. This commit was SVN r13360.
Этот коммит содержится в:
родитель
95983b3622
Коммит
86f8c66a27
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||||
* University Research and Technology
|
* University Research and Technology
|
||||||
@ -10,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
|
||||||
@ -71,7 +71,6 @@ struct mca_btl_gm_component_t {
|
|||||||
opal_list_t gm_procs; /**< list of gm proc structures */
|
opal_list_t gm_procs; /**< list of gm proc structures */
|
||||||
opal_mutex_t gm_lock; /**< lock for accessing module state */
|
opal_mutex_t gm_lock; /**< lock for accessing module state */
|
||||||
char* gm_mpool_name; /**< name of memory pool */
|
char* gm_mpool_name; /**< name of memory pool */
|
||||||
bool leave_pinned; /**< pin memory on first use and leave pinned */
|
|
||||||
};
|
};
|
||||||
typedef struct mca_btl_gm_component_t mca_btl_gm_component_t;
|
typedef struct mca_btl_gm_component_t mca_btl_gm_component_t;
|
||||||
|
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
#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"
|
||||||
@ -186,8 +185,6 @@ int mca_btl_gm_component_open(void)
|
|||||||
gm_max_length_for_size(mca_btl_gm_component.gm_max_frag_size) -
|
gm_max_length_for_size(mca_btl_gm_component.gm_max_frag_size) -
|
||||||
sizeof(mca_btl_base_header_t);
|
sizeof(mca_btl_base_header_t);
|
||||||
|
|
||||||
/* leave pinned option */
|
|
||||||
mca_btl_gm_component.leave_pinned = (int) ompi_mpi_leave_pinned;
|
|
||||||
return OMPI_SUCCESS;
|
return OMPI_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
* 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) 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$
|
||||||
*
|
*
|
||||||
@ -99,7 +100,6 @@ struct mca_btl_udapl_component_t {
|
|||||||
opal_list_t udapl_procs; /**< list of udapl proc structures */
|
opal_list_t udapl_procs; /**< list of udapl proc structures */
|
||||||
opal_mutex_t udapl_lock; /**< lock for accessing module state */
|
opal_mutex_t udapl_lock; /**< lock for accessing module state */
|
||||||
char* udapl_mpool_name; /**< name of memory pool */
|
char* udapl_mpool_name; /**< name of memory pool */
|
||||||
bool leave_pinned; /**< pin memory on first use and leave pinned */
|
|
||||||
};
|
};
|
||||||
typedef struct mca_btl_udapl_component_t mca_btl_udapl_component_t;
|
typedef struct mca_btl_udapl_component_t mca_btl_udapl_component_t;
|
||||||
|
|
||||||
|
@ -219,8 +219,6 @@ int mca_btl_udapl_component_open(void)
|
|||||||
sizeof(mca_btl_udapl_frag_eager_rdma_t) +
|
sizeof(mca_btl_udapl_frag_eager_rdma_t) +
|
||||||
mca_btl_udapl_component.udapl_eager_frag_size;
|
mca_btl_udapl_component.udapl_eager_frag_size;
|
||||||
|
|
||||||
/* leave pinned option */
|
|
||||||
mca_btl_udapl_component.leave_pinned = (int) ompi_mpi_leave_pinned;
|
|
||||||
return OMPI_SUCCESS;
|
return OMPI_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user