George, I think the strings in the two opal_output() calls should also be updated from "open" to "init": "mca_pml_ob1_component_init: ..."
On Tue, May 20, 2014 at 3:34 PM, <svn-commit-mai...@open-mpi.org> wrote: > Author: bosilca (George Bosilca) > Date: 2014-05-20 15:34:18 EDT (Tue, 20 May 2014) > New Revision: 31838 > URL: https://svn.open-mpi.org/trac/ompi/changeset/31838 > > Log: > Move the allocator initialization from open to init. This clean > a memory leak. Similar changes shuld be applied to all the > other PML that are copies of OB1. This patch is related to > #4653. > > Text files modified: > trunk/ompi/mca/pml/ob1/pml_ob1_component.c | 32 > ++++++++++++++++---------------- > 1 files changed, 16 insertions(+), 16 deletions(-) > > Modified: trunk/ompi/mca/pml/ob1/pml_ob1_component.c > > ============================================================================== > --- trunk/ompi/mca/pml/ob1/pml_ob1_component.c Tue May 20 12:32:41 2014 > (r31837) > +++ trunk/ompi/mca/pml/ob1/pml_ob1_component.c 2014-05-20 15:34:18 EDT > (Tue, 20 May 2014) (r31838) > @@ -217,25 +217,9 @@ > > static int mca_pml_ob1_component_open(void) > { > - mca_allocator_base_component_t* allocator_component; > - > mca_pml_ob1_output = opal_output_open(NULL); > opal_output_set_verbosity(mca_pml_ob1_output, mca_pml_ob1_verbose); > > - allocator_component = mca_allocator_component_lookup( > mca_pml_ob1.allocator_name ); > - if(NULL == allocator_component) { > - opal_output(0, "mca_pml_ob1_component_open: can't find allocator: > %s\n", mca_pml_ob1.allocator_name); > - return OMPI_ERROR; > - } > - > - mca_pml_ob1.allocator = allocator_component->allocator_init(true, > - > mca_pml_ob1_seg_alloc, > - > mca_pml_ob1_seg_free, NULL); > - if(NULL == mca_pml_ob1.allocator) { > - opal_output(0, "mca_pml_ob1_component_open: unable to initialize > allocator\n"); > - return OMPI_ERROR; > - } > - > mca_pml_ob1.enabled = false; > return mca_base_framework_open(&ompi_bml_base_framework, 0); > } > @@ -259,6 +243,8 @@ > bool enable_progress_threads, > bool enable_mpi_threads ) > { > + mca_allocator_base_component_t* allocator_component; > + > opal_output_verbose( 10, mca_pml_ob1_output, > "in ob1, my priority is %d\n", > mca_pml_ob1.priority); > > @@ -268,6 +254,20 @@ > } > *priority = mca_pml_ob1.priority; > > + allocator_component = mca_allocator_component_lookup( > mca_pml_ob1.allocator_name ); > + if(NULL == allocator_component) { > + opal_output(0, "mca_pml_ob1_component_open: can't find allocator: > %s\n", mca_pml_ob1.allocator_name); > + return NULL; > + } > + > + mca_pml_ob1.allocator = allocator_component->allocator_init(true, > + > mca_pml_ob1_seg_alloc, > + > mca_pml_ob1_seg_free, NULL); > + if(NULL == mca_pml_ob1.allocator) { > + opal_output(0, "mca_pml_ob1_component_open: unable to initialize > allocator\n"); > + return NULL; > + } > + > if(OMPI_SUCCESS != mca_bml_base_init( enable_progress_threads, > enable_mpi_threads)) { > return NULL; > _______________________________________________ > svn-full mailing list > svn-f...@open-mpi.org > http://www.open-mpi.org/mailman/listinfo.cgi/svn-full > -- Tim Mattox, Ph.D. - tmat...@gmail.com
