Follow on to r31172: improve the help message

* Show the help message for all errors, not just EINVAL
* Put the help message in the correct helpfile
* Fix grammar and spelling, and expand the help message

cmr=v1.7.5:ticket=trac:4431

This commit was SVN r31173.

The following SVN revision numbers were found above:
  r31172 --> open-mpi/ompi@3e51d28b97

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

oshmem/mca/memheap/base/help-shmem-mca.txt

@@ -21,13 +21,3 @@ output of the "ompi_info" command and ensure that components of this
 type are available on your system.  You may also wish to check the
 value of the "component_path" MCA parameter and ensure that it has at
 least one directory that contains valid MCA components.
-
-[sysv:create-segment-failture]
-'sshmem' 'sysv' was failed to allocate shared memory segment
-of requested size. Returned error corresponds to
-invalid agrument function call which most likely
-is size of shared segment to allocate.
-
-Try using other 'sshmem' components (e.g. 'mmap')
-with '-mca sshmem mmap' or decrease symmetric heap area size
-with '-x SHMEM_SYMMETRIC_HEAP_SIZE=<value>'.

oshmem/mca/sshmem/sysv/Makefile.am

@@ -1,5 +1,6 @@
 # Copyright (c) 2014      Mellanox Technologies, Inc.
 #                         All rights reserved.
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -7,6 +8,8 @@
 # $HEADER$
 #
 
+dist_ompidata_DATA = help-oshmem-sshmem-sysv.txt
+
 sources = \
         sshmem_sysv.h \
         sshmem_sysv_component.c \

oshmem/mca/sshmem/sysv/help-oshmem-sshmem-sysv.txt

@@ -0,0 +1,33 @@
+# -*- text -*-
+#
+# Copyright (c) 2013      Mellanox Technologies, Inc.
+#                         All rights reserved.
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+# This is the US/English help file for Open SHMEM MCA error messages.
+#
+[create segment failure]
+The OpenSHMEM "sysv" plugin in the "sshmem" framework failed to
+allocate a shared memory segment via the shmat(2) system call.  This
+usually means that there are not enough resources available to the
+SYSV shared memory subsystem on your server.
+
+Your OpenSHMEM job will now abort.
+
+   Server:                %s
+   Requested shared 
+     memory segment size: %u
+   Specific error:        %s (%d)
+
+You can try the following:
+
+1. Use a different sshmem plugin (e.g., "mmap") with "--mca sshmem mmap".
+2. Decrease the symmetric heap area size with "-x
+   SHMEM_SYMMETRIC_HEAP_SIZE=<value>".
+3. Increase your system's allowable SYSV shared memory segment size
+   (e.g., via the SHMMAX and/or SMMAX kernel parameters).

oshmem/mca/sshmem/sysv/sshmem_sysv_module.c

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2014      Mellanox Technologies, Inc.
  *                         All rights reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -46,6 +47,7 @@
 #include "opal/util/show_help.h"
 #include "orte/util/show_help.h"
 
+#include "oshmem/proc/proc.h"
 #include "oshmem/mca/sshmem/sshmem.h"
 #include "oshmem/mca/sshmem/base/base.h"
 
@@ -197,11 +199,11 @@ segment_create(map_segment_t *ds_buf,
              "Failed to shmget() %llu bytes (errno=%d)",
              (unsigned long long)size, errno));
 
-        if (EINVAL == errno) {
-            orte_show_help("help-shmem-mca.txt",
-                           "sysv:create-segment-failture",
-                           true);
-        }
+        opal_show_help("help-oshmem-sshmem-sysv.txt",
+                       "create segment failure",
+                       true,
+                       orte_process_info.nodename, (unsigned) size,
+                       strerror(errno), errno);
         return OSHMEM_ERROR;
     }