Review: return types and wrong variables

Signed-off-by: Joseph Schuchart <[email protected]>

Author: devreal

ompi/mca/osc/ucx/osc_ucx.h

@@ -277,7 +277,7 @@ int ompi_osc_ucx_dynamic_lock(ompi_osc_ucx_module_t *module, int target);
 int ompi_osc_ucx_dynamic_unlock(ompi_osc_ucx_module_t *module, int target);
 
 /* returns the size at the peer */
-static inline int ompi_osc_ucx_get_size(ompi_osc_ucx_module_t *module, int rank)
+static inline size_t ompi_osc_ucx_get_size(ompi_osc_ucx_module_t *module, int rank)
 {
     if (module->sizes) {
         return module->sizes[rank];
@@ -287,7 +287,7 @@ static inline int ompi_osc_ucx_get_size(ompi_osc_ucx_module_t *module, int rank)
 }
 
 /* returns the displacement unit for the given peer */
-static inline int ompi_osc_ucx_get_disp_unit(ompi_osc_ucx_module_t *module, int rank)
+static inline ptrdiff_t ompi_osc_ucx_get_disp_unit(ompi_osc_ucx_module_t *module, int rank)
 {
     if (module->disp_units) {
         return module->disp_units[rank];

ompi/mca/osc/ucx/osc_ucx_component.c

@@ -526,10 +526,10 @@ int ompi_osc_ucx_shared_query(struct ompi_win_t *win, int rank, size_t *size,
     } else { // shared memory window with MPI_PROC_NULL
         for (int i = 0 ; i < ompi_comm_size(module->comm) ; ++i) {
             size_t peer_size = ompi_osc_ucx_get_size(module, i);
-            if (0 != size) {
+            if (0 != peer_size) {
                 *size = peer_size;
                 *((void**) baseptr) = (void *)module->shmem_addrs[i];
-                *disp_unit = ompi_osc_ucx_get_disp_unit(module, rank);
+                *disp_unit = ompi_osc_ucx_get_disp_unit(module, i);
                 break;
             }
         }
@@ -777,7 +777,7 @@ static int component_select(struct ompi_win_t *win, void **base, size_t size, pt
     if (flavor == MPI_WIN_FLAVOR_SHARED) {
         /* create the segment */
 
-        unsigned long total = 0;
+        size_t total = 0;
         for (i = 0 ; i < comm_size ; ++i) {
             total += ompi_osc_ucx_get_size(module, i);
         }