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
Implement a second veto on start. Activity must be assigned to a resource
[simgrid.git]
/
src
/
s4u
/
s4u_Disk.cpp
diff --git
a/src/s4u/s4u_Disk.cpp
b/src/s4u/s4u_Disk.cpp
index
d75db46
..
2cc158a
100644
(file)
--- a/
src/s4u/s4u_Disk.cpp
+++ b/
src/s4u/s4u_Disk.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2019-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2019-202
1
. 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. */
@@
-7,6
+7,7
@@
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Io.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Io.hpp"
+#include "simgrid/simix.hpp"
#include "src/kernel/resource/DiskImpl.hpp"
namespace simgrid {
#include "src/kernel/resource/DiskImpl.hpp"
namespace simgrid {
@@
-51,27
+52,27
@@
void Disk::set_property(const std::string& key, const std::string& value)
IoPtr Disk::io_init(sg_size_t size, Io::OpType type)
{
IoPtr Disk::io_init(sg_size_t size, Io::OpType type)
{
- return Io
Ptr(new Io(this, size, type)
);
+ return Io
::init()->set_disk(this)->set_size(size)->set_op_type(type
);
}
IoPtr Disk::read_async(sg_size_t size)
{
}
IoPtr Disk::read_async(sg_size_t size)
{
- return IoPtr(io_init(size, Io::OpType::READ))->start();
+ return IoPtr(io_init(size, Io::OpType::READ))->
vetoable_
start();
}
sg_size_t Disk::read(sg_size_t size)
{
}
sg_size_t Disk::read(sg_size_t size)
{
- return IoPtr(io_init(size, Io::OpType::READ))->start()->wait()->get_performed_ioops();
+ return IoPtr(io_init(size, Io::OpType::READ))->
vetoable_
start()->wait()->get_performed_ioops();
}
IoPtr Disk::write_async(sg_size_t size)
{
}
IoPtr Disk::write_async(sg_size_t size)
{
- return IoPtr(io_init(size, Io::OpType::WRITE)->start());
+ return IoPtr(io_init(size, Io::OpType::WRITE)->
vetoable_
start());
}
sg_size_t Disk::write(sg_size_t size)
{
}
sg_size_t Disk::write(sg_size_t size)
{
- return IoPtr(io_init(size, Io::OpType::WRITE))->start()->wait()->get_performed_ioops();
+ return IoPtr(io_init(size, Io::OpType::WRITE))->
vetoable_
start()->wait()->get_performed_ioops();
}
} // namespace s4u
}
} // namespace s4u
@@
-79,7
+80,7
@@
sg_size_t Disk::write(sg_size_t size)
/* **************************** Public C interface *************************** */
/* **************************** Public C interface *************************** */
-const char* sg_disk_name(const_sg_disk_t disk)
+const char* sg_disk_
get_
name(const_sg_disk_t disk)
{
return disk->get_cname();
}
{
return disk->get_cname();
}
@@
-107,11
+108,13
@@
sg_size_t sg_disk_write(sg_disk_t disk, sg_size_t size)
{
return disk->write(size);
}
{
return disk->write(size);
}
-void* sg_disk_data(const_sg_disk_t disk)
+
+void* sg_disk_get_data(const_sg_disk_t disk)
{
return disk->get_data();
}
{
return disk->get_data();
}
-void sg_disk_data_set(sg_disk_t disk, void* data)
+
+void sg_disk_set_data(sg_disk_t disk, void* data)
{
disk->set_data(data);
}
{
disk->set_data(data);
}