usnic: remove "device" and "port" language from show_help() messages

Move away from verbs-specific terms "device" and "port" in the usnic
BTL help messages.  Replace them with "usNIC interface" (since usNIC
has no concept of a port).

cmr=v1.8.2:ticket=trac:4734

This commit was SVN r32029.

The following Trac tickets were found above:
  Ticket 4734 --> https://svn.open-mpi.org/trac/ompi/ticket/4734

ompi/mca/btl/usnic/btl_usnic_component.c

@@ -617,7 +617,7 @@ static mca_btl_base_module_t** usnic_component_init(int* num_btl_modules,
                            true, 
                            ompi_process_info.nodename,
                            ibv_get_device_name(module->device),
-                           module->port_num,
+                           module->if_name,
                            "ibv_query_device", __FILE__, __LINE__,
                            "Failed to query usNIC device; is the usnic_verbs Linux kernel module loaded?");
             --mca_btl_usnic_component.num_modules;
@@ -1156,7 +1156,7 @@ static int init_module_from_port(ompi_btl_usnic_module_t *module,
                        true,
                        ompi_process_info.nodename,
                        ibv_get_device_name(module->device),
-                       module->port_num,
+                       module->if_name,
                        "ibv_query_gid", __FILE__, __LINE__,
                        "Failed to query usNIC GID");
         return OMPI_ERROR;
@@ -1204,7 +1204,7 @@ static int init_module_from_port(ompi_btl_usnic_module_t *module,
                            true,
                            ompi_process_info.nodename,
                            ibv_get_device_name(module->device),
-                           module->port_num);
+                           module->if_name);
             return OMPI_ERROR;
         }
     }

ompi/mca/btl/usnic/btl_usnic_module.c

@@ -127,7 +127,7 @@ static int create_ahs(size_t array_len, size_t num_endpoints,
                                    true,
                                    ompi_process_info.nodename,
                                    ibv_get_device_name(module->device),
-                                   module->port_num,
+                                   module->if_name,
                                    "ibv_create_ah()", __FILE__, __LINE__,
                                    "Failed to create an address handle");
                     return OMPI_ERR_OUT_OF_RESOURCE;
@@ -1597,7 +1597,7 @@ static void module_async_event_callback(int fd, short flags, void *arg)
                            true, 
                            ompi_process_info.nodename,
                            ibv_get_device_name(module->device), 
