X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4707c9458dd447b9efb70b68370616698360ce5..5f9b6053027484ea411db0d1ee44ac258c9816f1:/src/s4u/s4u_storage.cpp

diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp
index 23c7e603f3..fe8d8ffbde 100644
--- a/src/s4u/s4u_storage.cpp
+++ b/src/s4u/s4u_storage.cpp
@@ -1,75 +1,86 @@
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2018. 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 "../surf/StorageImpl.hpp"
+#include "simgrid/kernel/resource/Resource.hpp"
+#include "simgrid/plugins/file_system.h"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.hpp"
+#include "simgrid/storage.h"
+#include "src/surf/StorageImpl.hpp"
 #include <unordered_map>
 
 namespace simgrid {
+namespace xbt {
+template class Extendable<simgrid::s4u::Storage>;
+}
+
 namespace s4u {
-std::map<std::string, Storage*>* allStorages()
-{
-  std::unordered_map<std::string, surf::StorageImpl*>* map = surf::StorageImpl::storagesMap();
-  std::map<std::string, Storage*>* res                     = new std::map<std::string, Storage*>;
-  for (auto s : *map)
-    res->insert({s.first, &(s.second->piface_)}); // Convert each entry into its interface
 
-  return res;
+void XBT_ATTRIB_DEPRECATED_v322(
+    "simgrid::s4u::getStorageList() is deprecated in favor of Engine::getAllStorages(). Please switch before v3.22")
+    getStorageList(std::map<std::string, Storage*>* whereTo)
+{
+  for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages())
+    whereTo->insert({s->getName(), s});
 }
 
-Storage* Storage::byName(const char* name)
+Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
 {
-  surf::StorageImpl* res = surf::StorageImpl::byName(name);
-  if (res == nullptr)
-    return nullptr;
-  return &res->piface_;
+  simgrid::s4u::Engine::getInstance()->addStorage(name, this);
 }
 
-const char* Storage::name()
+Storage* Storage::byName(std::string name)
 {
-  return pimpl_->cname();
+  return Engine::getInstance()->storageByNameOrNull(name);
 }
 
-const char* Storage::host()
+const std::string& Storage::getName() const
 {
-  return pimpl_->attach_;
+  return name_;
 }
 
-sg_size_t Storage::sizeFree()
+const char* Storage::getCname() const
 {
-  return simgrid::simix::kernelImmediate([this] { return pimpl_->getFreeSize(); });
+  return name_.c_str();
 }
 
-sg_size_t Storage::sizeUsed()
+const char* Storage::getType()
 {
-  return simgrid::simix::kernelImmediate([this] { return pimpl_->getUsedSize(); });
+  return pimpl_->typeId_.c_str();
 }
 
-sg_size_t Storage::size() {
-  return pimpl_->size_;
+Host* Storage::getHost()
+{
+  return attached_to_;
 }
 
-xbt_dict_t Storage::properties()
+std::map<std::string, std::string>* Storage::getProperties()
 {
   return simgrid::simix::kernelImmediate([this] { return pimpl_->getProperties(); });
 }
 
-const char* Storage::property(const char* key)
+const char* Storage::getProperty(std::string key)
+{
+  return this->pimpl_->getProperty(key);
+}
+
+void Storage::setProperty(std::string key, std::string value)
 {
-  return static_cast<const char*>(xbt_dict_get_or_null(this->properties(), key));
+  simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); });
 }
 
-void Storage::setProperty(const char* key, char* value)
+sg_size_t Storage::read(sg_size_t size)
 {
-  xbt_dict_set(this->properties(), key, value, nullptr);
+  return simcall_storage_read(pimpl_, size);
 }
 
-std::map<std::string, sg_size_t*>* Storage::content()
+sg_size_t Storage::write(sg_size_t size)
 {
-  return simgrid::simix::kernelImmediate([this] { return pimpl_->getContent(); });
+  return simcall_storage_write(pimpl_, size);
 }
 
 /*************
@@ -80,3 +91,113 @@ simgrid::xbt::signal<void(s4u::Storage&)> Storage::onDestruction;
 
 } /* namespace s4u */
 } /* namespace simgrid */
+
+/* **************************** Public C interface *************************** */
+SG_BEGIN_DECL()
+/** @addtogroup sg_storage_management
+ * (#sg_storage_t) and the functions for managing it.
+ */
+
+/** \ingroup sg_storage_management
+ *
+ * \brief Returns the name of the #sg_storage_t.
+ *
+ * This functions checks whether a storage is a valid pointer or not and return its name.
+ */
+const char* sg_storage_get_name(sg_storage_t storage)
+{
+  xbt_assert((storage != nullptr), "Invalid parameters");
+  return storage->getCname();
+}
+
+const char* sg_storage_get_host(sg_storage_t storage)
+{
+  xbt_assert((storage != nullptr), "Invalid parameters");
+  return storage->getHost()->getCname();
+}
+
+/** \ingroup sg_storage_management
+ * \brief Returns a xbt_dict_t consisting of the list of properties assigned to this storage
+ * \param storage a storage
+ * \return a dict containing the properties
+ */
+xbt_dict_t sg_storage_get_properties(sg_storage_t storage)
+{
+  xbt_assert((storage != nullptr), "Invalid parameters (storage is nullptr)");
+  xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
+  std::map<std::string, std::string>* props = storage->getProperties();
+  if (props == nullptr)
+    return nullptr;
+  for (auto const& elm : *props) {
+    xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str()), nullptr);
+  }
+  return as_dict;
+}
+
+/** \ingroup sg_storage_management
+ * \brief Change the value of a given storage property
+ *
+ * \param storage a storage
+ * \param name a property name
+ * \param value what to change the property to
+ */
+void sg_storage_set_property_value(sg_storage_t storage, const char* name, char* value)
+{
+  storage->setProperty(name, value);
+}
+
+/** \ingroup sg_storage_management
+ * \brief Returns the value of a given storage property
+ *
+ * \param storage a storage
+ * \param name a property name
+ * \return value of a property (or nullptr if property not set)
+ */
+const char* sg_storage_get_property_value(sg_storage_t storage, const char* name)
+{
+  return storage->getProperty(name);
+}
+
+/** \ingroup sg_storage_management
+ * \brief Finds a sg_storage_t using its name.
+ * \param name the name of a storage
+ * \return the corresponding storage
+ */
+sg_storage_t sg_storage_get_by_name(const char* name)
+{
+  return simgrid::s4u::Storage::byName(name);
+}
+
+/** \ingroup sg_storage_management
+ * \brief Returns a dynar containing all the storage elements declared at a given point of time
+ */
+xbt_dynar_t sg_storages_as_dynar()
+{
+  std::vector<simgrid::s4u::Storage*> storage_list = simgrid::s4u::Engine::getInstance()->getAllStorages();
+  xbt_dynar_t res = xbt_dynar_new(sizeof(sg_storage_t), nullptr);
+  for (auto const& s : storage_list)
+    xbt_dynar_push(res, &s);
+  return res;
+}
+
+void* sg_storage_get_data(sg_storage_t storage)
+{
+  xbt_assert((storage != nullptr), "Invalid parameters");
+  return storage->getUserdata();
+}
+
+void sg_storage_set_data(sg_storage_t storage, void* data)
+{
+  storage->setUserdata(data);
+}
+
+sg_size_t sg_storage_read(sg_storage_t storage, sg_size_t size)
+{
+  return storage->read(size);
+}
+
+sg_size_t sg_storage_write(sg_storage_t storage, sg_size_t size)
+{
+  return storage->write(size);
+}
+SG_END_DECL()