oshmem: mem use hook: apply code review fixes

Signed-off-by: Alex Mikheev <[email protected]>
(cherry picked from commit a422154)

Author: alex-mikheev

oshmem/mca/memheap/buddy/memheap_buddy.c

@@ -469,7 +469,7 @@ static int _do_alloc(uint32_t order,
     }
 
     *p_buff = (void*) addr;
-    MCA_SPML_CALL(memuse_hook(addr, 1<<order));
+    MCA_SPML_CALL(memuse_hook(*p_buff, 1ULL<<order));
     return OSHMEM_SUCCESS;
 
     alloc_error: _buddy_free(&memheap_buddy, offset, order, heap);

oshmem/mca/spml/ucx/spml_ucx.c

@@ -289,7 +289,7 @@ int mca_spml_ucx_add_procs(ompi_proc_t** procs, size_t nprocs)
                             &ep_params,
                             &mca_spml_ucx.ucp_peers[i].ucp_conn);
         if (UCS_OK != err) {
-            SPML_ERROR("ucp_ep_create failed: %s\n", ucs_status_string(err));
+            SPML_ERROR("ucp_ep_create failed: %s", ucs_status_string(err));
             goto error2;
         }
         OSHMEM_PROC_DATA(procs[i])->num_transports = 1;
@@ -387,15 +387,16 @@ void mca_spml_ucx_rmkey_unpack(sshmem_mkey_t *mkey, uint32_t segno, int pe, int
 
 void mca_spml_ucx_memuse_hook(void *addr, size_t length)
 {
-    int my_pe = oshmem_my_proc_id();
-    spml_ucx_mkey_t   *ucx_mkey;
+    int my_pe;
+    spml_ucx_mkey_t *ucx_mkey;
     ucp_mem_advise_params_t params;
     ucs_status_t status;
 
     if (!(mca_spml_ucx.heap_reg_nb && memheap_is_va_in_segment(addr, HEAP_SEG_INDEX))) {
         return;
     }
 
+    my_pe    = oshmem_my_proc_id();
     ucx_mkey = &mca_spml_ucx.ucp_peers[my_pe].mkeys[HEAP_SEG_INDEX].key;
 
     params.field_mask = UCP_MEM_ADVISE_PARAM_FIELD_ADDRESS |
@@ -568,7 +569,7 @@ int mca_spml_ucx_fence(void)
 
     err = ucp_worker_flush(mca_spml_ucx.ucp_worker);
     if (UCS_OK != err) {
-        SPML_ERROR("fence failed: %s", ucs_status_string(err));
+         SPML_ERROR("fence failed: %s", ucs_status_string(err));
          oshmem_shmem_abort(-1);
          return OSHMEM_ERROR;
     }
@@ -581,7 +582,7 @@ int mca_spml_ucx_quiet(void)
 
     err = ucp_worker_flush(mca_spml_ucx.ucp_worker);
     if (UCS_OK != err) {
-        SPML_ERROR("fence failed: %s", ucs_status_string(err));
+         SPML_ERROR("fence failed: %s", ucs_status_string(err));
          oshmem_shmem_abort(-1);
          return OSHMEM_ERROR;
     }