1
1

Fix COMPRESS/CRS MCA for C/R by returning correct value

Right now the C/R code fails because of a change introduced in
opal/mca/compress/base/compress_base_open.c and
pal/mca/crs/base/crs_base_open.c in 2013 with commit

git 734c724ff76d9bf814f3ab0396bcd9ee6fddcd1b
svn r28239

    Update OPAL frameworks to use the MCA framework system.

This commit changed a lot but also the return value of functions from
OPAL_SUCCESS to OPAL_ERR_NOT_AVAILABLE/OPAL_ERR_NOT_AVAILABLE.

This commit lets opal_compress_base_register() and opal_crs_base_open()
always return OPAL_SUCCESS and removes unneeded #includes.

This commit was SVN r30130.

The following SVN revision numbers were found above:
  r28239 --> open-mpi/ompi@365cf48db5
Этот коммит содержится в:
Adrian Reber 2014-01-07 14:16:54 +00:00
родитель 6fb0dbdab5
Коммит 015799c724
2 изменённых файлов: 1 добавлений и 21 удалений

Просмотреть файл

@ -14,13 +14,8 @@
#include "opal_config.h"
#include <string.h>
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "opal/include/opal/constants.h"
#include "opal/mca/compress/compress.h"
#include "opal/mca/compress/base/base.h"
#include "opal/util/output.h"
#include "opal/mca/compress/base/static-components.h"
@ -45,13 +40,6 @@ MCA_BASE_FRAMEWORK_DECLARE(opal, compress, NULL, opal_compress_base_register, op
static int opal_compress_base_register (mca_base_register_flag_t flags)
{
/* Compression currently only used with C/R */
if( !opal_cr_is_enabled ) {
opal_output_verbose(10, opal_compress_base_framework.framework_output,
"compress:open: FT is not enabled, skipping!");
return OPAL_ERR_NOT_AVAILABLE;
}
return OPAL_SUCCESS;
}

Просмотреть файл

@ -21,16 +21,8 @@
#include "opal_config.h"
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "opal/constants.h"
#include "opal/mca/crs/crs.h"
#include "opal/mca/crs/base/base.h"
#include "opal/util/output.h"
#include "opal/mca/crs/base/static-components.h"
@ -90,7 +82,7 @@ int opal_crs_base_open(mca_base_open_flag_t flags)
if( !opal_cr_is_enabled ) {
opal_output_verbose(10, opal_crs_base_framework.framework_output,
"crs:open: FT is not enabled, skipping!");
return OPAL_ERR_NOT_AVAILABLE;;
return OPAL_SUCCESS;
}
return mca_base_framework_components_open (&opal_crs_base_framework, flags);