From 7812efa3ce332da1983dc7cbb48259fcf08cd14d Mon Sep 17 00:00:00 2001 From: David Daniel Date: Tue, 10 Feb 2004 17:03:15 +0000 Subject: [PATCH] More object fixes This commit was SVN r682. --- src/mca/mpi/pml/teg/src/pml_teg.c | 7 +++---- src/mca/mpi/pml/teg/src/pml_teg_proc.h | 6 ++++-- src/mpi/runtime/lam_mpi_init.c | 2 ++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mca/mpi/pml/teg/src/pml_teg.c b/src/mca/mpi/pml/teg/src/pml_teg.c index 99fdbf9799..dfd67125ce 100644 --- a/src/mca/mpi/pml/teg/src/pml_teg.c +++ b/src/mca/mpi/pml/teg/src/pml_teg.c @@ -116,12 +116,11 @@ int mca_pml_teg_add_procs(lam_proc_t** procs, size_t nprocs) if(proc_pml == 0) { /* allocate pml specific proc data */ - proc_pml = malloc(sizeof(mca_pml_proc_t)); - if(NULL == proc_pml) { + proc_pml = OBJ_NEW(mca_pml_teg_proc_t); + if (NULL == proc_pml) { lam_output(0, "mca_pml_teg_add_procs: unable to allocate resources"); return LAM_ERR_OUT_OF_RESOURCE; } - mca_pml_teg_proc_init(proc_pml); /* preallocate space in array for max number of ptls */ mca_ptl_array_reserve(&proc_pml->proc_ptl_first, mca_pml_teg.teg_num_ptls); @@ -256,7 +255,7 @@ int mca_pml_teg_del_procs(lam_proc_t** procs, size_t nprocs) return LAM_SUCCESS; } -int mca_pml_teg_module_destruct(void) +int mca_pml_teg_module_fini(void) { /* FIX */ return LAM_SUCCESS; diff --git a/src/mca/mpi/pml/teg/src/pml_teg_proc.h b/src/mca/mpi/pml/teg/src/pml_teg_proc.h index 02d36705bf..4d5ac4ea66 100644 --- a/src/mca/mpi/pml/teg/src/pml_teg_proc.h +++ b/src/mca/mpi/pml/teg/src/pml_teg_proc.h @@ -11,8 +11,6 @@ #include "mpi/proc/proc.h" #include "pml_ptl_array.h" -extern lam_class_info_t mca_pml_teg_proc_t_class_info; - /* * Structure associated w/ lam_proc_t that contains data specific * to the PML. Note that this name is not PML specific. @@ -28,6 +26,10 @@ struct mca_pml_proc_t { typedef struct mca_pml_proc_t mca_pml_proc_t; +extern lam_class_info_t mca_pml_teg_proc_t_class_info; +typedef struct mca_pml_proc_t mca_pml_teg_proc_t; + + void mca_pml_teg_proc_construct(mca_pml_proc_t*); void mca_pml_teg_proc_destruct(mca_pml_proc_t*); diff --git a/src/mpi/runtime/lam_mpi_init.c b/src/mpi/runtime/lam_mpi_init.c index 42ef40b50b..ae8b74e37e 100644 --- a/src/mpi/runtime/lam_mpi_init.c +++ b/src/mpi/runtime/lam_mpi_init.c @@ -101,6 +101,8 @@ int lam_mpi_init(int argc, char **argv, int requested, int *provided) /* Setup MPI_COMM_SELF */ lam_comm_init(MPI_COMM_SELF); +#else + lam_comm_link_function(); #endif /* All done */