SIMIX_io_finish becomes IoImp::finish

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

diff --git a/src/kernel/activity/IoImpl.hpp b/src/kernel/activity/IoImpl.hpp
index 59ec127..f7f2217 100644 (file)
--- a/src/kernel/activity/IoImpl.hpp
+++ b/src/kernel/activity/IoImpl.hpp
@@ -1,4 +1,4 @@
-/* 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. */
@@ -8,6 +8,7 @@
 
 #include "src/kernel/activity/ActivityImpl.hpp"
 #include "surf/surf.hpp"
+#include <simgrid/s4u/Io.hpp>
 
 namespace simgrid {
 namespace kernel {
@@ -16,19 +17,18 @@ namespace activity {
 class XBT_PUBLIC IoImpl : public ActivityImpl {
 public:
   ~IoImpl() override;
-  explicit IoImpl(std::string name, resource::Action* surf_action, s4u::Storage* storage);
+  explicit IoImpl(std::string name, surf::StorageImpl* storage);
 
-  void suspend() override;
-  void resume() override;
+  IoImpl* start(sg_size_t size, simgrid::s4u::Io::OpType type);
   void post() override;
+  void finish();
   void cancel();
   double get_remaining();
   sg_size_t get_performed_ioops() { return performed_ioops_; }
 
-  s4u::Storage* storage_                          = nullptr;
-  simgrid::kernel::resource::Action* surf_action_ = nullptr;
+  surf::StorageImpl* storage_                     = 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_start;
   static simgrid::xbt::signal<void(kernel::activity::IoImplPtr)> on_completion;
 };
 }