-/* Copyright (c) 2013-2015. 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 <xbt/base.h>
-#include "storage_interface.hpp"
+#include "StorageImpl.hpp"
#ifndef STORAGE_N11_HPP_
#define STORAGE_N11_HPP_
class StorageN11Model : public StorageModel {
public:
StorageN11Model();
- ~StorageN11Model();
- Storage *createStorage(const char* id, const char* type_id,
- const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach) override;
+ StorageImpl* createStorage(std::string id, std::string type_id, std::string content_name,
+ std::string attach) override;
double next_occuring_event(double now) override;
- void updateActionsState(double now, double delta) override;
+ void update_actions_state(double now, double delta) override;
};
/************
* Resource *
************/
-class StorageN11 : public Storage {
+class StorageN11 : public StorageImpl {
public:
- 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*/
- lmm_constraint_t p_constraintRead; /* Constraint for maximum write bandwidth*/
+ StorageN11(StorageModel* model, std::string name, kernel::lmm::System* maxminSystem, double bread, double bwrite,
+ std::string type_id, std::string content_name, sg_size_t size, 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);
};
/**********
class StorageN11Action : public StorageAction {
public:
- StorageN11Action(Model *model, double cost, bool failed, Storage *storage, e_surf_action_storage_type_t type);
- void suspend();
- int unref();
- void cancel();
- void resume();
- bool isSuspended();
- void setMaxDuration(double duration);
- void setPriority(double priority);
-
+ StorageN11Action(kernel::resource::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;
};
}