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
active probing return to default value for STA nodes
[simgrid.git]
/
src
/
surf
/
disk_s19.cpp
diff --git
a/src/surf/disk_s19.cpp
b/src/surf/disk_s19.cpp
index 4198e100359e09b9633b643d11278904a6237a75..66525d7eee8321193ab260dbc0663e6ff8ae5e91 100644
(file)
--- a/
src/surf/disk_s19.cpp
+++ b/
src/surf/disk_s19.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-20
20
. 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. */
@@
-38,9
+38,9
@@
DiskImpl* DiskS19Model::createDisk(const std::string& id, double read_bw, double
return new DiskS19(this, id, get_maxmin_system(), read_bw, write_bw);
}
return new DiskS19(this, id, get_maxmin_system(), read_bw, write_bw);
}
-double DiskS19Model::next_occuring_event(double now)
+double DiskS19Model::next_occur
r
ing_event(double now)
{
{
- return DiskModel::next_occuring_event_full(now);
+ return DiskModel::next_occur
r
ing_event_full(now);
}
void DiskS19Model::update_actions_state(double /*now*/, double delta)
}
void DiskS19Model::update_actions_state(double /*now*/, double delta)
@@
-96,10
+96,10
@@
DiskS19Action::DiskS19Action(Model* model, double cost, bool failed, DiskImpl* d
model->get_maxmin_system()->expand(disk->get_constraint(), get_variable(), 1.0);
switch (type) {
case s4u::Io::OpType::READ:
model->get_maxmin_system()->expand(disk->get_constraint(), get_variable(), 1.0);
switch (type) {
case s4u::Io::OpType::READ:
- model->get_maxmin_system()->expand(disk->
constraint_read_
, get_variable(), 1.0);
+ model->get_maxmin_system()->expand(disk->
get_read_constraint()
, get_variable(), 1.0);
break;
case s4u::Io::OpType::WRITE:
break;
case s4u::Io::OpType::WRITE:
- model->get_maxmin_system()->expand(disk->
constraint_write_
, get_variable(), 1.0);
+ model->get_maxmin_system()->expand(disk->
get_write_constraint()
, get_variable(), 1.0);
break;
default:
THROW_UNIMPLEMENTED;
break;
default:
THROW_UNIMPLEMENTED;