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
simplify the I/O stream thing A LOT. Might be plunged in CLM03 afterall
[simgrid.git]
/
src
/
surf
/
disk_s19.hpp
diff --git
a/src/surf/disk_s19.hpp
b/src/surf/disk_s19.hpp
index f80c35b2d9b9f307b342eb169c038d3fb072ebce..b4c352bee3b9d40f240af458e1b2944abbb5f388 100644
(file)
--- a/
src/surf/disk_s19.hpp
+++ b/
src/surf/disk_s19.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-202
2
. 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. */
@@
-10,9
+10,7
@@
#ifndef DISK_S19_HPP_
#define DISK_S19_HPP_
#ifndef DISK_S19_HPP_
#define DISK_S19_HPP_
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
/***********
* Classes *
/***********
* Classes *
@@
-28,8
+26,11
@@
class XBT_PRIVATE DiskS19Action;
class DiskS19Model : public DiskModel {
public:
class DiskS19Model : public DiskModel {
public:
- using DiskModel::DiskModel;
+ explicit DiskS19Model(const std::string& name);
+ DiskS19Model(const DiskS19Model&) = delete;
+ DiskS19Model& operator=(const DiskS19Model&) = delete;
DiskImpl* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) override;
DiskImpl* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) override;
+
void update_actions_state(double now, double delta) override;
};
void update_actions_state(double now, double delta) override;
};
@@
-40,9
+41,11
@@
public:
class DiskS19 : public DiskImpl {
public:
using DiskImpl::DiskImpl;
class DiskS19 : public DiskImpl {
public:
using DiskImpl::DiskImpl;
+ void set_read_bandwidth(double value) override;
+ void set_write_bandwidth(double value) override;
+ void set_readwrite_bandwidth(double value) override;
+ void apply_event(kernel::profile::Event* triggered, double value) override;
DiskAction* io_start(sg_size_t size, s4u::Io::OpType type) override;
DiskAction* io_start(sg_size_t size, s4u::Io::OpType type) override;
- DiskAction* read(sg_size_t size) override;
- DiskAction* write(sg_size_t size) override;
};
/**********
};
/**********
@@
-51,11
+54,8
@@
public:
class DiskS19Action : public DiskAction {
public:
class DiskS19Action : public DiskAction {
public:
- DiskS19Action(Model* model, double cost, bool failed, const DiskImpl* disk, s4u::Io::OpType type);
- void update_remains_lazy(double now) override;
+ DiskS19Action(Model* model, double cost, bool failed);
};
};
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource
#endif /* DISK_S19_HPP_ */
#endif /* DISK_S19_HPP_ */