From 0ad973afddfa36a7db2e17a22584e320bd8b85da Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Fri, 9 Sep 2005 22:21:57 +0000 Subject: [PATCH] Do not modex sned and receive the proc architecture. This is now done outside the PML in the proc init and was added there few weeks ago by Ralph. This commit was SVN r7282. --- ompi/mca/pml/ob1/pml_ob1.c | 5 ----- ompi/mca/pml/teg/pml_teg.c | 24 +----------------------- ompi/mca/pml/uniq/pml_uniq.c | 25 +------------------------ 3 files changed, 2 insertions(+), 52 deletions(-) diff --git a/ompi/mca/pml/ob1/pml_ob1.c b/ompi/mca/pml/ob1/pml_ob1.c index eb5534189f..672af9346e 100644 --- a/ompi/mca/pml/ob1/pml_ob1.c +++ b/ompi/mca/pml/ob1/pml_ob1.c @@ -121,11 +121,6 @@ int mca_pml_ob1_add_procs(ompi_proc_t** procs, size_t nprocs) if(OMPI_SUCCESS != rc) return rc; - - for(p=0; pproc_arch = ompi_proc_local()->proc_arch; - } - rc = mca_bml.bml_add_procs( nprocs, procs, diff --git a/ompi/mca/pml/teg/pml_teg.c b/ompi/mca/pml/teg/pml_teg.c index 7749f47e60..21dc7dc979 100644 --- a/ompi/mca/pml/teg/pml_teg.c +++ b/ompi/mca/pml/teg/pml_teg.c @@ -172,8 +172,7 @@ static int mca_pml_teg_add_ptls(void) int mca_pml_teg_enable(bool enable) { size_t i=0; - int value = enable, rc; - uint32_t proc_arch; + int value = enable; /* If I'm not selected then prepare for close */ if( false == enable ) return OMPI_SUCCESS; @@ -187,13 +186,6 @@ int mca_pml_teg_enable(bool enable) mca_pml_teg.teg_free_list_inc, NULL ); - /* I get selected. Publish my information */ - proc_arch = ompi_proc_local()->proc_arch; - proc_arch = htonl(proc_arch); - rc = mca_pml_base_modex_send(&mca_pml_teg_component.pmlm_version, &proc_arch, sizeof(proc_arch)); - if(rc != OMPI_SUCCESS) - return rc; - /* Grab all the PTLs and prepare them */ mca_pml_teg_add_ptls(); @@ -230,20 +222,6 @@ int mca_pml_teg_add_procs(ompi_proc_t** procs, size_t nprocs) if(OMPI_SUCCESS != rc) return rc; - /* iterate through each of the procs and set the peers architecture */ - for(p=0; pproc_arch = ntohl(*proc_arch); - free(proc_arch); - } - /* attempt to add all procs to each ptl */ ptl_peers = (struct mca_ptl_base_peer_t **)malloc(nprocs * sizeof(struct mca_ptl_base_peer_t*)); for(p_index = 0; p_index < mca_pml_teg.teg_num_ptl_modules; p_index++) { diff --git a/ompi/mca/pml/uniq/pml_uniq.c b/ompi/mca/pml/uniq/pml_uniq.c index cbed5daf76..1879c545f0 100644 --- a/ompi/mca/pml/uniq/pml_uniq.c +++ b/ompi/mca/pml/uniq/pml_uniq.c @@ -172,8 +172,7 @@ static int mca_pml_uniq_add_ptls( void ) int mca_pml_uniq_enable( bool enable ) { size_t i; - int value = enable, rc; - uint32_t proc_arch; + int value = enable; /* If I'm not selected then prepare for close */ if( false == enable ) return OMPI_SUCCESS; @@ -187,14 +186,6 @@ int mca_pml_uniq_enable( bool enable ) mca_pml_uniq.uniq_free_list_inc, NULL ); - /* I get selected. Publish my informations */ - proc_arch = ompi_proc_local()->proc_arch; - proc_arch = htonl(proc_arch); - rc = mca_pml_base_modex_send(&mca_pml_uniq_component.pmlm_version, &proc_arch, sizeof(proc_arch)); - if( rc != OMPI_SUCCESS ) - return rc; - - /* Grab all the PTLs and prepare them */ mca_pml_uniq_add_ptls(); @@ -230,20 +221,6 @@ int mca_pml_uniq_add_procs(ompi_proc_t** procs, size_t nprocs) if( OMPI_SUCCESS != rc ) return rc; - /* iterate through each of the procs and set the peers architecture */ - for( p = 0; p < nprocs; p++ ) { - uint32_t* proc_arch; - size_t size = sizeof(uint32_t); - rc = mca_pml_base_modex_recv(&mca_pml_uniq_component.pmlm_version, procs[p], - (void**)&proc_arch, &size); - if(rc != OMPI_SUCCESS) - return rc; - if(size != sizeof(uint32_t)) - return OMPI_ERROR; - procs[p]->proc_arch = ntohl(*proc_arch); - free(proc_arch); - } - /* attempt to add all procs to each ptl */ ptl_peers = (struct mca_ptl_base_peer_t **)malloc(nprocs * sizeof(struct mca_ptl_base_peer_t*)); for( p_index = 0; p_index < mca_pml_uniq.uniq_num_ptl_modules; p_index++ ) {