X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1137465cab98cdaa8b0364e533fc82d9b7b0cdc..f3677661714bf6122d678071c0bd44141417be14:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index f085ec98c0..0cefa0cb30 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2013-2014. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include "surf_interface.hpp" #include "workstation_interface.hpp" #include "vm_workstation_interface.hpp" @@ -25,7 +31,7 @@ static WorkstationVMPtr get_casted_vm_workstation(surf_resource_t resource){ } char *surf_routing_edge_name(sg_routing_edge_t edge){ - return edge->p_name; + return edge->getName(); } #ifdef CONTEXT_THREADS @@ -129,7 +135,7 @@ double surf_solve(double max_date) next_event_date = tmgr_history_next_date(history); - if(!strcmp(surf_network_model->getName(), "network NS3")){//FIXME: add surf_network_model->m_name && + if(!strcmp(surf_network_model->getName(), "network NS3")){ if(next_event_date!=-1.0 && surf_min!=-1.0) { surf_min = MIN(next_event_date - NOW, surf_min); } else{ @@ -165,7 +171,7 @@ double surf_solve(double max_date) } /* 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); } @@ -230,6 +236,7 @@ surf_action_t surf_model_extract_done_action_set(surf_model_t model){ model->getDoneActionSet()->pop_front(); return res; } + surf_action_t surf_model_extract_failed_action_set(surf_model_t model){ if (model->getFailedActionSet()->empty()) return NULL; @@ -237,6 +244,7 @@ surf_action_t surf_model_extract_failed_action_set(surf_model_t model){ model->getFailedActionSet()->pop_front(); return res; } + surf_action_t surf_model_extract_ready_action_set(surf_model_t model){ if (model->getReadyActionSet()->empty()) return NULL; @@ -244,6 +252,7 @@ surf_action_t surf_model_extract_ready_action_set(surf_model_t model){ model->getReadyActionSet()->pop_front(); return res; } + surf_action_t surf_model_extract_running_action_set(surf_model_t model){ if (model->getRunningActionSet()->empty()) return NULL; @@ -269,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){ @@ -340,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(); +} + +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* 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){ @@ -356,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,6 +404,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(); } @@ -460,8 +476,8 @@ 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); +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){ @@ -520,7 +536,7 @@ e_surf_action_state_t surf_action_get_state(surf_action_t action){ return action->getState(); } -int surf_action_get_cost(surf_action_t action){ +double surf_action_get_cost(surf_action_t action){ return action->getCost(); } @@ -532,6 +548,12 @@ void surf_cpu_action_set_bound(surf_action_t action, double bound) { static_cast(action)->setBound(bound); } +#ifdef HAVE_LATENCY_BOUND_TRACKING +double surf_network_action_get_latency_limited(surf_action_t action) { + return static_cast(action)->getLatencyLimited(); +} +#endif + surf_file_t surf_storage_action_get_file(surf_action_t action){ return static_cast(action)->p_file; } @@ -539,5 +561,3 @@ surf_file_t surf_storage_action_get_file(surf_action_t action){ xbt_dict_t surf_storage_action_get_ls_dict(surf_action_t action){ return static_cast(action)->p_lsDict; } - -