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 with framagit/master
[simgrid.git]
/
src
/
surf
/
disk_s19.cpp
diff --git
a/src/surf/disk_s19.cpp
b/src/surf/disk_s19.cpp
index aabe4f8567257870da93fb0451f7b7812e0042e1..3436df2904b3eaf328b55df35c69bc9b6c97422a 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
21
. 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. */
@@
-48,7
+48,7
@@
void DiskS19Model::update_actions_state(double /*now*/, double delta)
for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
auto& action = *it;
++it; // increment iterator here since the following calls to action.finish() may invalidate it
for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
auto& action = *it;
++it; // increment iterator here since the following calls to action.finish() may invalidate it
- action.update_remains(
l
rint(action.get_variable()->get_value() * delta));
+ action.update_remains(rint(action.get_variable()->get_value() * delta));
action.update_max_duration(delta);
if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) ||
action.update_max_duration(delta);
if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) ||
@@
-70,17
+70,17
@@
DiskS19::DiskS19(DiskModel* model, const std::string& name, lmm::System* maxminS
DiskAction* DiskS19::io_start(sg_size_t size, s4u::Io::OpType type)
{
DiskAction* DiskS19::io_start(sg_size_t size, s4u::Io::OpType type)
{
- return new DiskS19Action(get_model(), s
ize
, not is_on(), this, type);
+ return new DiskS19Action(get_model(), s
tatic_cast<double>(size)
, not is_on(), this, type);
}
DiskAction* DiskS19::read(sg_size_t size)
{
}
DiskAction* DiskS19::read(sg_size_t size)
{
- return new DiskS19Action(get_model(), s
ize
, not is_on(), this, s4u::Io::OpType::READ);
+ return new DiskS19Action(get_model(), s
tatic_cast<double>(size)
, not is_on(), this, s4u::Io::OpType::READ);
}
DiskAction* DiskS19::write(sg_size_t size)
{
}
DiskAction* DiskS19::write(sg_size_t size)
{
- return new DiskS19Action(get_model(), s
ize
, not is_on(), this, s4u::Io::OpType::WRITE);
+ return new DiskS19Action(get_model(), s
tatic_cast<double>(size)
, not is_on(), this, s4u::Io::OpType::WRITE);
}
/**********
}
/**********
@@
-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;