}
/* update state of model_obj according to new value. Does not touch lmm.
It will be modified if needed when updating actions */
- XBT_DEBUG("Calling update_resource_state for resource %s with min %lf",
+ XBT_DEBUG("Calling update_resource_state for resource %s with min %f",
resource->getName(), surf_min);
resource->updateState(event, value, next_event_date);
}
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){
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){
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);
}
static_cast<CpuActionPtr>(action)->setBound(bound);
}
+#ifdef HAVE_LATENCY_BOUND_TRACKING
double surf_network_action_get_latency_limited(surf_action_t action) {
return static_cast<NetworkActionPtr>(action)->getLatencyLimited();
}
+#endif
surf_file_t surf_storage_action_get_file(surf_action_t action){
return static_cast<StorageActionPtr>(action)->p_file;