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 59ec127..cbc2f0d 100644 (file)
--- a/src/kernel/activity/IoImpl.hpp
+++ b/src/kernel/activity/IoImpl.hpp
@@ -1,38 +1,43 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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. */
 

-#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"

+#include <simgrid/s4u/Io.hpp>

 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 

-class XBT_PUBLIC IoImpl : public ActivityImpl {
+class XBT_PUBLIC IoImpl : public ActivityImpl_T<IoImpl> {
+  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:
 public:

-  ~IoImpl() override;
-  explicit IoImpl(std::string name, resource::Action* surf_action, s4u::Storage* 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);

 
 

-  void suspend() override;
-  void resume() override;
-  void post() override;
-  void cancel();
-  double get_remaining();

   sg_size_t get_performed_ioops() { return performed_ioops_; }
 
   sg_size_t get_performed_ioops() { return performed_ioops_; }
 

-  s4u::Storage* storage_                          = nullptr;
-  simgrid::kernel::resource::Action* surf_action_ = nullptr;
-  sg_size_t performed_ioops_                      = 0;
-  static simgrid::xbt::signal<void(kernel::activity::IoImplPtr)> on_creation;
-  static simgrid::xbt::signal<void(kernel::activity::IoImplPtr)> on_completion;
+  IoImpl* start();
+  void post() override;
+  void finish() override;
+
+  static xbt::signal<void(IoImpl const&)> on_start;
+  static xbt::signal<void(IoImpl const&)> on_completion;

 };
 };

-}
-}
-} // namespace simgrid::kernel::activity
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid

 
 #endif
 
 #endif