X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d44e911ae45609418de22c72114e85c4e031fcf4..ede7d4e0f2464d8646f1d1a3b09fa7f678660ade:/src/surf/storage_n11.hpp

diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp
index 93f4f3a636..e27a296b58 100644
--- a/src/surf/storage_n11.hpp
+++ b/src/surf/storage_n11.hpp
@@ -1,33 +1,26 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. 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 <xbt/base.h>
+
 #include "storage_interface.hpp"
 
 #ifndef STORAGE_N11_HPP_
 #define STORAGE_N11_HPP_
 
+namespace simgrid {
+namespace surf {
+
 /***********
  * 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 *
@@ -37,10 +30,11 @@ 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);
+  Storage *createStorage(const char* id, const char* type_id,
+       const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach);
+  void addTraces() override {DIE_IMPOSSIBLE;}
+  double next_occuring_event(double now) override;
+  void updateActionsState(double now, double delta) override;
 };
 
 /************
@@ -49,15 +43,15 @@ public:
 
 class StorageN11 : public Storage {
 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 ??
+  StorageN11(StorageModel *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);
+
+  StorageAction *open(const char* mount, const char* path);
+  StorageAction *close(surf_file_t fd);
+  StorageAction *ls(const char *path);
+  StorageAction *read(surf_file_t fd, sg_size_t size);//FIXME:why we have a useless param  *??
+  StorageAction *write(surf_file_t fd, sg_size_t size);//FIXME:why we have a useless param  *??
   void rename(const char *src, const char *dest);
 
   lmm_constraint_t p_constraintWrite;    /* Constraint for maximum write bandwidth*/
@@ -70,12 +64,10 @@ 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);
+  StorageN11Action(Model *model, double cost, bool failed, Storage *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);
@@ -83,4 +75,7 @@ public:
 
 };
 
+}
+}
+
 #endif /* STORAGE_N11_HPP_ */