Open MPI logo

Open MPI Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Development mailing list

From: Tim S. Woodall (twoodall_at_[hidden])
Date: 2006-02-23 12:22:50


Thanks Brian...

brbarret_at_[hidden] wrote:
> Author: brbarret
> Date: 2006-02-22 19:39:01 -0500 (Wed, 22 Feb 2006)
> New Revision: 9118
>
> Modified:
> trunk/ompi/communicator/comm.c
> trunk/ompi/mca/pml/base/pml_base_bsend.h
> trunk/ompi/mca/pml/base/pml_base_module_exchange.c
> trunk/ompi/mca/pml/base/pml_base_open.c
> trunk/ompi/mca/pml/dr/pml_dr_comm.h
> trunk/ompi/mca/pml/dr/pml_dr_recvfrag.c
> trunk/ompi/mca/pml/ob1/pml_ob1_comm.h
> trunk/ompi/mca/pml/ob1/pml_ob1_recvfrag.c
> trunk/ompi/mca/pml/pml.h
> trunk/ompi/tools/ompi_info/components.cc
> trunk/ompi/tools/ompi_info/ompi_info.cc
> Log:
> * finish the TEG/UNIQ/PTL removal
>
>
> Modified: trunk/ompi/communicator/comm.c
> ===================================================================
> --- trunk/ompi/communicator/comm.c 2006-02-22 21:53:08 UTC (rev 9117)
> +++ trunk/ompi/communicator/comm.c 2006-02-23 00:39:01 UTC (rev 9118)
> @@ -34,7 +34,6 @@
> #include "ompi/attribute/attribute.h"
> #include "ompi/communicator/communicator.h"
> #include "ompi/mca/pml/pml.h"
> -#include "ompi/mca/ptl/base/ptl_base_comm.h"
> #include "ompi/request/request.h"
>
> /*
>
> Modified: trunk/ompi/mca/pml/base/pml_base_bsend.h
> ===================================================================
> --- trunk/ompi/mca/pml/base/pml_base_bsend.h 2006-02-22 21:53:08 UTC (rev 9117)
> +++ trunk/ompi/mca/pml/base/pml_base_bsend.h 2006-02-23 00:39:01 UTC (rev 9118)
> @@ -24,7 +24,6 @@
> #if defined(c_plusplus) || defined(__cplusplus)
> extern "C" {
> #endif
> -struct mca_ptl_base_send_request_t;
>
> OMPI_DECLSPEC int mca_pml_base_bsend_init(bool enable_mpi_threads);
> OMPI_DECLSPEC int mca_pml_base_bsend_fini(void);
>
> Modified: trunk/ompi/mca/pml/base/pml_base_module_exchange.c
> ===================================================================
> --- trunk/ompi/mca/pml/base/pml_base_module_exchange.c 2006-02-22 21:53:08 UTC (rev 9117)
> +++ trunk/ompi/mca/pml/base/pml_base_module_exchange.c 2006-02-23 00:39:01 UTC (rev 9118)
> @@ -402,7 +402,7 @@
> }
> OPAL_UNLOCK(&mca_pml_base_modex_lock);
>
> - /* otherwise - subscribe to get this jobid's ptl contact info */
> + /* otherwise - subscribe to get this jobid's contact info */
> if (ORTE_SUCCESS != (rc = orte_ns.get_jobid(&jobid, name))) {
> ORTE_ERROR_LOG(rc);
> return rc;
>
> Modified: trunk/ompi/mca/pml/base/pml_base_open.c
> ===================================================================
> --- trunk/ompi/mca/pml/base/pml_base_open.c 2006-02-22 21:53:08 UTC (rev 9117)
> +++ trunk/ompi/mca/pml/base/pml_base_open.c 2006-02-23 00:39:01 UTC (rev 9118)
> @@ -25,7 +25,6 @@
> #include "ompi/constants.h"
> #include "ompi/mca/pml/pml.h"
> #include "ompi/mca/pml/base/base.h"
> -#include "ompi/mca/ptl/base/base.h"
>
> /*
> * The following file was created by configure. It contains extern
> @@ -89,7 +88,4 @@
>
> mca_base_param_lookup_string(
> mca_base_param_register_string("pml",NULL,NULL,NULL,"ob1"), &mca_pml_base_pml);
> -
> - /* All done, now let's start the PTLs */
> - return mca_ptl_base_open();
> }
>
> Modified: trunk/ompi/mca/pml/dr/pml_dr_comm.h
> ===================================================================
> --- trunk/ompi/mca/pml/dr/pml_dr_comm.h 2006-02-22 21:53:08 UTC (rev 9117)
> +++ trunk/ompi/mca/pml/dr/pml_dr_comm.h 2006-02-23 00:39:01 UTC (rev 9118)
> @@ -23,7 +23,6 @@
>
> #include "opal/threads/mutex.h"
> #include "opal/threads/condition.h"
> -#include "ompi/mca/ptl/ptl.h"
> #include "opal/class/opal_list.h"
> #include "ompi/communicator/communicator.h"
> #include "ompi/proc/proc.h"
>
> Modified: trunk/ompi/mca/pml/dr/pml_dr_recvfrag.c
> ===================================================================
> --- trunk/ompi/mca/pml/dr/pml_dr_recvfrag.c 2006-02-22 21:53:08 UTC (rev 9117)
> +++ trunk/ompi/mca/pml/dr/pml_dr_recvfrag.c 2006-02-23 00:39:01 UTC (rev 9118)
> @@ -254,7 +254,7 @@
> do { \
> /* local variables */ \
> mca_pml_dr_recv_request_t *specific_recv, *wild_recv; \
> - mca_ptl_sequence_t wild_recv_seq, specific_recv_seq; \
> + mca_pml_sequence_t wild_recv_seq, specific_recv_seq; \
> int frag_tag, wild_recv_tag, specific_recv_tag; \
> \
> /* initialization */ \
>
> Modified: trunk/ompi/mca/pml/ob1/pml_ob1_comm.h
> ===================================================================
> --- trunk/ompi/mca/pml/ob1/pml_ob1_comm.h 2006-02-22 21:53:08 UTC (rev 9117)
> +++ trunk/ompi/mca/pml/ob1/pml_ob1_comm.h 2006-02-23 00:39:01 UTC (rev 9118)
> @@ -23,7 +23,6 @@
>
> #include "opal/threads/mutex.h"
> #include "opal/threads/condition.h"
> -#include "ompi/mca/ptl/ptl.h"
> #include "opal/class/opal_list.h"
> #include "ompi/proc/proc.h"
> #if defined(c_plusplus) || defined(__cplusplus)
>
> Modified: trunk/ompi/mca/pml/ob1/pml_ob1_recvfrag.c
> ===================================================================
> --- trunk/ompi/mca/pml/ob1/pml_ob1_recvfrag.c 2006-02-22 21:53:08 UTC (rev 9117)
> +++ trunk/ompi/mca/pml/ob1/pml_ob1_recvfrag.c 2006-02-23 00:39:01 UTC (rev 9118)
> @@ -222,7 +222,7 @@
> do { \
> /* local variables */ \
> mca_pml_ob1_recv_request_t *specific_recv, *wild_recv; \
> - mca_ptl_sequence_t wild_recv_seq, specific_recv_seq; \
> + mca_pml_sequence_t wild_recv_seq, specific_recv_seq; \
> int frag_tag, wild_recv_tag, specific_recv_tag; \
> \
> /* initialization */ \
>
> Modified: trunk/ompi/mca/pml/pml.h
> ===================================================================
> --- trunk/ompi/mca/pml/pml.h 2006-02-22 21:53:08 UTC (rev 9117)
> +++ trunk/ompi/mca/pml/pml.h 2006-02-23 00:39:01 UTC (rev 9118)
> @@ -72,8 +72,7 @@
> * PML component types
> */
>
> -struct mca_ptl_base_modulet;
> -struct mca_ptl_addr_t;
> +typedef uint64_t mca_pml_sequence_t;
>
> struct mca_pml_proc_t {
> opal_list_item_t super;
> @@ -177,7 +176,7 @@
>
> /**
> * For non-threaded case, provides MCA the opportunity to
> - * progress outstanding requests on all ptls.
> + * progress outstanding requests on all btls.
> *
> * @return OMPI_SUCCESS or failure status.
> */
>
> Modified: trunk/ompi/tools/ompi_info/components.cc
> ===================================================================
> --- trunk/ompi/tools/ompi_info/components.cc 2006-02-22 21:53:08 UTC (rev 9117)
> +++ trunk/ompi/tools/ompi_info/components.cc 2006-02-23 00:39:01 UTC (rev 9118)
> @@ -56,8 +56,6 @@
> #include "ompi/mca/bml/base/base.h"
> #include "ompi/mca/rcache/rcache.h"
> #include "ompi/mca/rcache/base/base.h"
> -#include "ompi/mca/ptl/ptl.h"
> -#include "ompi/mca/ptl/base/base.h"
> #include "ompi/mca/btl/btl.h"
> #include "ompi/mca/btl/base/base.h"
> #include "ompi/mca/topo/topo.h"
> @@ -248,11 +246,6 @@
> ompi_osc_base_open();
> component_map["osc"] = &ompi_osc_base_open_components;
>
> - /* mca_ptl_base_open() should not be called directly. This call is performed
> - * in the PML base open.
> - */
> - component_map["ptl"] = &mca_ptl_base_components_opened;
> -
> mca_btl_base_open();
> component_map["btl"] = &mca_btl_base_components_opened;
>
>
> Modified: trunk/ompi/tools/ompi_info/ompi_info.cc
> ===================================================================
> --- trunk/ompi/tools/ompi_info/ompi_info.cc 2006-02-22 21:53:08 UTC (rev 9117)
> +++ trunk/ompi/tools/ompi_info/ompi_info.cc 2006-02-23 00:39:01 UTC (rev 9118)
> @@ -180,7 +180,6 @@
> ompi_info::mca_types.push_back("pml");
> ompi_info::mca_types.push_back("bml");
> ompi_info::mca_types.push_back("rcache");
> - ompi_info::mca_types.push_back("ptl");
> ompi_info::mca_types.push_back("btl");
> ompi_info::mca_types.push_back("topo");
> ompi_info::mca_types.push_back("osc");
>
> _______________________________________________
> svn mailing list
> svn_at_[hidden]
> http://www.open-mpi.org/mailman/listinfo.cgi/svn
>