A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
smpi/running-power is renamed to smpi/host-speed
[simgrid.git]
/
src
/
smpi
/
smpi_global.cpp
diff --git
a/src/smpi/smpi_global.cpp
b/src/smpi/smpi_global.cpp
index
ce2d316
..
5429977
100644
(file)
--- a/
src/smpi/smpi_global.cpp
+++ b/
src/smpi/smpi_global.cpp
@@
-100,7
+100,7
@@
void smpi_process_init(int *argc, char ***argv)
{
if (argc != nullptr && argv != nullptr) {
- smx_
process
_t proc = SIMIX_process_self();
+ smx_
actor
_t proc = SIMIX_process_self();
proc->context->set_cleanup(&MSG_process_cleanup_from_SIMIX);
char* instance_id = (*argv)[1];
int rank = xbt_str_parse_int((*argv)[2], "Invalid rank: %s");
@@
-430,12
+430,16
@@
static void smpi_check_options(){
xbt_assert(xbt_cfg_get_int("smpi/async-small-thresh") <= xbt_cfg_get_int("smpi/send-is-detached-thresh"));
- if (xbt_cfg_is_default_value("smpi/
running-power
")) {
+ if (xbt_cfg_is_default_value("smpi/
host-speed
")) {
XBT_INFO("You did not set the power of the host running the simulation. "
"The timings will certainly not be accurate. "
- "Use the option \"--cfg=smpi/
running-power
:<flops>\" to set its value."
+ "Use the option \"--cfg=smpi/
host-speed
:<flops>\" to set its value."
"Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information.");
}
+
+ xbt_assert(xbt_cfg_get_double("smpi/cpu-threshold") >=0,
+ "The 'smpi/cpu-threshold' option cannot have negative values [anymore]. If you want to discard "
+ "the simulation of any computation, please use 'smpi/simulate-computation:no' instead.");
}
int smpi_enabled() {
@@
-759,7
+763,7
@@
static void smpi_init_options(){
smpi_coll_cleanup_callback=nullptr;
smpi_cpu_threshold = xbt_cfg_get_double("smpi/cpu-threshold");
- smpi_
running_power = xbt_cfg_get_double("smpi/running-power
");
+ smpi_
host_speed = xbt_cfg_get_double("smpi/host-speed
");
smpi_privatize_global_variables = xbt_cfg_get_boolean("smpi/privatize-global-variables");
if (smpi_cpu_threshold < 0)
smpi_cpu_threshold = DBL_MAX;