From 57323570e3ad4518e7eab9ee06aeb99cf009a619 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 22 Sep 2011 18:20:30 +0000 Subject: [PATCH] These calls were mistakenly added in r25164. This commit was SVN r25176. The following SVN revision numbers were found above: r25164 --> open-mpi/ompi@51129cc2a83dbb126462755e128810225f29a780 --- opal/mca/maffinity/base/base.h | 10 ---------- .../maffinity/hwloc/maffinity_hwloc_module.c | 17 +++++++++-------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/opal/mca/maffinity/base/base.h b/opal/mca/maffinity/base/base.h index 905ed7e6ee..617d9c3daa 100644 --- a/opal/mca/maffinity/base/base.h +++ b/opal/mca/maffinity/base/base.h @@ -109,16 +109,6 @@ OPAL_DECLSPEC int opal_maffinity_base_set(opal_maffinity_base_segment_t *segment OPAL_DECLSPEC int opal_maffinity_base_node_name_to_id(char *, int *); OPAL_DECLSPEC int opal_maffinity_base_bind(opal_maffinity_base_segment_t *, size_t, int); -/** - * Report a bind failure using the normal mechanisms if a component - * fails to bind memory -- according to the value of the - * maffinity_base_bind_failure_action MCA parameter. - */ -OPAL_DECLSPEC int opal_maffinity_base_report_bind_failure(const char *file, - int line, - const char *msg, - int rc); - /** * Shut down the maffinity MCA framework. * diff --git a/opal/mca/maffinity/hwloc/maffinity_hwloc_module.c b/opal/mca/maffinity/hwloc/maffinity_hwloc_module.c index 1891508027..d8157991cb 100644 --- a/opal/mca/maffinity/hwloc/maffinity_hwloc_module.c +++ b/opal/mca/maffinity/hwloc/maffinity_hwloc_module.c @@ -33,6 +33,7 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/mca/maffinity/maffinity.h" #include "opal/mca/maffinity/base/base.h" +#include "opal/mca/hwloc/base/base.h" #include "maffinity_hwloc.h" #include "opal/mca/hwloc/hwloc.h" @@ -91,8 +92,8 @@ static int hwloc_module_set(opal_maffinity_base_segment_t *segments, /* bozo check */ if (NULL == opal_hwloc_topology) { msg = "hwloc_set_area_membind() failure - topology not available"; - return opal_maffinity_base_report_bind_failure(__FILE__, __LINE__, - msg, rc); + return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__, + msg, rc); } /* This module won't be used unless the process is already @@ -122,8 +123,8 @@ static int hwloc_module_set(opal_maffinity_base_segment_t *segments, hwloc_bitmap_free(cpuset); } if (OPAL_SUCCESS != rc) { - return opal_maffinity_base_report_bind_failure(__FILE__, __LINE__, - msg, rc); + return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__, + msg, rc); } return OPAL_SUCCESS; } @@ -147,8 +148,8 @@ static int hwloc_module_bind(opal_maffinity_base_segment_t *segs, /* bozo check */ if (NULL == opal_hwloc_topology) { msg = "hwloc_set_area_membind() failure - topology not available"; - return opal_maffinity_base_report_bind_failure(__FILE__, __LINE__, - msg, rc); + return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__, + msg, rc); } cpuset = hwloc_bitmap_alloc(); @@ -175,8 +176,8 @@ static int hwloc_module_bind(opal_maffinity_base_segment_t *segs, hwloc_bitmap_free(cpuset); } if (OPAL_SUCCESS != rc) { - return opal_maffinity_base_report_bind_failure(__FILE__, __LINE__, - msg, rc); + return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__, + msg, rc); } return OPAL_SUCCESS; }