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
migrate to set_host in java too
[simgrid.git]
/
src
/
surf
/
host_clm03.cpp
diff --git
a/src/surf/host_clm03.cpp
b/src/surf/host_clm03.cpp
index
955e6b8
..
d7f2995
100644
(file)
--- a/
src/surf/host_clm03.cpp
+++ b/
src/surf/host_clm03.cpp
@@
-30,13
+30,13
@@
HostCLM03Model::HostCLM03Model()
{
all_existing_models.push_back(this);
}
-double HostCLM03Model::next_occuring_event(double now)
+double HostCLM03Model::next_occur
r
ing_event(double now)
{
- double min_by_cpu = surf_cpu_model_pm->next_occuring_event(now);
+ double min_by_cpu = surf_cpu_model_pm->next_occur
r
ing_event(now);
double min_by_net =
- surf_network_model->next_occur
ing_event_is_idempotent() ? surf_network_model->next_occu
ring_event(now) : -1;
- double min_by_sto = surf_storage_model->next_occuring_event(now);
- double min_by_dsk = surf_disk_model->next_occuring_event(now);
+ surf_network_model->next_occur
ring_event_is_idempotent() ? surf_network_model->next_occur
ring_event(now) : -1;
+ double min_by_sto = surf_storage_model->next_occur
r
ing_event(now);
+ double min_by_dsk = surf_disk_model->next_occur
r
ing_event(now);
XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f, %s min_by_dsk %f", this,
typeid(surf_cpu_model_pm).name(), min_by_cpu, typeid(surf_network_model).name(), min_by_net,