cosmetics (less SIMIX, more kernel)

[simgrid.git] / src / kernel / activity / IoImpl.hpp

diff --git a/src/kernel/activity/IoImpl.hpp b/src/kernel/activity/IoImpl.hpp
index 6ab89d9..cbc2f0d 100644 (file)
--- a/src/kernel/activity/IoImpl.hpp
+++ b/src/kernel/activity/IoImpl.hpp
@@ -3,8 +3,8 @@
 /* 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. */
 

-#ifndef SIMIX_SYNCHRO_IO_HPP
-#define SIMIX_SYNCHRO_IO_HPP
+#ifndef SIMGRID_KERNEL_ACTIVITY_IO_HPP
+#define SIMGRID_KERNEL_ACTIVITY_IO_HPP

 
 #include "src/kernel/activity/ActivityImpl.hpp"
 #include "surf/surf.hpp"
 
 #include "src/kernel/activity/ActivityImpl.hpp"
 #include "surf/surf.hpp"


@@ -14,25 +14,24 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
 namespace kernel {
 namespace activity {
 

-class XBT_PUBLIC IoImpl : public ActivityImpl {
+class XBT_PUBLIC IoImpl : public ActivityImpl_T<IoImpl> {

   resource::StorageImpl* storage_ = nullptr;
   resource::StorageImpl* storage_ = nullptr;

+  resource::DiskImpl* disk_       = nullptr;

   sg_size_t size_                 = 0;
   s4u::Io::OpType type_           = s4u::Io::OpType::READ;
   sg_size_t performed_ioops_      = 0;
 
 public:
   sg_size_t size_                 = 0;
   s4u::Io::OpType type_           = s4u::Io::OpType::READ;
   sg_size_t performed_ioops_      = 0;
 
 public:

-  IoImplPtr set_name(const std::string& name);
-  IoImplPtr set_size(sg_size_t size);
-  IoImplPtr set_type(s4u::Io::OpType type);
-  IoImplPtr set_storage(resource::StorageImpl* storage);
+  IoImpl& set_size(sg_size_t size);
+  IoImpl& set_type(s4u::Io::OpType type);
+  IoImpl& set_storage(resource::StorageImpl* storage);
+  IoImpl& set_disk(resource::DiskImpl* disk);

 
   sg_size_t get_performed_ioops() { return performed_ioops_; }
 
   IoImpl* start();
   void post() override;
   void finish() override;
 
   sg_size_t get_performed_ioops() { return performed_ioops_; }
 
   IoImpl* start();
   void post() override;
   void finish() override;

-  void cancel();
-  double get_remaining();

 
   static xbt::signal<void(IoImpl const&)> on_start;
   static xbt::signal<void(IoImpl const&)> on_completion;
 
   static xbt::signal<void(IoImpl const&)> on_start;
   static xbt::signal<void(IoImpl const&)> on_completion;