Okay, okay...stop the whining! Put the mca param registration in the shmem base.
This commit was SVN r25652.
Этот коммит содержится в:
родитель
e683b2f9c7
Коммит
7e223b5799
@ -195,6 +195,8 @@ OPAL_DECLSPEC extern opal_list_t opal_shmem_base_components_opened;
|
|||||||
*/
|
*/
|
||||||
OPAL_DECLSPEC extern int opal_shmem_base_output;
|
OPAL_DECLSPEC extern int opal_shmem_base_output;
|
||||||
|
|
||||||
|
OPAL_DECLSPEC extern bool opal_mmap_on_nfs_warning;
|
||||||
|
|
||||||
END_C_DECLS
|
END_C_DECLS
|
||||||
|
|
||||||
#endif /* OPAL_BASE_SHMEM_H */
|
#endif /* OPAL_BASE_SHMEM_H */
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
OPAL_DECLSPEC int opal_shmem_base_output = -1;
|
OPAL_DECLSPEC int opal_shmem_base_output = -1;
|
||||||
bool opal_shmem_base_components_opened_valid = false;
|
bool opal_shmem_base_components_opened_valid = false;
|
||||||
opal_list_t opal_shmem_base_components_opened;
|
opal_list_t opal_shmem_base_components_opened;
|
||||||
|
bool opal_mmap_on_nfs_warning;
|
||||||
|
|
||||||
/* ////////////////////////////////////////////////////////////////////////// */
|
/* ////////////////////////////////////////////////////////////////////////// */
|
||||||
/**
|
/**
|
||||||
@ -74,6 +75,23 @@ opal_shmem_base_register_params(void)
|
|||||||
opal_shmem_base_output = -1;
|
opal_shmem_base_output = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Do we want the "warning: your mmap file is on NFS!" message? Per a
|
||||||
|
* thread on the OMPI devel list
|
||||||
|
* (http://www.open-mpi.org/community/lists/devel/2011/12/10054.php),
|
||||||
|
* on some systems, it doesn't seem to matter. But per older threads,
|
||||||
|
* it definitely does matter on some systems. Perhaps newer kernels
|
||||||
|
* are smarter about this kind of stuff...? Regardless, we should
|
||||||
|
* provide the ability to turn off this message for systems where the
|
||||||
|
* effect doesn't matter.
|
||||||
|
*/
|
||||||
|
mca_base_param_reg_int_name("opal",
|
||||||
|
"enable_shmem_on_nfs_warning",
|
||||||
|
"Enable the warning emitted when Open MPI detects that its shared memory backing file is located on a network filesystem (1 = enabled, 0 = disabled).",
|
||||||
|
false, false,
|
||||||
|
(int)true, &value);
|
||||||
|
opal_mmap_on_nfs_warning = OPAL_INT_TO_BOOL(value);
|
||||||
|
|
||||||
return OPAL_SUCCESS;
|
return OPAL_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,7 +50,6 @@
|
|||||||
#endif /* HAVE_SYS_STAT_H */
|
#endif /* HAVE_SYS_STAT_H */
|
||||||
|
|
||||||
#include "opal/constants.h"
|
#include "opal/constants.h"
|
||||||
#include "opal/runtime/opal.h"
|
|
||||||
#include "opal/util/output.h"
|
#include "opal/util/output.h"
|
||||||
#include "opal/util/path.h"
|
#include "opal/util/path.h"
|
||||||
#include "opal/util/show_help.h"
|
#include "opal/util/show_help.h"
|
||||||
|
@ -30,8 +30,6 @@ BEGIN_C_DECLS
|
|||||||
/** version string of opal */
|
/** version string of opal */
|
||||||
OPAL_DECLSPEC extern const char opal_version_string[];
|
OPAL_DECLSPEC extern const char opal_version_string[];
|
||||||
|
|
||||||
OPAL_DECLSPEC extern bool opal_mmap_on_nfs_warning;
|
|
||||||
|
|
||||||
/* Size of a cache line. To be replaced with real hwloc info (in
|
/* Size of a cache line. To be replaced with real hwloc info (in
|
||||||
trunk/v1.5 and beyond, only), but for the moment, just move it here
|
trunk/v1.5 and beyond, only), but for the moment, just move it here
|
||||||
so that we can remove opal/include/sys/cache.h whose only purpose
|
so that we can remove opal/include/sys/cache.h whose only purpose
|
||||||
|
@ -72,7 +72,6 @@ const char opal_version_string[] = OPAL_IDENT_STRING;
|
|||||||
int opal_initialized = 0;
|
int opal_initialized = 0;
|
||||||
int opal_util_initialized = 0;
|
int opal_util_initialized = 0;
|
||||||
int opal_cache_line_size;
|
int opal_cache_line_size;
|
||||||
bool opal_mmap_on_nfs_warning;
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
opal_err2str(int errnum, const char **errmsg)
|
opal_err2str(int errnum, const char **errmsg)
|
||||||
|
@ -115,23 +115,6 @@ int opal_register_params(void)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Do we want the "warning: your mmap file is on NFS!" message? Per a
|
|
||||||
* thread on the OMPI devel list
|
|
||||||
* (http://www.open-mpi.org/community/lists/devel/2011/12/10054.php),
|
|
||||||
* on some systems, it doesn't seem to matter. But per older threads,
|
|
||||||
* it definitely does matter on some systems. Perhaps newer kernels
|
|
||||||
* are smarter about this kind of stuff...? Regardless, we should
|
|
||||||
* provide the ability to turn off this message for systems where the
|
|
||||||
* effect doesn't matter.
|
|
||||||
*/
|
|
||||||
mca_base_param_reg_int_name("opal",
|
|
||||||
"enable_shmem_on_nfs_warning",
|
|
||||||
"Enable the warning emitted when Open MPI detects that its shared memory backing file is located on a network filesystem (1 = enabled, 0 = disabled).",
|
|
||||||
false, false,
|
|
||||||
(int)true, &value);
|
|
||||||
opal_mmap_on_nfs_warning = OPAL_INT_TO_BOOL(value);
|
|
||||||
|
|
||||||
/* Paffinity base also has some parameters */
|
/* Paffinity base also has some parameters */
|
||||||
return opal_paffinity_base_register_params();
|
return opal_paffinity_base_register_params();
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user