X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e50d4a9de8334346d43f962316c081e0069e56b3..0445b0862c323d8285fba620d5137a0891527914:/src/surf/surf_c_bindings.cpp

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 9d364aaedb..61cc24ecb4 100644
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -287,7 +287,7 @@ xbt_dynar_t surf_workstation_model_get_route(surf_workstation_model_t /*model*/,
 }
 
 void surf_vm_workstation_model_create(const char *name, surf_resource_t ind_phys_host){
-  surf_vm_workstation_model->createResource(name, ind_phys_host);
+  surf_vm_workstation_model->createWorkstationVM(name, ind_phys_host);
 }
 
 surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_routing_edge_t src, sg_routing_edge_t dst, double size, double rate){
@@ -360,8 +360,8 @@ xbt_dynar_t surf_workstation_get_attached_storage_list(surf_resource_t workstati
   return get_casted_workstation(workstation)->getAttachedStorageList();
 }
 
-surf_action_t surf_workstation_open(surf_resource_t workstation, const char* mount, const char* path){
-  return get_casted_workstation(workstation)->open(mount, path);
+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){
@@ -372,10 +372,6 @@ int surf_workstation_unlink(surf_resource_t workstation, surf_file_t fd){
   return get_casted_workstation(workstation)->unlink(fd);
 }
 
-surf_action_t surf_workstation_ls(surf_resource_t workstation, const char* mount, const char *path){
-  return get_casted_workstation(workstation)->ls(mount, path);
-}
-
 size_t surf_workstation_get_size(surf_resource_t workstation, surf_file_t fd){
   return get_casted_workstation(workstation)->getSize(fd);
 }
@@ -392,14 +388,6 @@ xbt_dynar_t surf_workstation_get_info(surf_resource_t resource, surf_file_t fd){
   return get_casted_workstation(resource)->getInfo(fd);
 }
 
-sg_size_t surf_workstation_get_free_size(surf_resource_t resource, const char* name){
-  return get_casted_workstation(resource)->getFreeSize(name);
-}
-
-sg_size_t surf_workstation_get_used_size(surf_resource_t resource, const char* name){
-  return get_casted_workstation(resource)->getUsedSize(name);
-}
-
 size_t surf_workstation_file_tell(surf_resource_t workstation, surf_file_t fd){
   return get_casted_workstation(workstation)->fileTell(fd);
 }
@@ -408,6 +396,10 @@ int surf_workstation_file_seek(surf_resource_t workstation, surf_file_t fd, sg_s
   return get_casted_workstation(workstation)->fileSeek(fd, offset, origin);
 }
 
+int surf_workstation_file_move(surf_resource_t workstation, surf_file_t fd, const char* fullpath){
+  return get_casted_workstation(workstation)->fileMove(fd, fullpath);
+}
+
 xbt_dynar_t surf_workstation_get_vms(surf_resource_t resource){
   return get_casted_workstation(resource)->getVms();
 }
@@ -476,12 +468,16 @@ 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;
+sg_size_t surf_storage_get_free_size(surf_resource_t resource){
+  return static_cast<StoragePtr>(surf_storage_resource_priv(resource))->getFreeSize();
+}
+
+sg_size_t surf_storage_get_used_size(surf_resource_t resource){
+  return static_cast<StoragePtr>(surf_storage_resource_priv(resource))->getUsedSize();
 }
 
-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);
+const char* surf_storage_get_host(surf_resource_t resource){
+  return static_cast<StoragePtr>(surf_storage_resource_priv(resource))->p_attach;
 }
 
 surf_action_t surf_cpu_execute(surf_resource_t cpu, double size){
@@ -524,9 +520,11 @@ void surf_action_set_priority(surf_action_t action, double priority){
   action->setPriority(priority);
 }
 
+#ifdef HAVE_TRACING
 void surf_action_set_category(surf_action_t action, const char *category){
   action->setCategory(category);
 }
+#endif
 
 void *surf_action_get_data(surf_action_t action){
   return action->getData();
@@ -561,7 +559,3 @@ double surf_network_action_get_latency_limited(surf_action_t action) {
 surf_file_t surf_storage_action_get_file(surf_action_t action){
   return static_cast<StorageActionPtr>(action)->p_file;
 }
-
-xbt_dict_t surf_storage_action_get_ls_dict(surf_action_t action){
-  return static_cast<StorageActionPtr>(action)->p_lsDict;
-}