* finish modex move
* fix protection in opal_free_list.h * Fix some makefiles This commit was SVN r6311.
Этот коммит содержится в:
родитель
e422152b55
Коммит
8cad33db40
@ -34,7 +34,7 @@ libclass_la_SOURCES = \
|
|||||||
ompi_bitmap.c \
|
ompi_bitmap.c \
|
||||||
ompi_free_list.c \
|
ompi_free_list.c \
|
||||||
ompi_pointer_array.c \
|
ompi_pointer_array.c \
|
||||||
ompi_rb_tree.h
|
ompi_rb_tree.c
|
||||||
|
|
||||||
# Conditionally install the header files
|
# Conditionally install the header files
|
||||||
|
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
#include "mca/btl/btl.h"
|
#include "mca/btl/btl.h"
|
||||||
|
|
||||||
#include "mca/base/mca_base_param.h"
|
#include "mca/base/mca_base_param.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
|
||||||
#include "mca/errmgr/errmgr.h"
|
#include "mca/errmgr/errmgr.h"
|
||||||
#include "mca/mpool/base/base.h"
|
#include "mca/mpool/base/base.h"
|
||||||
#include "mca/mpool/gm/mpool_gm.h"
|
#include "mca/mpool/gm/mpool_gm.h"
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "ompi_config.h"
|
#include "ompi_config.h"
|
||||||
|
|
||||||
#include "class/ompi_hash_table.h"
|
#include "class/ompi_hash_table.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
|
|
||||||
#include "btl_gm.h"
|
#include "btl_gm.h"
|
||||||
#include "btl_gm_proc.h"
|
#include "btl_gm_proc.h"
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
#include "mca/btl/btl.h"
|
#include "mca/btl/btl.h"
|
||||||
|
|
||||||
#include "mca/base/mca_base_param.h"
|
#include "mca/base/mca_base_param.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
|
||||||
#include "mca/errmgr/errmgr.h"
|
#include "mca/errmgr/errmgr.h"
|
||||||
#include "mca/common/vapi/vapi_mem_reg.h"
|
#include "mca/common/vapi/vapi_mem_reg.h"
|
||||||
#include "mca/mpool/base/base.h"
|
#include "mca/mpool/base/base.h"
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "ompi_config.h"
|
#include "ompi_config.h"
|
||||||
|
|
||||||
#include "class/ompi_hash_table.h"
|
#include "class/ompi_hash_table.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
|
|
||||||
#include "btl_mvapi.h"
|
#include "btl_mvapi.h"
|
||||||
#include "btl_mvapi_proc.h"
|
#include "btl_mvapi_proc.h"
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
#include "mca/btl/btl.h"
|
#include "mca/btl/btl.h"
|
||||||
|
|
||||||
#include "mca/base/mca_base_param.h"
|
#include "mca/base/mca_base_param.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
|
||||||
#include "mca/errmgr/errmgr.h"
|
#include "mca/errmgr/errmgr.h"
|
||||||
#include "mca/common/vapi/vapi_mem_reg.h"
|
#include "mca/common/vapi/vapi_mem_reg.h"
|
||||||
#include "mca/mpool/base/base.h"
|
#include "mca/mpool/base/base.h"
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "ompi_config.h"
|
#include "ompi_config.h"
|
||||||
|
|
||||||
#include "class/ompi_hash_table.h"
|
#include "class/ompi_hash_table.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
|
|
||||||
#include "btl_openib.h"
|
#include "btl_openib.h"
|
||||||
#include "btl_openib_proc.h"
|
#include "btl_openib_proc.h"
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
#include "util/proc_info.h"
|
#include "util/proc_info.h"
|
||||||
#include "mca/pml/pml.h"
|
#include "mca/pml/pml.h"
|
||||||
#include "mca/base/mca_base_param.h"
|
#include "mca/base/mca_base_param.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "mca/mpool/base/base.h"
|
#include "mca/mpool/base/base.h"
|
||||||
#include "mca/common/sm/common_sm_mmap.h"
|
#include "mca/common/sm/common_sm_mmap.h"
|
||||||
#include "btl_sm.h"
|
#include "btl_sm.h"
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
#include "mca/btl/btl.h"
|
#include "mca/btl/btl.h"
|
||||||
|
|
||||||
#include "mca/base/mca_base_param.h"
|
#include "mca/base/mca_base_param.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "mca/errmgr/errmgr.h"
|
#include "mca/errmgr/errmgr.h"
|
||||||
#include "mca/mpool/base/base.h"
|
#include "mca/mpool/base/base.h"
|
||||||
#include "btl_template.h"
|
#include "btl_template.h"
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "ompi_config.h"
|
#include "ompi_config.h"
|
||||||
|
|
||||||
#include "class/ompi_hash_table.h"
|
#include "class/ompi_hash_table.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
|
|
||||||
#include "btl_template.h"
|
#include "btl_template.h"
|
||||||
#include "btl_template_proc.h"
|
#include "btl_template_proc.h"
|
||||||
|
@ -43,7 +43,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
|
|||||||
mca_mpool_sm_la_SOURCES = $(sources)
|
mca_mpool_sm_la_SOURCES = $(sources)
|
||||||
mca_mpool_sm_la_LDFLAGS = -module -avoid-version
|
mca_mpool_sm_la_LDFLAGS = -module -avoid-version
|
||||||
mca_mpool_sm_la_LIBADD = \
|
mca_mpool_sm_la_LIBADD = \
|
||||||
$(top_ompi_builddir)/src/mca/common/sm/libmca_common_sm.la
|
$(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
|
||||||
|
|
||||||
noinst_LTLIBRARIES = $(component_noinst)
|
noinst_LTLIBRARIES = $(component_noinst)
|
||||||
libmca_mpool_sm_la_SOURCES = $(sources)
|
libmca_mpool_sm_la_SOURCES = $(sources)
|
||||||
|
@ -36,7 +36,7 @@ libmca_pml_base_la_SOURCES = \
|
|||||||
$(headers) \
|
$(headers) \
|
||||||
pml_base_bsend.c \
|
pml_base_bsend.c \
|
||||||
pml_base_close.c \
|
pml_base_close.c \
|
||||||
pml_base_module_exchange.h \
|
pml_base_module_exchange.c \
|
||||||
pml_base_open.c \
|
pml_base_open.c \
|
||||||
pml_base_recvreq.c \
|
pml_base_recvreq.c \
|
||||||
pml_base_request.c \
|
pml_base_request.c \
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
#include "mca/gpr/base/base.h"
|
#include "mca/gpr/base/base.h"
|
||||||
#include "mca/ns/ns.h"
|
#include "mca/ns/ns.h"
|
||||||
#include "mca/pml/pml.h"
|
#include "mca/pml/pml.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "runtime/runtime.h"
|
#include "runtime/runtime.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -62,6 +62,7 @@
|
|||||||
#include "communicator/communicator.h"
|
#include "communicator/communicator.h"
|
||||||
#include "request/request.h"
|
#include "request/request.h"
|
||||||
#include "mca/mca.h"
|
#include "mca/mca.h"
|
||||||
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "mpi.h" /* needed for MPI_ANY_TAG */
|
#include "mpi.h" /* needed for MPI_ANY_TAG */
|
||||||
|
|
||||||
#if defined(c_plusplus) || defined(__cplusplus)
|
#if defined(c_plusplus) || defined(__cplusplus)
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#include "mca/pml/base/pml_base_recvreq.h"
|
#include "mca/pml/base/pml_base_recvreq.h"
|
||||||
#include "mca/pml/teg/src/pml_teg_proc.h"
|
#include "mca/pml/teg/src/pml_teg_proc.h"
|
||||||
#include "mca/ptl/base/ptl_base_recvfrag.h"
|
#include "mca/ptl/base/ptl_base_recvfrag.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "ptl_elan.h"
|
#include "ptl_elan.h"
|
||||||
#include "ptl_elan_peer.h"
|
#include "ptl_elan_peer.h"
|
||||||
#include "ptl_elan_proc.h"
|
#include "ptl_elan_proc.h"
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
#include "mca/ptl/ptl.h"
|
#include "mca/ptl/ptl.h"
|
||||||
#include "mca/pml/base/pml_base_sendreq.h"
|
#include "mca/pml/base/pml_base_sendreq.h"
|
||||||
#include "mca/base/mca_base_param.h"
|
#include "mca/base/mca_base_param.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "ptl_elan.h"
|
#include "ptl_elan.h"
|
||||||
#include "ptl_elan_proc.h"
|
#include "ptl_elan_proc.h"
|
||||||
#include "ptl_elan_frag.h"
|
#include "ptl_elan_frag.h"
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
#include "mca/pml/base/pml_base_sendreq.h"
|
#include "mca/pml/base/pml_base_sendreq.h"
|
||||||
#include "mca/pml/base/pml_base_recvreq.h"
|
#include "mca/pml/base/pml_base_recvreq.h"
|
||||||
#include "mca/base/mca_base_param.h"
|
#include "mca/base/mca_base_param.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "ptl_elan.h"
|
#include "ptl_elan.h"
|
||||||
#include "ptl_elan_proc.h"
|
#include "ptl_elan_proc.h"
|
||||||
#include "ptl_elan_frag.h"
|
#include "ptl_elan_frag.h"
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
#include "include/sys/atomic.h"
|
#include "include/sys/atomic.h"
|
||||||
#include "class/ompi_hash_table.h"
|
#include "class/ompi_hash_table.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "ptl_elan.h"
|
#include "ptl_elan.h"
|
||||||
#include "ptl_elan_peer.h"
|
#include "ptl_elan_peer.h"
|
||||||
#include "ptl_elan_proc.h"
|
#include "ptl_elan_proc.h"
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include "include/constants.h"
|
#include "include/constants.h"
|
||||||
#include "util/output.h"
|
#include "util/output.h"
|
||||||
#include "mca/ptl/ptl.h"
|
#include "mca/ptl/ptl.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "ptl_gm.h"
|
#include "ptl_gm.h"
|
||||||
#include "ptl_gm_priv.h"
|
#include "ptl_gm_priv.h"
|
||||||
#include "ptl_gm_peer.h"
|
#include "ptl_gm_peer.h"
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
#include "include/sys/atomic.h"
|
#include "include/sys/atomic.h"
|
||||||
#include "class/ompi_hash_table.h"
|
#include "class/ompi_hash_table.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "ptl_gm.h"
|
#include "ptl_gm.h"
|
||||||
#include "ptl_gm_peer.h"
|
#include "ptl_gm_peer.h"
|
||||||
#include "ptl_gm_proc.h"
|
#include "ptl_gm_proc.h"
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
#include "include/sys/atomic.h"
|
#include "include/sys/atomic.h"
|
||||||
#include "class/ompi_proc_table.h"
|
#include "class/ompi_proc_table.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "ptl_mx.h"
|
#include "ptl_mx.h"
|
||||||
#include "ptl_mx_peer.h"
|
#include "ptl_mx_peer.h"
|
||||||
#include "ptl_mx_proc.h"
|
#include "ptl_mx_proc.h"
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
#include "mca/pml/base/pml_base_sendreq.h"
|
#include "mca/pml/base/pml_base_sendreq.h"
|
||||||
#include "mca/ptl/base/ptl_base_recvfrag.h"
|
#include "mca/ptl/base/ptl_base_recvfrag.h"
|
||||||
#include "mca/base/mca_base_param.h"
|
#include "mca/base/mca_base_param.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "ptl_prof.h"
|
#include "ptl_prof.h"
|
||||||
|
|
||||||
static int mca_ptl_prof_component_open_fn( void );
|
static int mca_ptl_prof_component_open_fn( void );
|
||||||
|
@ -44,7 +44,6 @@
|
|||||||
#include "mca/pml/base/pml_base_sendreq.h"
|
#include "mca/pml/base/pml_base_sendreq.h"
|
||||||
#include "mca/ptl/base/ptl_base_recvfrag.h"
|
#include "mca/ptl/base/ptl_base_recvfrag.h"
|
||||||
#include "mca/base/mca_base_param.h"
|
#include "mca/base/mca_base_param.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
|
||||||
#include "ptl_self.h"
|
#include "ptl_self.h"
|
||||||
|
|
||||||
mca_ptl_self_component_t mca_ptl_self_component = {
|
mca_ptl_self_component_t mca_ptl_self_component = {
|
||||||
|
@ -34,7 +34,6 @@
|
|||||||
#include "mca/ptl/base/ptl_base_sendfrag.h"
|
#include "mca/ptl/base/ptl_base_sendfrag.h"
|
||||||
#include "mca/ptl/base/ptl_base_recvfrag.h"
|
#include "mca/ptl/base/ptl_base_recvfrag.h"
|
||||||
#include "mca/mpool/base/base.h"
|
#include "mca/mpool/base/base.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
|
||||||
#include "mca/oob/base/base.h"
|
#include "mca/oob/base/base.h"
|
||||||
#include "mca/common/sm/common_sm_mmap.h"
|
#include "mca/common/sm/common_sm_mmap.h"
|
||||||
#include "ptl_sm.h"
|
#include "ptl_sm.h"
|
||||||
|
@ -34,7 +34,6 @@
|
|||||||
#include "mca/ptl/ptl.h"
|
#include "mca/ptl/ptl.h"
|
||||||
#include "mca/pml/base/pml_base_sendreq.h"
|
#include "mca/pml/base/pml_base_sendreq.h"
|
||||||
#include "mca/base/mca_base_param.h"
|
#include "mca/base/mca_base_param.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
|
||||||
#include "mca/ptl/sm/src/ptl_sm.h"
|
#include "mca/ptl/sm/src/ptl_sm.h"
|
||||||
#include "mca/mpool/base/base.h"
|
#include "mca/mpool/base/base.h"
|
||||||
#include "mca/oob/base/base.h"
|
#include "mca/oob/base/base.h"
|
||||||
|
@ -30,7 +30,6 @@
|
|||||||
#include "mca/ptl/base/ptl_base_header.h"
|
#include "mca/ptl/base/ptl_base_header.h"
|
||||||
#include "mca/ptl/base/ptl_base_sendfrag.h"
|
#include "mca/ptl/base/ptl_base_sendfrag.h"
|
||||||
#include "mca/ptl/base/ptl_base_recvfrag.h"
|
#include "mca/ptl/base/ptl_base_recvfrag.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
|
||||||
#include "mca/common/sm/common_sm_mmap.h"
|
#include "mca/common/sm/common_sm_mmap.h"
|
||||||
#include "ptl_sm.h"
|
#include "ptl_sm.h"
|
||||||
#include "util/sys_info.h"
|
#include "util/sys_info.h"
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
#include "mca/ptl/base/ptl_base_sendfrag.h"
|
#include "mca/ptl/base/ptl_base_sendfrag.h"
|
||||||
#include "mca/ptl/base/ptl_base_recvreq.h"
|
#include "mca/ptl/base/ptl_base_recvreq.h"
|
||||||
#include "mca/ptl/base/ptl_base_recvfrag.h"
|
#include "mca/ptl/base/ptl_base_recvfrag.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
|
||||||
#include "ptl_tcp.h"
|
#include "ptl_tcp.h"
|
||||||
#include "ptl_tcp_addr.h"
|
#include "ptl_tcp_addr.h"
|
||||||
#include "ptl_tcp_peer.h"
|
#include "ptl_tcp_peer.h"
|
||||||
|
@ -42,7 +42,6 @@
|
|||||||
#include "mca/ptl/ptl.h"
|
#include "mca/ptl/ptl.h"
|
||||||
#include "mca/pml/base/pml_base_sendreq.h"
|
#include "mca/pml/base/pml_base_sendreq.h"
|
||||||
#include "mca/base/mca_base_param.h"
|
#include "mca/base/mca_base_param.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
|
||||||
#include "mca/ns/ns_types.h"
|
#include "mca/ns/ns_types.h"
|
||||||
|
|
||||||
#include "mca/oob/base/base.h"
|
#include "mca/oob/base/base.h"
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
#include "include/sys/atomic.h"
|
#include "include/sys/atomic.h"
|
||||||
#include "class/ompi_proc_table.h"
|
#include "class/ompi_proc_table.h"
|
||||||
#include "mca/base/mca_base_module_exchange.h"
|
#include "mca/pml/base/pml_base_module_exchange.h"
|
||||||
#include "mca/ns/ns_types.h"
|
#include "mca/ns/ns_types.h"
|
||||||
#include "ptl_tcp.h"
|
#include "ptl_tcp.h"
|
||||||
#include "ptl_tcp_addr.h"
|
#include "ptl_tcp_addr.h"
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
* $HEADER$
|
* $HEADER$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef OMPI_FREE_LIST_H
|
#ifndef OPAL_FREE_LIST_H
|
||||||
#define OMPI_FREE_LIST_H
|
#define OPAL_FREE_LIST_H
|
||||||
|
|
||||||
#include "ompi_config.h"
|
#include "ompi_config.h"
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user