Merge pull request open-mpi#77 from alex-mikheev/topic/oshmem_fix_hel…

…p_strings check-help-strings cleanup in oshmem
jsquyres · Nov 5, 2014 · 7b5d7d4 · 7b5d7d4
2 parents 33bb260 + ba9e77c
commit 7b5d7d4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 27 deletions.
diff --git a/ompi/mca/mtl/mxm/mtl_mxm.c b/ompi/mca/mtl/mxm/mtl_mxm.c
@@ -127,7 +127,7 @@ static int ompi_mtl_mxm_get_ep_address(void **address_p, size_t *address_len_p)
 
     err = mxm_ep_get_address(ompi_mtl_mxm.ep, *address_p, address_len_p);
     if (MXM_OK != err) {
-        opal_show_help("help-mtl-mxm.txt", "unable to extract endpoint address",
+        opal_show_help("help-mtl-mxm.txt", "unable to extract endpoint ptl address",
                        true, mxm_error_string(err));
         return OMPI_ERROR;
     }

diff --git a/oshmem/mca/spml/base/spml_base_select.c b/oshmem/mca/spml/base/spml_base_select.c
@@ -1,6 +1,8 @@
 /*
  * Copyright (c) 2013      Mellanox Technologies, Inc.
  *                         All rights reserved.
+ * Copyright (c) 2014      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -136,7 +138,7 @@ int mca_spml_base_select(bool enable_progress_threads, bool enable_mpi_threads)
     /* Finished querying all components.  Check for the bozo case. */
 
     if (NULL == best_component) {
-        opal_show_help("help-shmem-mca.txt",
+        opal_show_help("help-oshmem-memheap.txt",
                        "find-available:none-found",
                        true,
                        "spml");

diff --git a/oshmem/mca/spml/ikrit/spml_ikrit.c b/oshmem/mca/spml/ikrit/spml_ikrit.c
@@ -1,6 +1,8 @@
 /*
  * Copyright (c) 2013      Mellanox Technologies, Inc.
  *                         All rights reserved.
+ * Copyright (c) 2014      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -64,8 +66,8 @@ static int spml_ikrit_get_ep_address(spml_ikrit_mxm_ep_conn_info_t *ep_info,
                          (struct sockaddr *) &ep_info->addr.ptl_addr[ptlid],
                          &addrlen);
     if (MXM_OK != err) {
-        orte_show_help("help-spml-ikrit.txt",
-                       "unable to extract endpoint address",
+        orte_show_help("help-oshmem-spml-ikrit.txt",
+                       "unable to get endpoint address",
                        true,
                        mxm_error_string(err));
         return OSHMEM_ERROR;

diff --git a/oshmem/mca/sshmem/mmap/help-oshmem-sshmem-mmap.txt b/oshmem/mca/sshmem/mmap/help-oshmem-sshmem-mmap.txt
@@ -23,26 +23,4 @@ This issue could also be related to CONFIG_STRICT_DEVMEM
 kernel option which if enabled prevents access to physical
 memory via "mmap". In this case you could try using other
 sshmem components instead.
-
-[mmap:file open failure]
-
-You can try the following:
-
-1. Switch to anonymous mapping using "-mca sshmem_mmap_anonymous 0".
-   The anonymous mapping is not backed by any file.
-2. Set path to backing files explicitly using "-mca sshmem_base_backing_file_dir <path>"
-
-   File: %s
-   Error: %s
-
-[mmap:file truncate failure]
-
-File can not be truncated to specified length. 
-
-You can try to switch to anonymous mapping using "-mca sshmem_mmap_anonymous 0".
-The anonymous mapping is not backed by any file.
-
-   File: %s
-   Size: %llu
-   Error: %s
-
+#