From 7aaf4b00ce0630ef5a15644e598255211181f203 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Mon, 11 Aug 2014 03:19:01 +0000 Subject: [PATCH 1/3] check-help-strings cleanup This commit was SVN r32490. (cherry picked from commit 03fbd9a12db5b88e9b13e3453194b1a847e9f4e6) --- oshmem/mca/spml/base/spml_base_select.c | 4 +++- oshmem/mca/spml/ikrit/spml_ikrit.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/oshmem/mca/spml/base/spml_base_select.c b/oshmem/mca/spml/base/spml_base_select.c index 0d31c5d8314..36183a90f2a 100644 --- 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 index 62c83a75cc0..56469bb9f52 100644 --- 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; From 2013871f014b306b8f87c923652783c98bfc4919 Mon Sep 17 00:00:00 2001 From: Alex Mikheev Date: Wed, 5 Nov 2014 16:38:28 +0200 Subject: [PATCH 2/3] OSHMEM: sshmem mmap: removed unused help topics (cherry picked from commit 5a63b96351d7fff93d231f7deaab2d1baf3a4632) --- .../sshmem/mmap/help-oshmem-sshmem-mmap.txt | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/oshmem/mca/sshmem/mmap/help-oshmem-sshmem-mmap.txt b/oshmem/mca/sshmem/mmap/help-oshmem-sshmem-mmap.txt index f979dfa3eb8..50615627723 100644 --- 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 " - - 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 - +# From ba9e77c17bd9c40638f38ab95b05676dbea8e6a5 Mon Sep 17 00:00:00 2001 From: Alex Mikheev Date: Wed, 5 Nov 2014 17:18:45 +0200 Subject: [PATCH 3/3] mtl mxm: fix typo in help topic name Fixes typo introduced in 1a5ff6df43562de119c868bca29470823b1595ec --- ompi/mca/mtl/mxm/mtl_mxm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ompi/mca/mtl/mxm/mtl_mxm.c b/ompi/mca/mtl/mxm/mtl_mxm.c index 6a60e3fee3c..f2cf84ea4b1 100644 --- 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; }