UCP/PROTO: Remove env var PROTO_USAGE_COUNT_MAX

Author: guy-ealey-morag

src/ucp/core/ucp_context.c

@@ -497,12 +497,6 @@ static ucs_config_field_t ucp_context_config_table[] = {
    "                For example: '*tag*gpu*', '*put*fast*host*'",
    ucs_offsetof(ucp_context_config_t, proto_info), UCS_CONFIG_TYPE_STRING},
 
-  {"PROTO_USAGE_COUNT_MAX", "255",
-   "The maximal amount of times the protocol usage would be counted.\n"
-   "After reaching this value, counting is stopped to reduce overhead.\n"
-   " 'inf' : Count up to UINT_MAX",
-   ucs_offsetof(ucp_context_config_t, proto_usage_count_max), UCS_CONFIG_TYPE_UINT},
-
   {"RNDV_ALIGN_THRESH", "64kB",
    "If the rendezvous payload size is larger than this value, it could be split\n"
    "in order to optimize memory alignment",

src/ucp/core/ucp_context.h

@@ -180,8 +180,6 @@ typedef struct ucp_context_config {
     size_t                                 rndv_align_thresh;
     /** Print protocols information */
     char                                   *proto_info;
-    /** Maximum number of times a protocol usage would be counted */
-    unsigned                               proto_usage_count_max;
     /** MD to compare for transport selection scores */
     char                                   *select_distance_md;
     /** Directory to write protocol selection information */

src/ucp/core/ucp_request.c

@@ -736,28 +736,20 @@ ucs_status_t ucp_request_progress_counter(uct_pending_req_t *self)
     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    =
-            req->send.ep->worker->context->config.ext.proto_usage_count_max;
     ucs_status_t status;
 
-    /* NOTE: This function is only called when `progress_wrapper_enabled` is 
-       `false`, which means that it won't be called when the log level is 
-       TRACE_REQ or higher.
-       Because of this, `ucs_trace` is used here instead of `ucp_trace_req` */
-
     status = proto->progress[UCP_PROTO_STAGE_START](self);
     if (ucs_unlikely(UCS_STATUS_IS_ERR(status))) {
+        /* NOTE: This function is only called when `progress_wrapper_enabled` 
+         * is `false`, which means that it won't be called when the log level 
+         * is TRACE_REQ or higher. Because of this, `ucs_trace` is used here 
+         * instead of `ucp_trace_req` */
         ucs_trace("progress protocol %s returned: %s lane %d", proto->name,
                   ucs_status_string(status), req->send.lane);
         return status;
     }
 
-    if (ucs_unlikely(++proto_config->selections == proto_usage_count_max)) {
-        ucs_trace("protocol %s was selected %u times, stop tracing",
-                  proto->name, proto_config->selections);
-        memcpy(proto_config->progress_wrapper, proto->progress,
-               sizeof(proto_config->progress_wrapper));
-    }
+    ++proto_config->selections;
 
     return UCS_OK;
 }
@@ -768,8 +760,6 @@ ucs_status_t ucp_request_progress_wrapper(uct_pending_req_t *self)
     ucp_proto_config_t *conf = ucs_const_cast(ucp_proto_config_t *,
                                               req->send.proto_config);
     const ucp_proto_t *proto = conf->proto;
-    unsigned proto_usage_count_max =
-            req->send.ep->worker->context->config.ext.proto_usage_count_max;
     uct_pending_callback_t progress_cb;
     ucs_status_t status;
 
@@ -789,8 +779,7 @@ ucs_status_t ucp_request_progress_wrapper(uct_pending_req_t *self)
         ucp_trace_req(req, "progress protocol %s returned: %s lane %d",
                       proto->name, ucs_status_string(status), req->send.lane);
     } else {
-        if (req->send.proto_stage == UCP_PROTO_STAGE_START &&
-            conf->selections < proto_usage_count_max) {
+        if (req->send.proto_stage == UCP_PROTO_STAGE_START) {
             ++conf->selections;
         }
 

src/ucp/proto/proto_debug.c

@@ -201,17 +201,12 @@ static void ucp_proto_selections_dump(ucp_worker_h worker,
                                       char *counter_str, size_t size,
                                       int show_used)
 {
-    unsigned proto_usage_count_max =
-            worker->context->config.ext.proto_usage_count_max;
-
     if (!show_used) {
         *counter_str = '\0';
         return;
     }
 
-    ucs_snprintf_safe(counter_str, size, "%u%s  ", proto_attr->selections,
-                      ((proto_attr->selections >= proto_usage_count_max) ? "+" :
-                                                                           ""));
+    ucs_snprintf_safe(counter_str, size, "%u  ", proto_attr->selections);
 }
 
 void