X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..00ae4a50c96340ea9a1f097f4b26dc57b122a86e:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 1bcc47f1d9..20931bc48a 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -278,9 +278,12 @@ surf_action_t surf_workstation_model_communicate(surf_workstation_model_t model, return model->communicate(get_casted_workstation(src), get_casted_workstation(dst), size, rate); } -xbt_dynar_t surf_workstation_model_get_route(surf_workstation_model_t model, - surf_resource_t src, surf_resource_t dst){ - return model->getRoute(get_casted_workstation(src), get_casted_workstation(dst)); +xbt_dynar_t surf_workstation_model_get_route(surf_workstation_model_t /*model*/, + surf_resource_t src, surf_resource_t dst){ + xbt_dynar_t route = NULL; + routing_platf->getRouteAndLatency(get_casted_workstation(src)->p_netElm, + get_casted_workstation(dst)->p_netElm, &route, NULL); + return route; } void surf_vm_workstation_model_create(const char *name, surf_resource_t ind_phys_host){ @@ -349,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){ @@ -365,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); } @@ -385,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); } @@ -401,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(); } @@ -469,8 +468,16 @@ sg_size_t surf_storage_get_size(surf_resource_t resource){ return static_cast(surf_storage_resource_priv(resource))->getSize(); } -void surf_storage_rename(surf_resource_t resource, const char* src, const char* dest){ - static_cast(surf_storage_resource_priv(resource))->rename(src, dest); +sg_size_t surf_storage_get_free_size(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->getFreeSize(); +} + +sg_size_t surf_storage_get_used_size(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->getUsedSize(); +} + +const char* surf_storage_get_host(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->p_attach; } surf_action_t surf_cpu_execute(surf_resource_t cpu, double size){