From 8cad33db4029d154ae7fd976d049701cb2aa5f88 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Sun, 3 Jul 2005 00:52:18 +0000 Subject: [PATCH] * finish modex move * fix protection in opal_free_list.h * Fix some makefiles This commit was SVN r6311. --- ompi/class/Makefile.am | 2 +- ompi/mca/btl/gm/btl_gm_component.c | 1 - ompi/mca/btl/gm/btl_gm_proc.c | 2 +- ompi/mca/btl/mvapi/btl_mvapi_component.c | 1 - ompi/mca/btl/mvapi/btl_mvapi_proc.c | 2 +- ompi/mca/btl/openib/btl_openib_component.c | 1 - ompi/mca/btl/openib/btl_openib_proc.c | 2 +- ompi/mca/btl/sm/btl_sm_component.c | 2 +- ompi/mca/btl/template/btl_template_component.c | 2 +- ompi/mca/btl/template/btl_template_proc.c | 2 +- ompi/mca/mpool/sm/Makefile.am | 2 +- ompi/mca/pml/base/Makefile.am | 2 +- ompi/mca/pml/base/pml_base_module_exchange.c | 2 +- ompi/mca/pml/pml.h | 1 + ompi/mca/ptl/elan/src/ptl_elan.c | 2 +- ompi/mca/ptl/elan/src/ptl_elan_component.c | 2 +- ompi/mca/ptl/elan/src/ptl_elan_priv.h | 2 +- ompi/mca/ptl/elan/src/ptl_elan_proc.c | 2 +- ompi/mca/ptl/gm/ptl_gm_component.c | 2 +- ompi/mca/ptl/gm/ptl_gm_proc.c | 2 +- ompi/mca/ptl/mx/ptl_mx_proc.c | 2 +- ompi/mca/ptl/prof/ptl_prof_component.c | 2 +- ompi/mca/ptl/self/ptl_self_component.c | 1 - ompi/mca/ptl/sm/src/ptl_sm.c | 1 - ompi/mca/ptl/sm/src/ptl_sm_component.c | 1 - ompi/mca/ptl/sm/src/ptl_sm_send.c | 1 - ompi/mca/ptl/tcp/ptl_tcp.c | 1 - ompi/mca/ptl/tcp/ptl_tcp_component.c | 1 - ompi/mca/ptl/tcp/ptl_tcp_proc.c | 2 +- opal/class/opal_free_list.h | 4 ++-- 30 files changed, 22 insertions(+), 30 deletions(-) diff --git a/ompi/class/Makefile.am b/ompi/class/Makefile.am index 852a4b9d7f..fb8909ba62 100644 --- a/ompi/class/Makefile.am +++ b/ompi/class/Makefile.am @@ -34,7 +34,7 @@ libclass_la_SOURCES = \ ompi_bitmap.c \ ompi_free_list.c \ ompi_pointer_array.c \ - ompi_rb_tree.h + ompi_rb_tree.c # Conditionally install the header files diff --git a/ompi/mca/btl/gm/btl_gm_component.c b/ompi/mca/btl/gm/btl_gm_component.c index a5fd289458..c86b285b8b 100644 --- a/ompi/mca/btl/gm/btl_gm_component.c +++ b/ompi/mca/btl/gm/btl_gm_component.c @@ -26,7 +26,6 @@ #include "mca/btl/btl.h" #include "mca/base/mca_base_param.h" -#include "mca/base/mca_base_module_exchange.h" #include "mca/errmgr/errmgr.h" #include "mca/mpool/base/base.h" #include "mca/mpool/gm/mpool_gm.h" diff --git a/ompi/mca/btl/gm/btl_gm_proc.c b/ompi/mca/btl/gm/btl_gm_proc.c index d43afdf7a5..a5014c00cd 100644 --- a/ompi/mca/btl/gm/btl_gm_proc.c +++ b/ompi/mca/btl/gm/btl_gm_proc.c @@ -17,7 +17,7 @@ #include "ompi_config.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_proc.h" diff --git a/ompi/mca/btl/mvapi/btl_mvapi_component.c b/ompi/mca/btl/mvapi/btl_mvapi_component.c index d2710b4766..e9ace9b37a 100644 --- a/ompi/mca/btl/mvapi/btl_mvapi_component.c +++ b/ompi/mca/btl/mvapi/btl_mvapi_component.c @@ -25,7 +25,6 @@ #include "mca/btl/btl.h" #include "mca/base/mca_base_param.h" -#include "mca/base/mca_base_module_exchange.h" #include "mca/errmgr/errmgr.h" #include "mca/common/vapi/vapi_mem_reg.h" #include "mca/mpool/base/base.h" diff --git a/ompi/mca/btl/mvapi/btl_mvapi_proc.c b/ompi/mca/btl/mvapi/btl_mvapi_proc.c index 049366c4cb..501ca4116f 100644 --- a/ompi/mca/btl/mvapi/btl_mvapi_proc.c +++ b/ompi/mca/btl/mvapi/btl_mvapi_proc.c @@ -17,7 +17,7 @@ #include "ompi_config.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_proc.h" diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c index 8546d20398..20be8fc833 100644 --- a/ompi/mca/btl/openib/btl_openib_component.c +++ b/ompi/mca/btl/openib/btl_openib_component.c @@ -25,7 +25,6 @@ #include "mca/btl/btl.h" #include "mca/base/mca_base_param.h" -#include "mca/base/mca_base_module_exchange.h" #include "mca/errmgr/errmgr.h" #include "mca/common/vapi/vapi_mem_reg.h" #include "mca/mpool/base/base.h" diff --git a/ompi/mca/btl/openib/btl_openib_proc.c b/ompi/mca/btl/openib/btl_openib_proc.c index f342d8a26c..084825a79c 100644 --- a/ompi/mca/btl/openib/btl_openib_proc.c +++ b/ompi/mca/btl/openib/btl_openib_proc.c @@ -17,7 +17,7 @@ #include "ompi_config.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_proc.h" diff --git a/ompi/mca/btl/sm/btl_sm_component.c b/ompi/mca/btl/sm/btl_sm_component.c index 68e6519900..7e765c08bf 100644 --- a/ompi/mca/btl/sm/btl_sm_component.c +++ b/ompi/mca/btl/sm/btl_sm_component.c @@ -32,7 +32,7 @@ #include "util/proc_info.h" #include "mca/pml/pml.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/common/sm/common_sm_mmap.h" #include "btl_sm.h" diff --git a/ompi/mca/btl/template/btl_template_component.c b/ompi/mca/btl/template/btl_template_component.c index ae34f6c239..04e3859711 100644 --- a/ompi/mca/btl/template/btl_template_component.c +++ b/ompi/mca/btl/template/btl_template_component.c @@ -25,7 +25,7 @@ #include "mca/btl/btl.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/mpool/base/base.h" #include "btl_template.h" diff --git a/ompi/mca/btl/template/btl_template_proc.c b/ompi/mca/btl/template/btl_template_proc.c index b5da97ff43..6f0f1dc80c 100644 --- a/ompi/mca/btl/template/btl_template_proc.c +++ b/ompi/mca/btl/template/btl_template_proc.c @@ -17,7 +17,7 @@ #include "ompi_config.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_proc.h" diff --git a/ompi/mca/mpool/sm/Makefile.am b/ompi/mca/mpool/sm/Makefile.am index 1a29e7f9cd..0527e13174 100644 --- a/ompi/mca/mpool/sm/Makefile.am +++ b/ompi/mca/mpool/sm/Makefile.am @@ -43,7 +43,7 @@ mcacomponent_LTLIBRARIES = $(component_install) mca_mpool_sm_la_SOURCES = $(sources) mca_mpool_sm_la_LDFLAGS = -module -avoid-version 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) libmca_mpool_sm_la_SOURCES = $(sources) diff --git a/ompi/mca/pml/base/Makefile.am b/ompi/mca/pml/base/Makefile.am index 86c1142ab0..49effd2060 100644 --- a/ompi/mca/pml/base/Makefile.am +++ b/ompi/mca/pml/base/Makefile.am @@ -36,7 +36,7 @@ libmca_pml_base_la_SOURCES = \ $(headers) \ pml_base_bsend.c \ pml_base_close.c \ - pml_base_module_exchange.h \ + pml_base_module_exchange.c \ pml_base_open.c \ pml_base_recvreq.c \ pml_base_request.c \ diff --git a/ompi/mca/pml/base/pml_base_module_exchange.c b/ompi/mca/pml/base/pml_base_module_exchange.c index 5036527d9e..960d89543e 100644 --- a/ompi/mca/pml/base/pml_base_module_exchange.c +++ b/ompi/mca/pml/base/pml_base_module_exchange.c @@ -31,7 +31,7 @@ #include "mca/gpr/base/base.h" #include "mca/ns/ns.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" /** diff --git a/ompi/mca/pml/pml.h b/ompi/mca/pml/pml.h index db7b866ea2..2f48c7d8e5 100644 --- a/ompi/mca/pml/pml.h +++ b/ompi/mca/pml/pml.h @@ -62,6 +62,7 @@ #include "communicator/communicator.h" #include "request/request.h" #include "mca/mca.h" +#include "mca/pml/base/pml_base_module_exchange.h" #include "mpi.h" /* needed for MPI_ANY_TAG */ #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/ptl/elan/src/ptl_elan.c b/ompi/mca/ptl/elan/src/ptl_elan.c index 9a0d51c12d..801012395b 100644 --- a/ompi/mca/ptl/elan/src/ptl_elan.c +++ b/ompi/mca/ptl/elan/src/ptl_elan.c @@ -26,7 +26,7 @@ #include "mca/pml/base/pml_base_recvreq.h" #include "mca/pml/teg/src/pml_teg_proc.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_peer.h" #include "ptl_elan_proc.h" diff --git a/ompi/mca/ptl/elan/src/ptl_elan_component.c b/ompi/mca/ptl/elan/src/ptl_elan_component.c index 01d33da57f..588f2fb8af 100644 --- a/ompi/mca/ptl/elan/src/ptl_elan_component.c +++ b/ompi/mca/ptl/elan/src/ptl_elan_component.c @@ -33,7 +33,7 @@ #include "mca/ptl/ptl.h" #include "mca/pml/base/pml_base_sendreq.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_proc.h" #include "ptl_elan_frag.h" diff --git a/ompi/mca/ptl/elan/src/ptl_elan_priv.h b/ompi/mca/ptl/elan/src/ptl_elan_priv.h index 1a04c7cdfe..3e84c3749d 100644 --- a/ompi/mca/ptl/elan/src/ptl_elan_priv.h +++ b/ompi/mca/ptl/elan/src/ptl_elan_priv.h @@ -35,7 +35,7 @@ #include "mca/pml/base/pml_base_sendreq.h" #include "mca/pml/base/pml_base_recvreq.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_proc.h" #include "ptl_elan_frag.h" diff --git a/ompi/mca/ptl/elan/src/ptl_elan_proc.c b/ompi/mca/ptl/elan/src/ptl_elan_proc.c index 5f77c2de23..1315c367c5 100644 --- a/ompi/mca/ptl/elan/src/ptl_elan_proc.c +++ b/ompi/mca/ptl/elan/src/ptl_elan_proc.c @@ -20,7 +20,7 @@ #include "include/sys/atomic.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_peer.h" #include "ptl_elan_proc.h" diff --git a/ompi/mca/ptl/gm/ptl_gm_component.c b/ompi/mca/ptl/gm/ptl_gm_component.c index 66a3b2e30a..3ab9170d94 100644 --- a/ompi/mca/ptl/gm/ptl_gm_component.c +++ b/ompi/mca/ptl/gm/ptl_gm_component.c @@ -21,7 +21,7 @@ #include "include/constants.h" #include "util/output.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_priv.h" #include "ptl_gm_peer.h" diff --git a/ompi/mca/ptl/gm/ptl_gm_proc.c b/ompi/mca/ptl/gm/ptl_gm_proc.c index e8c7f47c07..637cdbf99c 100644 --- a/ompi/mca/ptl/gm/ptl_gm_proc.c +++ b/ompi/mca/ptl/gm/ptl_gm_proc.c @@ -24,7 +24,7 @@ #include "include/sys/atomic.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_peer.h" #include "ptl_gm_proc.h" diff --git a/ompi/mca/ptl/mx/ptl_mx_proc.c b/ompi/mca/ptl/mx/ptl_mx_proc.c index 60b7c53925..d0f0718dfc 100644 --- a/ompi/mca/ptl/mx/ptl_mx_proc.c +++ b/ompi/mca/ptl/mx/ptl_mx_proc.c @@ -20,7 +20,7 @@ #include "include/sys/atomic.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_peer.h" #include "ptl_mx_proc.h" diff --git a/ompi/mca/ptl/prof/ptl_prof_component.c b/ompi/mca/ptl/prof/ptl_prof_component.c index 09bc9a13b3..3e994e8ade 100644 --- a/ompi/mca/ptl/prof/ptl_prof_component.c +++ b/ompi/mca/ptl/prof/ptl_prof_component.c @@ -34,7 +34,7 @@ #include "mca/pml/base/pml_base_sendreq.h" #include "mca/ptl/base/ptl_base_recvfrag.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" static int mca_ptl_prof_component_open_fn( void ); diff --git a/ompi/mca/ptl/self/ptl_self_component.c b/ompi/mca/ptl/self/ptl_self_component.c index 7a5b3f60ae..ae6e2f8fd4 100644 --- a/ompi/mca/ptl/self/ptl_self_component.c +++ b/ompi/mca/ptl/self/ptl_self_component.c @@ -44,7 +44,6 @@ #include "mca/pml/base/pml_base_sendreq.h" #include "mca/ptl/base/ptl_base_recvfrag.h" #include "mca/base/mca_base_param.h" -#include "mca/base/mca_base_module_exchange.h" #include "ptl_self.h" mca_ptl_self_component_t mca_ptl_self_component = { diff --git a/ompi/mca/ptl/sm/src/ptl_sm.c b/ompi/mca/ptl/sm/src/ptl_sm.c index 7b0488df44..229216b59e 100644 --- a/ompi/mca/ptl/sm/src/ptl_sm.c +++ b/ompi/mca/ptl/sm/src/ptl_sm.c @@ -34,7 +34,6 @@ #include "mca/ptl/base/ptl_base_sendfrag.h" #include "mca/ptl/base/ptl_base_recvfrag.h" #include "mca/mpool/base/base.h" -#include "mca/base/mca_base_module_exchange.h" #include "mca/oob/base/base.h" #include "mca/common/sm/common_sm_mmap.h" #include "ptl_sm.h" diff --git a/ompi/mca/ptl/sm/src/ptl_sm_component.c b/ompi/mca/ptl/sm/src/ptl_sm_component.c index 55decd71d8..e486466744 100644 --- a/ompi/mca/ptl/sm/src/ptl_sm_component.c +++ b/ompi/mca/ptl/sm/src/ptl_sm_component.c @@ -34,7 +34,6 @@ #include "mca/ptl/ptl.h" #include "mca/pml/base/pml_base_sendreq.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/mpool/base/base.h" #include "mca/oob/base/base.h" diff --git a/ompi/mca/ptl/sm/src/ptl_sm_send.c b/ompi/mca/ptl/sm/src/ptl_sm_send.c index 843b7cf0dd..504f30ad22 100644 --- a/ompi/mca/ptl/sm/src/ptl_sm_send.c +++ b/ompi/mca/ptl/sm/src/ptl_sm_send.c @@ -30,7 +30,6 @@ #include "mca/ptl/base/ptl_base_header.h" #include "mca/ptl/base/ptl_base_sendfrag.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 "ptl_sm.h" #include "util/sys_info.h" diff --git a/ompi/mca/ptl/tcp/ptl_tcp.c b/ompi/mca/ptl/tcp/ptl_tcp.c index b1ac44f7bc..0a8133951a 100644 --- a/ompi/mca/ptl/tcp/ptl_tcp.c +++ b/ompi/mca/ptl/tcp/ptl_tcp.c @@ -26,7 +26,6 @@ #include "mca/ptl/base/ptl_base_sendfrag.h" #include "mca/ptl/base/ptl_base_recvreq.h" #include "mca/ptl/base/ptl_base_recvfrag.h" -#include "mca/base/mca_base_module_exchange.h" #include "ptl_tcp.h" #include "ptl_tcp_addr.h" #include "ptl_tcp_peer.h" diff --git a/ompi/mca/ptl/tcp/ptl_tcp_component.c b/ompi/mca/ptl/tcp/ptl_tcp_component.c index f97986afbf..f9dcd5f077 100644 --- a/ompi/mca/ptl/tcp/ptl_tcp_component.c +++ b/ompi/mca/ptl/tcp/ptl_tcp_component.c @@ -42,7 +42,6 @@ #include "mca/ptl/ptl.h" #include "mca/pml/base/pml_base_sendreq.h" #include "mca/base/mca_base_param.h" -#include "mca/base/mca_base_module_exchange.h" #include "mca/ns/ns_types.h" #include "mca/oob/base/base.h" diff --git a/ompi/mca/ptl/tcp/ptl_tcp_proc.c b/ompi/mca/ptl/tcp/ptl_tcp_proc.c index 13a41104ee..ea3678961e 100644 --- a/ompi/mca/ptl/tcp/ptl_tcp_proc.c +++ b/ompi/mca/ptl/tcp/ptl_tcp_proc.c @@ -20,7 +20,7 @@ #include "include/sys/atomic.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 "ptl_tcp.h" #include "ptl_tcp_addr.h" diff --git a/opal/class/opal_free_list.h b/opal/class/opal_free_list.h index 18cdaff310..f205b17bd0 100644 --- a/opal/class/opal_free_list.h +++ b/opal/class/opal_free_list.h @@ -14,8 +14,8 @@ * $HEADER$ */ -#ifndef OMPI_FREE_LIST_H -#define OMPI_FREE_LIST_H +#ifndef OPAL_FREE_LIST_H +#define OPAL_FREE_LIST_H #include "ompi_config.h"