UCP/CORE: Fix PR comments

Author: guy-ealey-morag

src/ucp/core/ucp_context.c

@@ -26,6 +26,7 @@
 #include <ucs/type/init_once.h>
 #include <ucs/vfs/base/vfs_cb.h>
 #include <ucs/vfs/base/vfs_obj.h>
+#include <uct/ib/base/ib_device.h>
 #include <string.h>
 #include <dlfcn.h>
 
@@ -72,9 +73,6 @@
 /* Factor to multiply with in order to get infinite latency */
 #define UCP_CONTEXT_INFINITE_LAT_FACTOR 100
 
-#define UCP_MLX_PREFIX       "mlx"
-#define UCP_MLX_DEFAULT_PORT "1"
-
 typedef enum ucp_transports_list_search_result {
     UCP_TRANSPORTS_LIST_SEARCH_RESULT_PRIMARY             = UCS_BIT(0),
     UCP_TRANSPORTS_LIST_SEARCH_RESULT_AUX_IN_MAIN         = UCS_BIT(1),
@@ -1080,7 +1078,7 @@ ucp_config_is_tl_name_present(const ucs_config_names_array_t *tl_array,
                                       tl_cfg_mask));
 }
 
-/* Return a pointer to the suffix of the device name, 
+/* Return a pointer to the suffix of the device name,
  * or the end of the string if no suffix is found. */
 static const char *ucp_get_dev_name_suffix(const char *dev_name)
 {
@@ -1091,13 +1089,6 @@ static const char *ucp_get_dev_name_suffix(const char *dev_name)
     return colon + 1;
 }
 
-static inline int
-ucp_is_dev_mlx_default_port(const char *dev_name, const char *dev_name_suffix)
-{
-    return (!strncmp(dev_name, UCP_MLX_PREFIX, strlen(UCP_MLX_PREFIX))) &&
-           (!strcmp(dev_name_suffix, UCP_MLX_DEFAULT_PORT));
-}
-
 static int ucp_is_resource_in_device_list(const uct_tl_resource_desc_t *resource,
                                           const ucs_config_names_array_t *devices,
                                           uint64_t *dev_cfg_mask,
@@ -1117,7 +1108,8 @@ static int ucp_is_resource_in_device_list(const uct_tl_resource_desc_t *resource
     if (dev_type == UCT_DEVICE_TYPE_NET) {
         dev_name_suffix = ucp_get_dev_name_suffix(resource->dev_name);
 
-        if (ucp_is_dev_mlx_default_port(resource->dev_name, dev_name_suffix)) {
+        if (uct_ib_device_is_mlx_default_port(resource->dev_name,
+                                              dev_name_suffix)) {
             ucs_strncpy_zero(dev_name_base, resource->dev_name,
                              (size_t)(dev_name_suffix - resource->dev_name));
 

src/uct/ib/base/ib_device.h

@@ -75,6 +75,8 @@
 #define UCT_IB_DEVICE_ROUTABLE_FLID_GID_INDEX 1 /* The gid index used by default
                                                    with FLID based IB routing */
 
+#define UCT_IB_MLX_DEV_NAME_PREFIX "mlx"
+#define UCT_IB_MLX_DEFAULT_PORT    "1"
 
 enum {
     UCT_IB_DEVICE_STAT_ASYNC_EVENT,
@@ -521,4 +523,20 @@ void uct_ib_handle_async_event(uct_ib_device_t *dev, uct_ib_async_event_t *event
 
 int uct_ib_device_is_smi(struct ibv_device *ibv_device);
 
+/**
+ * Check if the device is a Mellanox device with the default port.
+ *
+ * @param dev_name        Device name
+ * @param dev_name_suffix Device name suffix (following the colon)
+ *
+ * @return Non-zero if the device is an MLX device with default port.
+ */
+static inline int uct_ib_device_is_mlx_default_port(const char *dev_name,
+                                                    const char *dev_name_suffix)
+{
+    return (strncmp(dev_name, UCT_IB_MLX_DEV_NAME_PREFIX,
+                    strlen(UCT_IB_MLX_DEV_NAME_PREFIX)) == 0) &&
+           (strcmp(dev_name_suffix, UCT_IB_MLX_DEFAULT_PORT) == 0);
+}
+
 #endif

test/gtest/ucp/test_ucp_context.cc

@@ -146,7 +146,8 @@ class test_ucp_net_devices_config : public ucp_test {
     static std::set<std::string> get_mlx5_device_names(const entity &e) {
         std::set<std::string> device_names;
         for_each_net_device(e, [&](const uct_tl_resource_desc_t *rsc) {
-            if (strncmp(rsc->dev_name, "mlx5_", 5) == 0) {
+            std::string dev_name(rsc->dev_name);
+            if (dev_name.compare(0, 5, "mlx5_") == 0) {
                 device_names.insert(rsc->dev_name);
             }
         });