Merge branch 'mc++'

[simgrid.git] / src / surf / surf_c_bindings.cpp

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 8623f96..c432691 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -352,12 +352,16 @@ double surf_workstation_get_consumed_energy(surf_resource_t resource){
   return cpuIt->second->getConsumedEnergy();
 }
 
-xbt_dict_t surf_workstation_get_storage_list(surf_resource_t workstation){
-  return get_casted_workstation(workstation)->getStorageList();
+xbt_dict_t surf_workstation_get_mounted_storage_list(surf_resource_t workstation){
+  return get_casted_workstation(workstation)->getMountedStorageList();
 }
 
-surf_action_t surf_workstation_open(surf_resource_t workstation, const char* mount, const char* path){
-  return get_casted_workstation(workstation)->open(mount, path);
+xbt_dynar_t surf_workstation_get_attached_storage_list(surf_resource_t workstation){
+  return get_casted_workstation(workstation)->getAttachedStorageList();
+}
+
+surf_action_t surf_workstation_open(surf_resource_t workstation, const char* fullpath){
+  return get_casted_workstation(workstation)->open(fullpath);
 }
 
 surf_action_t surf_workstation_close(surf_resource_t workstation, surf_file_t fd){
@@ -472,6 +476,10 @@ sg_size_t surf_storage_get_size(surf_resource_t resource){
   return static_cast<StoragePtr>(surf_storage_resource_priv(resource))->getSize();
 }
 
+const char* surf_storage_get_host(surf_resource_t resource){
+  return static_cast<StoragePtr>(surf_storage_resource_priv(resource))->p_attach;
+}
+
 void surf_storage_rename(surf_resource_t resource, const char* src, const char* dest){
   static_cast<StoragePtr>(surf_storage_resource_priv(resource))->rename(src, dest);
 }