osc/sm: store actual sizes and pad by pagesize as we go

Signed-off-by: Joseph Schuchart <joseph.schuchart@stonybrook.edu>

Author: devreal

ompi/mca/osc/sm/osc_sm_component.c

@@ -283,11 +283,9 @@ component_select(struct ompi_win_t *win, void **base, size_t size, ptrdiff_t dis
         if (module->noncontig) {
             opal_output_verbose(MCA_BASE_VERBOSE_DEBUG, ompi_osc_base_framework.framework_output,
                                 "allocating window using non-contiguous strategy");
-            total = ((size - 1) / pagesize + 1) * pagesize;
         } else {
             opal_output_verbose(MCA_BASE_VERBOSE_DEBUG, ompi_osc_base_framework.framework_output,
                                 "allocating window using contiguous strategy");
-            total = size;
         }
         ret = module->comm->c_coll->coll_allgather(&total, 1, MPI_UNSIGNED_LONG,
                                                   rbuf, 1, MPI_UNSIGNED_LONG,
@@ -301,6 +299,9 @@ component_select(struct ompi_win_t *win, void **base, size_t size, ptrdiff_t dis
         total = 0;
         for (i = 0 ; i < comm_size ; ++i) {
             total += rbuf[i];
+            if (module->noncontig) {
+                total += OPAL_ALIGN_PAD_AMOUNT(total, pagesize);
+            }
         }
 
         /* user opal/shmem directly to create a shared memory segment */
@@ -378,6 +379,9 @@ component_select(struct ompi_win_t *win, void **base, size_t size, ptrdiff_t dis
             if (module->sizes[i] || !module->noncontig) {
                 module->bases[i] = ((char *) module->segment_base) + total;
                 total += rbuf[i];
+                if (module->noncontig) {
+                    total += OPAL_ALIGN_PAD_AMOUNT(total, pagesize);
+                }
             } else {
                 module->bases[i] = NULL;
             }