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
cleanup the declaration and handling of the cpu/optim option
[simgrid.git]
/
src
/
simgrid
/
sg_config.cpp
diff --git
a/src/simgrid/sg_config.cpp
b/src/simgrid/sg_config.cpp
index
281feaa
..
3fe0c43
100644
(file)
--- a/
src/simgrid/sg_config.cpp
+++ b/
src/simgrid/sg_config.cpp
@@
-1,19
+1,19
@@
-/* Copyright (c) 2009-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-201
8
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* sg_config: configuration infrastructure for the simulation world */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* sg_config: configuration infrastructure for the simulation world */
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.h
pp
"
#include "instr/instr_interface.h"
#include "mc/mc.h"
#include "simgrid/instr.h"
#include "simgrid/simix.h"
#include "simgrid_config.h" /* what was compiled in? */
#include "instr/instr_interface.h"
#include "mc/mc.h"
#include "simgrid/instr.h"
#include "simgrid/simix.h"
#include "simgrid_config.h" /* what was compiled in? */
+#include "src/kernel/lmm/maxmin.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/surf/surf_interface.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/surf/surf_interface.hpp"
-#include "surf/maxmin.hpp"
#include "surf/surf.hpp"
#include "xbt/config.h"
#include "xbt/config.hpp"
#include "surf/surf.hpp"
#include "xbt/config.h"
#include "xbt/config.hpp"
@@
-301,10
+301,6
@@
void sg_config_init(int *argc, char **argv)
describe_model(description, descsize, surf_cpu_model_description, "model", "The model to use for the CPU");
xbt_cfg_register_string("cpu/model", "Cas01", &_sg_cfg_cb__cpu_model, description);
describe_model(description, descsize, surf_cpu_model_description, "model", "The model to use for the CPU");
xbt_cfg_register_string("cpu/model", "Cas01", &_sg_cfg_cb__cpu_model, description);
- describe_model(description, descsize, surf_optimization_mode_description, "optimization mode",
- "The optimization modes to use for the CPU");
- xbt_cfg_register_string("cpu/optim", "Lazy", &_sg_cfg_cb__optimization_mode, description);
-
describe_model(description, descsize, surf_storage_model_description, "model", "The model to use for the storage");
xbt_cfg_register_string("storage/model", "default", &_sg_cfg_cb__storage_mode, description);
describe_model(description, descsize, surf_storage_model_description, "model", "The model to use for the storage");
xbt_cfg_register_string("storage/model", "default", &_sg_cfg_cb__storage_mode, description);
@@
-360,11
+356,11
@@
void sg_config_init(int *argc, char **argv)
xbt_cfg_register_boolean("cpu/maxmin-selective-update", "no", nullptr, "Update the constraint set propagating "
"recursively to others constraints (off by "
xbt_cfg_register_boolean("cpu/maxmin-selective-update", "no", nullptr, "Update the constraint set propagating "
"recursively to others constraints (off by "
- "default
when
optim is set to lazy)");
+ "default
unless
optim is set to lazy)");
xbt_cfg_register_alias("cpu/maxmin-selective-update", "cpu/maxmin_selective_update");
xbt_cfg_register_boolean("network/maxmin-selective-update", "no", nullptr, "Update the constraint set propagating "
"recursively to others constraints (off "
xbt_cfg_register_alias("cpu/maxmin-selective-update", "cpu/maxmin_selective_update");
xbt_cfg_register_boolean("network/maxmin-selective-update", "no", nullptr, "Update the constraint set propagating "
"recursively to others constraints (off "
- "by default
when
optim is set to lazy)");
+ "by default
unless
optim is set to lazy)");
xbt_cfg_register_alias("network/maxmin-selective-update", "network/maxmin_selective_update");
/* Replay (this part is enabled even if MC it disabled) */
xbt_cfg_register_string("model-check/replay", nullptr, _sg_cfg_cb_model_check_replay,
xbt_cfg_register_alias("network/maxmin-selective-update", "network/maxmin_selective_update");
/* Replay (this part is enabled even if MC it disabled) */
xbt_cfg_register_string("model-check/replay", nullptr, _sg_cfg_cb_model_check_replay,