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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
host_clm03.cpp
diff --git
a/src/surf/host_clm03.cpp
b/src/surf/host_clm03.cpp
index
c240e0e
..
e76df1d
100644
(file)
--- a/
src/surf/host_clm03.cpp
+++ b/
src/surf/host_clm03.cpp
@@
-27,7
+27,7
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
void surf_host_model_init_current_default(void)
{
surf_host_model = new simgrid::surf::HostCLM03Model();
void surf_host_model_init_current_default(void)
{
surf_host_model = new simgrid::surf::HostCLM03Model();
- xbt_cfg_setdefault_boolean(
_sg_cfg_set,
"network/crosstraffic", "yes");
+ xbt_cfg_setdefault_boolean("network/crosstraffic", "yes");
surf_cpu_model_init_Cas01();
surf_network_model_init_LegrandVelho();
surf_cpu_model_init_Cas01();
surf_network_model_init_LegrandVelho();
@@
-46,6
+46,8
@@
void surf_host_model_init_compound()
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
+HostCLM03Model::~HostCLM03Model() {}
+
double HostCLM03Model::next_occuring_event(double now){
adjustWeightOfDummyCpuActions();
double HostCLM03Model::next_occuring_event(double now){
adjustWeightOfDummyCpuActions();
@@
-58,7
+60,7
@@
double HostCLM03Model::next_occuring_event(double now){
typeid(surf_network_model).name(), min_by_net,
typeid(surf_storage_model).name(), min_by_sto);
typeid(surf_network_model).name(), min_by_net,
typeid(surf_storage_model).name(), min_by_sto);
- double res = std::max(
std::max(min_by_cpu, min_by_net), min_by_sto
);
+ double res = std::max(
{min_by_cpu, min_by_net, min_by_sto}
);
if (min_by_cpu >= 0.0 && min_by_cpu < res)
res = min_by_cpu;
if (min_by_net >= 0.0 && min_by_net < res)
if (min_by_cpu >= 0.0 && min_by_cpu < res)
res = min_by_cpu;
if (min_by_net >= 0.0 && min_by_net < res)