-/* 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 "storage_interface.hpp"
+#include <xbt/base.h>
+
+#include "StorageImpl.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 *
class StorageN11Model : public StorageModel {
public:
- StorageN11Model();
- ~StorageN11Model();
- StoragePtr 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(){DIE_IMPOSSIBLE;}
- double shareResources(double now);
- void updateActionsState(double now, double delta);
+ StorageImpl* createStorage(const char* id, const char* type_id, const char* content_name,
+ const char* attach) override;
+ double nextOccuringEvent(double now) override;
+ void updateActionsState(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 ??
+ StorageN11(StorageModel* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite,
+ const char* type_id, char* content_name, sg_size_t size, char* attach);
+ virtual ~StorageN11() = default;
+ 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);
+ StorageAction* write(surf_file_t fd, sg_size_t size);
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*/
};
/**********
class StorageN11Action : public StorageAction {
public:
- StorageN11Action(ModelPtr model, double cost, bool failed, StoragePtr storage, e_surf_action_storage_type_t type);
+ StorageN11Action(Model* model, double cost, bool failed, StorageImpl* 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);
-
};
+}
+}
+
#endif /* STORAGE_N11_HPP_ */