have getContent in the plugin too

[simgrid.git] / src / msg / msg_io.cpp

diff --git a/src/msg/msg_io.cpp b/src/msg/msg_io.cpp
index 1024125..ce8c940 100644 (file)
--- a/src/msg/msg_io.cpp
+++ b/src/msg/msg_io.cpp
@@ -361,26 +361,6 @@ const char* MSG_storage_get_name(msg_storage_t storage)
   return storage->getCname();
 }
 
-/** \ingroup msg_storage_management
- * \brief Returns the free space size of a storage element
- * \param storage a storage
- * \return the free space size of the storage element (as a #sg_size_t)
- */
-sg_size_t MSG_storage_get_free_size(msg_storage_t storage)
-{
-  return storage->getSizeFree();
-}
-
-/** \ingroup msg_storage_management
- * \brief Returns the used space size of a storage element
- * \param storage a storage
- * \return the used space size of the storage element (as a #sg_size_t)
- */
-sg_size_t MSG_storage_get_used_size(msg_storage_t storage)
-{
-  return storage->getSizeUsed();
-}
-
 /** \ingroup msg_storage_management
  * \brief Returns a xbt_dict_t consisting of the list of properties assigned to this storage
  * \param storage a storage
@@ -477,7 +457,7 @@ void *MSG_storage_get_data(msg_storage_t storage)
  */
 xbt_dict_t MSG_storage_get_content(msg_storage_t storage)
 {
-  std::map<std::string, sg_size_t>* content = storage->getContent();
+  std::map<std::string, sg_size_t>* content = storage->extension<simgrid::s4u::FileSystemStorageExt>()->getContent();
   // Note: ::operator delete is ok here (no destructor called) since the dict elements are of POD type sg_size_t.
   xbt_dict_t content_as_dict = xbt_dict_new_homogeneous(::operator delete);
 
@@ -489,17 +469,6 @@ xbt_dict_t MSG_storage_get_content(msg_storage_t storage)
   return content_as_dict;
 }
 
-/** \ingroup msg_storage_management
- *
- * \brief Returns the size of a #msg_storage_t.
- * \param storage a storage
- * \return The size of the storage
- */
-sg_size_t MSG_storage_get_size(msg_storage_t storage)
-{
-  return storage->getSize();
-}
-
 /** \ingroup msg_storage_management
  *
  * \brief Returns the host name the storage is attached to
@@ -511,4 +480,14 @@ const char* MSG_storage_get_host(msg_storage_t storage)
   xbt_assert((storage != nullptr), "Invalid parameters");
   return storage->getHost()->getCname();
 }
+
+sg_size_t MSG_storage_read(msg_storage_t storage, sg_size_t size)
+{
+  return storage->read(size);
+}
+
+sg_size_t MSG_storage_write(msg_storage_t storage, sg_size_t size)
+{
+  return storage->write(size);
+}
 }