PML/UCX: optimization of mprobe call - renamed vars

- renamed of internal variable names
- used unsigned datatypes

Signed-off-by: Sergey Oblomov <sergeyo@mellanox.com>

ompi/mca/pml/ucx/pml_ucx.c

@@ -748,7 +748,7 @@ int mca_pml_ucx_send(const void *buf, size_t count, ompi_datatype_t *datatype, i
 int mca_pml_ucx_iprobe(int src, int tag, struct ompi_communicator_t* comm,
                          int *matched, ompi_status_public_t* mpi_status)
 {
-    static int ucx_progress_cntr = 0;
+    static unsigned progress_count = 0;
 
     ucp_tag_t ucp_tag, ucp_tag_mask;
     ucp_tag_recv_info_t info;
@@ -762,9 +762,9 @@ int mca_pml_ucx_iprobe(int src, int tag, struct ompi_communicator_t* comm,
     if (ucp_msg != NULL) {
         *matched = 1;
         mca_pml_ucx_set_recv_status_safe(mpi_status, UCS_OK, &info);
-        ucx_progress_cntr = 0;
+        progress_count = 0;
     } else  {
-        (++ucx_progress_cntr % opal_common_ucx.progress_iterations) ?
+        (++progress_count % opal_common_ucx.progress_iterations) ?
             (void)ucp_worker_progress(ompi_pml_ucx.ucp_worker) : opal_progress();
         *matched = 0;
     }
@@ -796,7 +796,7 @@ int mca_pml_ucx_improbe(int src, int tag, struct ompi_communicator_t* comm,
                         int *matched, struct ompi_message_t **message,
                         ompi_status_public_t* mpi_status)
 {
-    static int ucx_progress_cntr = 0;
+    static unsigned progress_count = 0;
 
     ucp_tag_t ucp_tag, ucp_tag_mask;
     ucp_tag_recv_info_t info;
@@ -812,9 +812,9 @@ int mca_pml_ucx_improbe(int src, int tag, struct ompi_communicator_t* comm,
         PML_UCX_VERBOSE(8, "got message %p (%p)", (void*)*message, (void*)ucp_msg);
         *matched         = 1;
         mca_pml_ucx_set_recv_status_safe(mpi_status, UCS_OK, &info);
-        ucx_progress_cntr = 0;
+        progress_count = 0;
     } else  {
-        (++ucx_progress_cntr % opal_common_ucx.progress_iterations) ?
+        (++progress_count % opal_common_ucx.progress_iterations) ?
             (void)ucp_worker_progress(ompi_pml_ucx.ucp_worker) : opal_progress();
         *matched = 0;
     }

opal/mca/common/ucx/common_ucx.h

@@ -54,8 +54,8 @@ BEGIN_C_DECLS
 
 /* progress loop to allow call UCX/opal progress */
 /* used C99 for-statement variable initialization */
-#define MCA_COMMON_UCX_PROGRESS_LOOP(_worker)                            \
-    for (int iter = 0;; (++iter % opal_common_ucx.progress_iterations) ? \
+#define MCA_COMMON_UCX_PROGRESS_LOOP(_worker)                                 \
+    for (unsigned iter = 0;; (++iter % opal_common_ucx.progress_iterations) ? \
                         (void)ucp_worker_progress(_worker) : opal_progress())
 
 #define MCA_COMMON_UCX_WAIT_LOOP(_request, _worker, _msg, _completed)                    \
@@ -63,7 +63,8 @@ BEGIN_C_DECLS
         ucs_status_t status;                                                             \
         /* call UCX progress */                                                          \
         MCA_COMMON_UCX_PROGRESS_LOOP(_worker) {                                          \
-            if (UCS_INPROGRESS != (status = opal_common_ucx_request_status(_request))) { \
+            status = opal_common_ucx_request_status(_request);                           \
+            if (UCS_INPROGRESS != status) {                                              \
                 _completed;                                                              \
                 if (OPAL_LIKELY(UCS_OK == status)) {                                     \
                     return OPAL_SUCCESS;                                                 \