Python: Add Comm.wait_any

[simgrid.git] / src / surf / storage_n11.hpp

diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp
index 93f4f3a..4d4f67c 100644 (file)
--- a/src/surf/storage_n11.hpp
+++ b/src/surf/storage_n11.hpp
@@ -1,33 +1,26 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-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. */
 
-#include "storage_interface.hpp"
+#include <xbt/base.h>
+
+#include "StorageImpl.hpp"
 
 #ifndef STORAGE_N11_HPP_
 #define STORAGE_N11_HPP_
 
+namespace simgrid {
+namespace kernel {
+namespace resource {
+
 /***********
  * Classes *
  ***********/
 
-class StorageN11Model;
-typedef StorageN11Model *StorageN11ModelPtr;
-
-class StorageN11;
-typedef StorageN11 *StorageN11Ptr;
-
-class StorageN11;
-typedef StorageN11 *StorageN11Ptr;
-
-class StorageN11Action;
-typedef StorageN11Action *StorageN11ActionPtr;
-
-class StorageN11Action;
-typedef StorageN11Action *StorageN11ActionPtr;
-
+class XBT_PRIVATE StorageN11Model;
+class XBT_PRIVATE StorageN11;
+class XBT_PRIVATE StorageN11Action;
 
 /*********
  * Model *
@@ -36,32 +29,25 @@ typedef StorageN11Action *StorageN11ActionPtr;
 class StorageN11Model : public StorageModel {
 public:
   StorageN11Model();
-  ~StorageN11Model();
-  StoragePtr createResource(const char* id, const char* type_id,
-                  const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach);
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
+  StorageImpl* createStorage(const std::string& id, const std::string& type_id, const std::string& content_name,
+                             const std::string& attach) override;
+  double next_occuring_event(double now) override;
+  void update_actions_state(double now, double delta) override;
 };
 
 /************
  * Resource *
  ************/
 
-class StorageN11 : public Storage {
+class StorageN11 : public StorageImpl {
 public:
-  StorageN11(StorageModelPtr model, const char* name, xbt_dict_t properties,
-                    lmm_system_t maxminSystem, double bread, double bwrite, double bconnection,
-                    const char* type_id, char *content_name, char *content_type, sg_size_t size, char *attach);
-
-  StorageActionPtr open(const char* mount, const char* path);
-  StorageActionPtr close(surf_file_t fd);
-  StorageActionPtr ls(const char *path);
-  StorageActionPtr read(surf_file_t fd, sg_size_t size);//FIXME:why we have a useless param ptr ??
-  StorageActionPtr write(surf_file_t fd, sg_size_t size);//FIXME:why we have a useless param ptr ??
-  void rename(const char *src, const char *dest);
-
-  lmm_constraint_t p_constraintWrite;    /* Constraint for maximum write bandwidth*/
-  lmm_constraint_t p_constraintRead;     /* Constraint for maximum write bandwidth*/
+  StorageN11(StorageModel* model, const std::string& name, kernel::lmm::System* maxminSystem, double bread,
+             double bwrite, const std::string& type_id, const std::string& content_name, sg_size_t size,
+             const std::string& attach);
+  virtual ~StorageN11() = default;
+  StorageAction* io_start(sg_size_t size, s4u::Io::OpType type);
+  StorageAction* read(sg_size_t size);
+  StorageAction* write(sg_size_t size);
 };
 
 /**********
@@ -70,17 +56,16 @@ public:
 
 class StorageN11Action : public StorageAction {
 public:
-       StorageN11Action() {}; //FIXME:REMOVE
-  StorageN11Action(ModelPtr model, double cost, bool failed, StoragePtr storage, e_surf_action_storage_type_t type);
-  void suspend();
-  int unref();
-  void cancel();
-  //FIXME:??void recycle();
-  void resume();
-  bool isSuspended();
-  void setMaxDuration(double duration);
-  void setPriority(double priority);
-
+  StorageN11Action(Model* model, double cost, bool failed, StorageImpl* storage, s4u::Io::OpType type);
+  void suspend() override;
+  void cancel() override;
+  void resume() override;
+  void set_max_duration(double duration) override;
+  void set_priority(double priority) override;
+  void update_remains_lazy(double now) override;
 };
 
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
 #endif /* STORAGE_N11_HPP_ */