#include "xbt/misc.h"
#include "xbt/config.h"
#include "src/internal_config.h"
-#include "surf/surf_routing.h"
#include "surf/datatypes.h"
-#include "xbt/lib.h"
-#include "surf/surf_routing.h"
#include "simgrid/datatypes.h"
#include "simgrid/forward.h"
typedef simgrid::surf::Cpu surf_Cpu;
typedef simgrid::surf::HostModel surf_HostModel;
typedef simgrid::surf::NetworkModel surf_NetworkModel;
-typedef simgrid::surf::Storage surf_Storage;
+typedef simgrid::surf::StorageImpl surf_Storage;
typedef simgrid::surf::StorageModel surf_StorageModel;
typedef simgrid::surf::Resource surf_Resource;
typedef simgrid::surf::HostImpl surf_Host;
typedef struct surf_Cpu surf_Cpu;
typedef struct surf_HostModel surf_HostModel;
typedef struct surf_NetworkModel surf_NetworkModel;
-typedef struct surf_Storage surf_Storage;
+typedef struct surf_StorageImpl surf_Storage;
typedef struct surf_StorageModel surf_StorageModel;
typedef struct surf_Resource surf_Resource;
typedef struct surf_Host surf_Host;
typedef surf_StorageModel *surf_storage_model_t;
typedef surf_Storage* surf_storage_t;
-typedef xbt_dictelm_t surf_resource_t;
-
/** @ingroup SURF_c_bindings
* \brief Action structure
*
/* Generic model object */
/***************************/
-static inline surf_storage_t surf_storage_resource_priv(const void* storage)
-{
- return (surf_storage_t)xbt_lib_get_level((xbt_dictelm_t)storage, SURF_STORAGE_LEVEL);
-}
-
-static inline void *surf_storage_resource_by_name(const char *name){
- return xbt_lib_get_elm_or_null(storage_lib, name);
-}
-
/** @{ @ingroup SURF_c_bindings */
/**
* @param resource The surf storage
* @return The size in bytes of the storage
*/
-XBT_PUBLIC(sg_size_t) surf_storage_get_size(surf_resource_t resource);
+XBT_PUBLIC(sg_size_t) surf_storage_get_size(surf_storage_t resource);
/**
* @brief Get the available size in bytes of a storage
* @param resource The surf storage
* @return The available size in bytes of the storage
*/
-XBT_PUBLIC(sg_size_t) surf_storage_get_free_size(surf_resource_t resource);
+XBT_PUBLIC(sg_size_t) surf_storage_get_free_size(surf_storage_t resource);
/**
* @brief Get the size in bytes of a storage
* @param resource The surf storage
* @return The used size in bytes of the storage
*/
-XBT_PUBLIC(sg_size_t) surf_storage_get_used_size(surf_resource_t resource);
+XBT_PUBLIC(sg_size_t) surf_storage_get_used_size(surf_storage_t resource);
/** @brief return the properties set associated to that storage */
-XBT_PUBLIC(xbt_dict_t) surf_storage_get_properties(surf_resource_t resource);
+XBT_PUBLIC(xbt_dict_t) surf_storage_get_properties(surf_storage_t resource);
/**
* @brief [brief description]
* @return The host name
* may not exist.
*/
-XBT_PUBLIC(const char * ) surf_storage_get_host(surf_resource_t resource);
+XBT_PUBLIC(const char*) surf_storage_get_host(surf_storage_t resource);
+XBT_PUBLIC(const char*) surf_storage_get_name(surf_storage_t resource);
/** @} */