X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5232905f5b6e218cd2378c59e407d40bfcb57b18..e33b2e471987e6c6483b5d1dafc1ac5b0da2cd31:/src/surf/storage_n11.hpp diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp index 309b7c536b..17e4a8eb0c 100644 --- a/src/surf/storage_n11.hpp +++ b/src/surf/storage_n11.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2020. 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. */ @@ -29,9 +29,9 @@ class XBT_PRIVATE StorageN11Action; class StorageN11Model : public StorageModel { public: StorageN11Model(); - 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; + StorageImpl* createStorage(std::string& filename, int lineno, const std::string& id, const std::string& type_id, + const std::string& content_name, const std::string& attach) override; + double next_occurring_event(double now) override; void update_actions_state(double now, double delta) override; }; @@ -44,7 +44,7 @@ public: 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; + ~StorageN11() override = default; StorageAction* io_start(sg_size_t size, s4u::Io::OpType type) override; StorageAction* read(sg_size_t size) override; StorageAction* write(sg_size_t size) override; @@ -61,7 +61,7 @@ public: void cancel() override; void resume() override; void set_max_duration(double duration) override; - void set_priority(double priority) override; + void set_sharing_penalty(double sharing_penalty) override; void update_remains_lazy(double now) override; };