From 74c88a9e48965282f9c0ee9290c4925a99c1fc7e Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Tue, 11 Oct 2011 20:37:00 +0000 Subject: [PATCH] This was never used (sm_ctl_header). This commit was SVN r25267. --- ompi/mca/btl/sm/btl_sm.c | 5 ----- ompi/mca/btl/sm/btl_sm.h | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ompi/mca/btl/sm/btl_sm.c b/ompi/mca/btl/sm/btl_sm.c index 34e545fe63..3883159a57 100644 --- a/ompi/mca/btl/sm/btl_sm.c +++ b/ompi/mca/btl/sm/btl_sm.c @@ -288,11 +288,6 @@ static int sm_btl_first_time_init(mca_btl_sm_t *sm_btl, int n) free(procs); free(sm_ctl_file); - /* set the pointer to the shared memory control structure */ - mca_btl_sm_component.sm_ctl_header = - (mca_common_sm_seg_header_t*)mca_btl_sm_component.sm_seg->module_seg; - - /* check to make sure number of local procs is within the * specified limits */ if(mca_btl_sm_component.sm_max_procs > 0 && diff --git a/ompi/mca/btl/sm/btl_sm.h b/ompi/mca/btl/sm/btl_sm.h index c45537a0d7..46638d6e91 100644 --- a/ompi/mca/btl/sm/btl_sm.h +++ b/ompi/mca/btl/sm/btl_sm.h @@ -130,15 +130,13 @@ struct mca_btl_sm_component_t { int32_t sm_max_procs; /**< upper limit on the number of processes using the shared memory pool */ int sm_extra_procs; /**< number of extra procs to allow */ char* sm_mpool_name; /**< name of shared memory pool module */ - mca_mpool_base_module_t **sm_mpools; /**< shared memory pools (one for each memory node */ + mca_mpool_base_module_t **sm_mpools; /**< shared memory pools (one for each memory node) */ mca_mpool_base_module_t *sm_mpool; /**< mpool on local node */ void* sm_mpool_base; /**< base address of shared memory pool */ size_t eager_limit; /**< first fragment size */ size_t max_frag_size; /**< maximum (second and beyone) fragment size */ opal_mutex_t sm_lock; mca_common_sm_module_t *sm_seg; /**< description of shared memory segment */ - mca_common_sm_seg_header_t *sm_ctl_header; /* control header in - shared memory */ volatile sm_fifo_t **shm_fifo; /**< pointer to fifo 2D array in shared memory */ char **shm_bases; /**< pointer to base pointers in shared memory */ uint16_t *shm_mem_nodes; /**< pointer to mem noded in shared memory */