UCP/PROTO: PR fixes

Author: guy-ealey-morag

src/ucp/core/ucp_request.c

@@ -731,11 +731,12 @@ void ucp_request_purge_enqueue_cb(uct_pending_req_t *self, void *arg)
 
 ucs_status_t ucp_request_progress_counter(uct_pending_req_t *self)
 {
-    ucp_request_t *req       = ucs_container_of(self, ucp_request_t, send.uct);
+    ucp_request_t *req                = ucs_container_of(self, ucp_request_t, 
+                                                         send.uct);
     ucp_proto_config_t *proto_config  = ucs_const_cast(ucp_proto_config_t*,
                                                        req->send.proto_config);
     const ucp_proto_t *proto          = proto_config->proto;
-    unsigned proto_usage_count_max =
+    unsigned proto_usage_count_max    =
             req->send.ep->worker->context->config.ext.proto_usage_count_max;
     ucs_status_t status;
 
@@ -800,9 +801,8 @@ ucs_status_t ucp_request_progress_wrapper(uct_pending_req_t *self)
     return status;
 }
 
-void ucp_request_init_progress_wrapper(ucp_worker_h worker,
-                                       ucp_proto_config_t *proto_config,
-                                       int internal)
+void ucp_request_progress_wrapper_init(ucp_worker_h worker,
+                                       ucp_proto_config_t *proto_config)
 {
     uint8_t stage;
 
@@ -820,7 +820,6 @@ void ucp_request_init_progress_wrapper(ucp_worker_h worker,
            sizeof(proto_config->progress_wrapper));
 
     if (worker->context->config.trace_used_proto_selections) {
-        /* Set counting wrapper for the first stage */
         proto_config->progress_wrapper[UCP_PROTO_STAGE_START] =
                                                 ucp_request_progress_counter;
     }

src/ucp/core/ucp_request.h

@@ -587,8 +587,7 @@ void ucp_request_purge_enqueue_cb(uct_pending_req_t *self, void *arg);
 
 ucs_status_t ucp_request_progress_wrapper(uct_pending_req_t *self);
 
-void ucp_request_init_progress_wrapper(ucp_worker_h worker,
-                                       ucp_proto_config_t *proto_config,
-                                       int internal);
+void ucp_request_progress_wrapper_init(ucp_worker_h worker,
+                                       ucp_proto_config_t *proto_config);
 
 #endif

src/ucp/proto/proto_debug.c

@@ -172,7 +172,7 @@ static int ucp_proto_debug_is_info_enabled(ucp_context_h context,
     if (!strcasecmp(proto_info_config, "auto")) {
         return ucs_log_is_enabled(UCS_LOG_LEVEL_DEBUG);
     }
-    
+
     /* Handle boolean */
     if (ucs_config_sscanf_bool(proto_info_config, &bool_value, NULL)) {
         return bool_value;

src/ucp/proto/proto_select.c

@@ -300,7 +300,7 @@ static ucs_status_t ucp_proto_select_elem_add_envelope(
             proto_config->init_elem      = proto;
             proto_config->selections     = 0;
             *last_proto_idx              = proto_idx;
-            ucp_request_init_progress_wrapper(worker, proto_config, internal);
+            ucp_request_progress_wrapper_init(worker, proto_config);
         }
 
         /* Print detailed protocol selection data to a user-configured path */

src/ucp/proto/proto_select.h

@@ -95,6 +95,7 @@ struct ucp_proto_select_param {
     } UCS_S_PACKED op;
 } UCS_S_PACKED;
 
+
 /**
  * Protocol and its private configuration
  */

src/ucp/rndv/proto_rndv.c

@@ -330,7 +330,7 @@ void ucp_proto_rndv_set_variant_config(
     proto_config->select_param   = *select_param;
     proto_config->init_elem      = proto;
     proto_config->selections     = 0;
-    ucp_request_init_progress_wrapper(init_params->worker, proto_config, 1);
+    ucp_request_progress_wrapper_init(init_params->worker, proto_config);
 }
 
 /* Probe a rndv_ctrl variant with a given remote protocol */

src/ucs/sys/compiler_def.h

@@ -200,7 +200,7 @@
  * @param _type Type of the non-const pointer.
  * @param _ptr  Pointer to cast.
  *
- * @return Casted non-const pointer.
+ * @return Cast non-const pointer.
  */
 #define ucs_const_cast(_type, _ptr) (_type)(uintptr_t)(const void*)(_ptr)