Improve an error message. Replace tabs with spaces.

This commit was SVN r25688.

ompi/mca/common/cuda/common_cuda.c

@@ -36,6 +36,7 @@
 #include "opal/util/output.h"
 #include "ompi/mca/mpool/base/base.h"
 #include "orte/util/show_help.h"
+#include "orte/util/proc_info.h"
 #include "common_cuda.h"
 
 static bool common_cuda_initialized = false;
@@ -240,7 +241,8 @@ static int mca_common_cuda_init(void)
                 /* If registering the memory fails, print a message and continue.
                  * This is not a fatal error. */
                 orte_show_help("help-mpi-common-cuda.txt", "cuMemHostRegister failed",
-                               true, mem_reg->ptr, mem_reg->amount, res, mem_reg->msg);
+                               true, mem_reg->ptr, mem_reg->amount,
+                               orte_process_info.nodename, res, mem_reg->msg);
             } else {
                 opal_output_verbose(20, mca_common_cuda_output,
                                     "CUDA: cuMemHostRegister OK on mpool %s: "
@@ -287,7 +289,8 @@ void mca_common_cuda_register(void *ptr, size_t amount, char *msg) {
             /* If registering the memory fails, print a message and continue.
              * This is not a fatal error. */
             orte_show_help("help-mpi-common-cuda.txt", "cuMemHostRegister failed",
-                           true, ptr, amount, res, msg);
+                           true, ptr, amount, 
+                           orte_process_info.nodename, res, msg);
         } else {
             opal_output_verbose(20, mca_common_cuda_output,
                                 "CUDA: cuMemHostRegister OK on mpool %s: "
@@ -325,7 +328,8 @@ void mca_common_cuda_unregister(void *ptr, char *msg) {
             /* If unregistering the memory fails, print a message and continue.
              * This is not a fatal error. */
             orte_show_help("help-mpi-common-cuda.txt", "cuMemHostUnregister failed",
-                           true, ptr, res, msg);
+                           true, ptr,
+                           orte_process_info.nodename, res, msg);
         } else {
             opal_output_verbose(20, mca_common_cuda_output,
                                 "CUDA: cuMemHostUnregister OK on mpool %s: "

ompi/mca/common/cuda/help-mpi-common-cuda.txt

@@ -38,11 +38,13 @@ NOTE: You can turn off this warning by setting the MCA parameter
 #
 [cuMemHostRegister failed]
 The call to cuMemHostRegister(%p, %d, 0) failed.
+  Host:  %s
   cuMemHostRegister return value:  %d
   Memory Pool:  %s
 #
 [cuMemHostUnregister failed]
 The call to cuMemHostUnregister(%p) failed.
+  Host:  %s
   cuMemHostUnregister return value:  %d
   Memory Pool:  %s
 #