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
Kill dead code.
[simgrid.git]
/
src
/
surf
/
host_clm03.cpp
diff --git
a/src/surf/host_clm03.cpp
b/src/surf/host_clm03.cpp
index
f25ebdf
..
5b64047
100644
(file)
--- a/
src/surf/host_clm03.cpp
+++ b/
src/surf/host_clm03.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-201
9
. 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. */
/* 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. */
@@
-28,12
+28,10
@@
namespace simgrid {
namespace surf {
HostCLM03Model::HostCLM03Model()
{
namespace surf {
HostCLM03Model::HostCLM03Model()
{
- all_existing_models
->
push_back(this);
+ all_existing_models
.
push_back(this);
}
double HostCLM03Model::next_occuring_event(double now)
{
}
double HostCLM03Model::next_occuring_event(double now)
{
- ignore_empty_vm_in_pm_LMM();
-
double min_by_cpu = surf_cpu_model_pm->next_occuring_event(now);
double min_by_net =
surf_network_model->next_occuring_event_is_idempotent() ? surf_network_model->next_occuring_event(now) : -1;
double min_by_cpu = surf_cpu_model_pm->next_occuring_event(now);
double min_by_net =
surf_network_model->next_occuring_event_is_idempotent() ? surf_network_model->next_occuring_event(now) : -1;
@@
-44,12
+42,10
@@
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({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)
+ double res = min_by_cpu;
+ if (res < 0 || (min_by_net >= 0.0 && min_by_net < res))
res = min_by_net;
res = min_by_net;
- if (
min_by_sto >= 0.0 && min_by_sto < res
)
+ if (
res < 0 || (min_by_sto >= 0.0 && min_by_sto < res)
)
res = min_by_sto;
return res;
}
res = min_by_sto;
return res;
}