-/* Copyright (c) 2006-2015, 2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-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. */
#ifndef INCLUDE_SIMGRID_S4U_STORAGE_HPP_
#define INCLUDE_SIMGRID_S4U_STORAGE_HPP_
-#include "xbt/Extendable.hpp"
+#include <simgrid/forward.h>
+#include <simgrid/s4u/Io.hpp>
+#include <xbt/Extendable.hpp>
+#include <xbt/base.h>
+#include <xbt/signal.hpp>
+
#include <map>
-#include <simgrid/s4u/forward.hpp>
-#include <simgrid/simix.h>
#include <string>
#include <unordered_map>
-#include <xbt/base.h>
namespace simgrid {
-namespace xbt {
-extern template class XBT_PUBLIC() Extendable<simgrid::s4u::Storage>;
-}
namespace s4u {
-XBT_ATTRIB_PUBLIC std::map<std::string, Storage*>* allStorages();
+/** Storage represent the disk resources, usually associated to a given host
+ *
+ * By default, SimGrid does not keep track of the actual data being written but
+ * only computes the time taken by the corresponding data movement.
+ */
-XBT_PUBLIC_CLASS Storage : public simgrid::xbt::Extendable<Storage>
-{
- friend s4u::Engine;
- friend simgrid::surf::StorageImpl;
+class XBT_PUBLIC Storage : public xbt::Extendable<Storage> {
+ friend Engine;
+ friend Io;
+ friend kernel::resource::StorageImpl;
public:
- explicit Storage(surf::StorageImpl * pimpl) : pimpl_(pimpl) {}
+ explicit Storage(const std::string& name, kernel::resource::StorageImpl* pimpl);
+
+protected:
virtual ~Storage() = default;
+public:
+ /** @brief Callback signal fired when a new Storage is created */
+ static xbt::signal<void(Storage&)> on_creation;
+ /** @brief Callback signal fired when a Storage is destroyed */
+ static xbt::signal<void(Storage const&)> on_destruction;
+ /** @brief Callback signal fired when a Storage's state changes */
+ static xbt::signal<void(Storage const&)> on_state_change;
+
/** Retrieve a Storage by its name. It must exist in the platform file */
- static Storage* byName(std::string name);
+ static Storage* by_name(const std::string& name);
+ static Storage* by_name_or_null(const std::string& name);
+
/** @brief Retrieves the name of that storage as a C++ string */
- std::string const& getName() const;
+ std::string const& get_name() const { return name_; }
/** @brief Retrieves the name of that storage as a C string */
- const char* getCname() const;
- const char* getType();
- Host* getHost();
- sg_size_t getSize(); /** Retrieve the total amount of space of this storage element */
- sg_size_t getSizeFree();
- sg_size_t getSizeUsed();
- void decrUsedSize(sg_size_t size);
- void incrUsedSize(sg_size_t size);
-
- std::map<std::string, std::string>* getProperties();
- const char* getProperty(std::string key);
- void setProperty(std::string, std::string value);
- std::map<std::string, sg_size_t>* getContent();
-
- void setUserdata(void* data) { userdata_ = data; }
- void* getUserdata() { return userdata_; }
+ const char* get_cname() const { return name_.c_str(); }
- sg_size_t read(sg_size_t size);
- sg_size_t write(sg_size_t size);
- surf::StorageImpl* getImpl() { return pimpl_; }
+ const char* get_type();
+ Host* get_host() { return attached_to_; };
+ void set_host(Host* host) { attached_to_ = host; }
- /* The signals */
- /** @brief Callback signal fired when a new Link is created */
- static simgrid::xbt::signal<void(s4u::Storage&)> onCreation;
+ const std::unordered_map<std::string, std::string>* get_properties() const;
+ const char* get_property(const std::string& key) const;
+ void set_property(const std::string&, const std::string& value);
- /** @brief Callback signal fired when a Link is destroyed */
- static simgrid::xbt::signal<void(s4u::Storage&)> onDestruction;
+ IoPtr io_init(sg_size_t size, s4u::Io::OpType type);
- Host* attached_to_ = nullptr;
+ IoPtr read_async(sg_size_t size);
+ sg_size_t read(sg_size_t size);
+
+ IoPtr write_async(sg_size_t size);
+ sg_size_t write(sg_size_t size);
+ kernel::resource::StorageImpl* get_impl() const { return pimpl_; }
private:
- surf::StorageImpl* const pimpl_ = nullptr;
+ Host* attached_to_ = nullptr;
+ kernel::resource::StorageImpl* const pimpl_;
std::string name_;
- void* userdata_ = nullptr;
};
-} /* namespace s4u */
-} /* namespace simgrid */
+} // namespace s4u
+} // namespace simgrid
#endif /* INCLUDE_SIMGRID_S4U_STORAGE_HPP_ */