oshmem/shmem: Allocate and exchange base segment address beforehand

Signed-off-by: Thomas Vegas <[email protected]>

Author: tvegas1

oshmem/mca/memheap/base/memheap_base_select.c

@@ -254,7 +254,7 @@ static memheap_context_t* _memheap_create(void)
         return NULL;
     }
 
-    /* Inititialize symmetric area */
+    /* Initialize symmetric area */
     rc = mca_memheap_base_alloc_init(&mca_memheap_base_map,
                                      user_size + MEMHEAP_BASE_PRIVATE_SIZE, 0,
                                      "regular_mem");

oshmem/mca/memheap/base/memheap_base_static.c

@@ -170,11 +170,9 @@ static int _check_address(void *start, void **end)
     /**
      * SGI shmem only supports globals&static in main program.
      * It does not support them in shared objects or in dlopen()
-     * (Clarified on PGAS 2011 tutorial)
+     * (Clarified on PGAS 2011 tutorial).
      *
-     * So ignored any maps that start higher then process _end
-     * FIXME: make sure we do not register symmetric heap twice
-     * if we decide to allow shared objects
+     * So ignored any maps that start higher then process _end.
      */
     if ((uintptr_t)start > data_end) {
         MEMHEAP_VERBOSE(100,

oshmem/mca/sshmem/mmap/sshmem_mmap_module.c

@@ -126,7 +126,6 @@ segment_create(map_segment_t *ds_buf,
     /* init the contents of map_segment_t */
     shmem_ds_reset(ds_buf);
 
-    (void)munmap(mca_sshmem_base_start_address, size);
     addr = mmap((void *)mca_sshmem_base_start_address,
                 size,
                 PROT_READ | PROT_WRITE,