-                           module->port_num,
+                           module->if_name,
                            ibv_event_type_str(event.event_type),
                            event.event_type);
             module->pml_error_callback(&module->super, 
@@ -1658,7 +1658,8 @@ init_qp(
         opal_show_help("help-mpi-btl-usnic.txt", "create ibv resource failed",
                        true, 
                        ompi_process_info.nodename,
-                       ibv_get_device_name(module->device), 
+                       ibv_get_device_name(module->device),
+                       module->if_name,
                        "ibv_create_qp()", __FILE__, __LINE__,
                        "Failed to create a usNIC queue pair");
         return OMPI_ERR_OUT_OF_RESOURCE;
@@ -1678,7 +1679,7 @@ init_qp(
                        true, 
                        ompi_process_info.nodename,
                        ibv_get_device_name(module->device),
-                       module->port_num,
+                       module->if_name,
                        "ibv_modify_qp()", __FILE__, __LINE__,
                        "Failed to modify an existing queue pair");
         return OMPI_ERR_TEMP_OUT_OF_RESOURCE;
@@ -1693,7 +1694,7 @@ init_qp(
                        true, 
                        ompi_process_info.nodename,
                        ibv_get_device_name(module->device), 
-                       module->port_num,
+                       module->if_name,
                        "ibv_query_qp()", __FILE__, __LINE__,
                        "Failed to query an existing queue pair");
         return OMPI_ERR_TEMP_OUT_OF_RESOURCE;
@@ -1721,7 +1722,7 @@ static int move_qp_to_rtr(ompi_btl_usnic_module_t *module,
                        true, 
                        ompi_process_info.nodename,
                        ibv_get_device_name(module->device),
-                       module->port_num,
+                       module->if_name,
                        "ibv_modify_qp", __FILE__, __LINE__,
                        "Failed to move QP to RTR state");
         return OMPI_ERROR;
@@ -1744,7 +1745,7 @@ static int move_qp_to_rts(ompi_btl_usnic_module_t *module,
                        true, 
                        ompi_process_info.nodename,
                        ibv_get_device_name(module->device),
-                       module->port_num,
+                       module->if_name,
                        "ibv_modify_qp", __FILE__, __LINE__,
                        "Failed to move QP to RTS state");
         return OMPI_ERROR;
@@ -1823,6 +1824,7 @@ ompi_btl_usnic_channel_init(
                        true, 
                        ompi_process_info.nodename,
                        ibv_get_device_name(module->device),
+                       module->if_name,
                        "ibv_create_cq()", __FILE__, __LINE__,
                        "Failed to create a usNIC completion queue");
         goto error;
@@ -1868,7 +1870,7 @@ ompi_btl_usnic_channel_init(
                            true, 
                            ompi_process_info.nodename,
                            ibv_get_device_name(module->device),
-                           module->port_num,
+                           module->if_name,
                            "get freelist buffer()", __FILE__, __LINE__,
                            "Failed to get receive buffer from freelist");
             abort();    /* this is impossible */
@@ -1883,7 +1885,7 @@ ompi_btl_usnic_channel_init(
                            true, 
                            ompi_process_info.nodename,
                            ibv_get_device_name(module->device),
-                           module->port_num,
+                           module->if_name,
                            "ibv_post_recv", __FILE__, __LINE__,
                            "Failed to post receive buffer");
             goto error;
@@ -1971,7 +1973,7 @@ int ompi_btl_usnic_module_init(ompi_btl_usnic_module_t *module)
                        true, 
                        ompi_process_info.nodename,
                        ibv_get_device_name(module->device), 
-                       module->port_num,
+                       module->if_name,
                        "ibv_alloc_pd()", __FILE__, __LINE__,
                        "Failed to create a PD; is the usnic_verbs Linux kernel module loaded?");
         return OMPI_ERROR;
@@ -1992,7 +1994,7 @@ int ompi_btl_usnic_module_init(ompi_btl_usnic_module_t *module)
                        true, 
                        ompi_process_info.nodename,
                        ibv_get_device_name(module->device),
-                       module->port_num,
+                       module->if_name,
                        "create mpool", __FILE__, __LINE__,
                        "Failed to allocate registered memory; check Linux memlock limits");
         goto dealloc_pd;

ompi/mca/btl/usnic/btl_usnic_proc.c

@@ -201,7 +201,7 @@ static int create_proc(ompi_proc_t *ompi_proc,
                        "internal error during init",
                        true,
                        ompi_process_info.nodename,
-                       "<none>", 0,
+                       "<none>", "<none>",
                        "ompi_modex_recv() failed", __FILE__, __LINE__,
                        opal_strerror(rc));
         OBJ_RELEASE(proc);
@@ -622,7 +622,7 @@ static int match_modex(ompi_btl_usnic_module_t *module,
                     true,
                     ompi_process_info.nodename,
                     ibv_get_device_name(module->device),
-                    module->port_num,
+                    module->if_name,
                     module->if_mtu,
                     (NULL == proc->proc_ompi->proc_hostname) ?
                     "unknown" : proc->proc_ompi->proc_hostname,

ompi/mca/btl/usnic/help-mpi-btl-usnic.txt

@@ -11,10 +11,10 @@
 # This is the US/English help file for the Open MPI usnic BTL.
 #
 [ibv API failed]
-Open MPI failed a basic verbs operation on a Cisco usNIC device.  This
-is highly unusual and shouldn't happen.  It suggests that there may be
-something wrong with the usNIC or OpenFabrics configuration on this
-server.
+Open MPI failed a basic verbs operation on a Cisco usNIC interface.
+This is highly unusual and shouldn't happen.  It suggests that there
+may be something wrong with the usNIC or OpenFabrics configuration on
+this server.
 
 In addition to any suggestions listed below, you might want to check
 the Linux "memlock" limits on your system (they should probably be
@@ -22,12 +22,11 @@ the Linux "memlock" limits on your system (they should probably be
 
     http://www.open-mpi.org/faq/?category=openfabrics#ib-locked-pages
 
-Open MPI will skip this device/port in the usnic BTL, which may result
-in either lower performance or your job aborting.
+Open MPI will skip this usNIC interface in the usnic BTL, which may
+result in either lower performance or your job aborting.
 
   Server:          %s
-  Device:          %s
-  Port:            %d
+  usNIC interface: %s (which is %s)
   Failed function: %s (%s:%d)
   Description:     %s
 #
@@ -42,11 +41,11 @@ need to provision at least as many usNICs as MPI processes on that
 server.  In each usNIC, you need to provision at least two each of the
 following: send queues, receive queues, and completion queues.
 
-Open MPI will skip this device in the usnic BTL, which may result in
-either lower performance or your job aborting.
+Open MPI will skip this usNIC interface in the usnic BTL, which may
+result in either lower performance or your job aborting.
 
   Server:          %s
-  Device:          %s
+  usNIC interface: %s
   Description:     %s
 #
 [create ibv resource failed]
@@ -61,21 +60,20 @@ usually means one of two things:
 
      http://www.open-mpi.org/faq/?category=openfabrics#ib-locked-pages
 
-This Open MPI job will skip this device/port in the usnic BTL, which
-may result in either lower performance or the job aborting.
+This Open MPI job will skip this usNIC interface in the usnic BTL,
+which may result in either lower performance or the job aborting.
 
   Server:          %s
-  Device:          %s
+  usNIC interface: %s (which is %s)
   Failed function: %s (%s:%d)
   Description:     %s
 #
 [async event]
-Open MPI detected a fatal error on a usNIC port.  Your MPI job will
-now abort; sorry.
+Open MPI detected a fatal error on a usNIC interface.  Your MPI job
+will now abort; sorry.
 
   Server:           %s
-  Device:           %s
-  Port:             %d
+  usNIC interface:  %s (which is %s)
   Async event code: %s (%d)
 #
 [internal error during init]
@@ -84,12 +82,11 @@ highly unusual and shouldn't happen.  It suggests that there may be
 something wrong with the usNIC or OpenFabrics configuration on this
 server.
 
-Open MPI will skip this device/port in the usnic BTL, which may result
-in either lower performance or your job aborting.
+Open MPI will skip this usNIC interface in the usnic BTL, which may
+result in either lower performance or your job aborting.
 
   Server:          %s
-  Device:          %s
-  Port:            %d
+  usNIC interface: %s (which is %s)
   Failure:         %s (%s:%d)
   Description:     %s
 #
@@ -106,17 +103,16 @@ server.
   Error:        %s
 #
 [verbs_port_bw failed]
-Open MPI failed to query the supported bandwidth of a port on a Cisco
-usNIC device.  This is unusual and shouldn't happen.  It suggests that
-there may be something wrong with the usNIC or OpenFabrics
-configuration on this server.
+Open MPI failed to query the supported bandwidth of a usNIC interface.
+This is unusual and shouldn't happen.  It suggests that there may be
+something wrong with the usNIC or OpenFabrics configuration on this
+server.
 
-Open MPI will skip this device/port in the usnic BTL, which may result
-in either lower performance or your job aborting.
+Open MPI will skip this usNIC interface in the usnic BTL, which may
+result in either lower performance or your job aborting.
 
-  Server:     %s
-  Device:     %s
-  Port:       %d
+  Server:          %s
+  usNIC interface: %s (which is %s)
 #
 [check_reg_mem_basics fail]
 The usNIC BTL failed to initialize while trying to register some
@@ -142,16 +138,16 @@ value will be ignored.
   Message:    %s
 #
 [MTU mismatch]
-The MTU does not match on local and remote hosts.  All interfaces on all
-hosts participating in an MPI job must be configured with the same MTU.
-The device and port listed below will not be used to communicate with this
-remote host.
+The MTU does not match on local and remote hosts.  All interfaces on
+all hosts participating in an MPI job must be configured with the same
+MTU.  The usNIC interface listed below will not be used to communicate
+with this remote host.
 
-  Local host:  %s
-  Device/port: %s/%d
-  Local MTU:   %d
-  Remote host: %s
-  Remote MTU:  %d
+  Local host:      %s
+  usNIC interface: %s (which is %s)
+  Local MTU:       %d
+  Remote host:     %s
+  Remote MTU:      %d
 #
 [rtnetlink init fail]
 The usnic BTL failed to initialize the rtnetlink query subsystem.
@@ -244,7 +240,7 @@ application will likely either run with degraded performance and/or
 abort.
 
   Server:              %s
-  Device:              %s:%d (%s)
+  usNIC interface:     %s:%d (%s)
   Current ARP timeout: %d (btl_usnic_arp_timeout MCA param)
 #
 [transport mismatch]