X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7b4fbf9bd362ef98af378f5f87d437a7ffa28e8..75aa2280ba3887420d77e003a62bd1a3512630f3:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index f153403530..cb638c0707 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -26,6 +26,10 @@ static WorkstationPtr get_casted_workstation(surf_resource_t resource){ return static_cast(surf_workstation_resource_priv(resource)); } +static RoutingEdgePtr get_casted_routing(surf_resource_t resource){ + return static_cast(surf_routing_resource_priv(resource)); +} + static WorkstationVMPtr get_casted_vm_workstation(surf_resource_t resource){ return static_cast(surf_workstation_resource_priv(resource)); } @@ -70,6 +74,18 @@ void surf_presolve(void) model->updateActionsState(NOW, 0.0); } +/** + * Computes when the next action executed in a + * specific model terminates; this is important, + * because we can safely skip the amount of time + * in which no model (read: not even a single one) + * changes its state; so, if for instance network, + * cpu, storage don't change (and if we assume they're + * the only models we use... simple example here :) ) + * for 2s, 1s, 3s then we can skip 1s as after this + * amount of time the new state needs to be considered. + * + */ static void surf_share_resources(surf_model_t model) { double next_action_end = -1.0; @@ -171,7 +187,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); } @@ -194,9 +210,7 @@ double surf_solve(double max_date) surf_update_actions_state(model); } -#ifdef HAVE_TRACING TRACE_paje_dump_buffer (0); -#endif return surf_min; } @@ -268,23 +282,26 @@ int surf_model_running_action_set_size(surf_model_t model){ surf_action_t surf_workstation_model_execute_parallel_task(surf_workstation_model_t model, int workstation_nb, void **workstation_list, - double *computation_amount, - double *communication_amount, + double *flops_amount, + double *bytes_amount, double rate){ - return static_cast(model->executeParallelTask(workstation_nb, workstation_list, computation_amount, communication_amount, rate)); + return static_cast(model->executeParallelTask(workstation_nb, workstation_list, flops_amount, bytes_amount, rate)); } surf_action_t surf_workstation_model_communicate(surf_workstation_model_t model, surf_resource_t src, surf_resource_t dst, double size, double rate){ 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){ - 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){ @@ -349,12 +366,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 +386,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,24 +402,30 @@ 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); } -int surf_workstation_file_seek(surf_resource_t workstation, surf_file_t fd, sg_size_t offset, int origin){ +int surf_workstation_file_seek(surf_resource_t workstation, surf_file_t fd, + sg_offset_t offset, int origin){ 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(); + xbt_dynar_t vms = get_casted_workstation(resource)->getVms(); + xbt_dynar_t vms_ = xbt_dynar_new(sizeof(smx_host_t), NULL); + unsigned int cpt; + WorkstationVMPtr vm; + xbt_dynar_foreach(vms, cpt, vm) { + smx_host_t vm_ = xbt_lib_get_elm_or_null(host_lib, vm->getName()); + xbt_dynar_push(vms_, &vm_); + } + xbt_dynar_free(&vms); + return vms_; } void surf_workstation_get_params(surf_resource_t resource, ws_params_t params){ @@ -414,7 +437,30 @@ void surf_workstation_set_params(surf_resource_t resource, ws_params_t params){ } void surf_vm_workstation_destroy(surf_resource_t resource){ - delete get_casted_vm_workstation(resource); + /* ind_phys_workstation equals to smx_host_t */ + //surf_resource_t ind_vm_workstation = xbt_lib_get_elm_or_null(host_lib, getName()); + + /* Before clearing the entries in host_lib, we have to pick up resources. */ + CpuPtr cpu = get_casted_cpu(resource); + WorkstationVMPtr vm = get_casted_vm_workstation(resource); + RoutingEdgePtr routing = get_casted_routing(resource); + char* name = xbt_dict_get_elm_key(resource); + /* We deregister objects from host_lib, without invoking the freeing callback + * of each level. + * + * Do not call xbt_lib_remove() here. It deletes all levels of the key, + * including MSG_HOST_LEVEL and others. We should unregister only what we know. + */ + xbt_lib_unset(host_lib, name, SURF_CPU_LEVEL, 0); + xbt_lib_unset(host_lib, name, ROUTING_HOST_LEVEL, 0); + xbt_lib_unset(host_lib, name, SURF_WKS_LEVEL, 0); + + /* TODO: comment out when VM storage is implemented. */ + // xbt_lib_unset(host_lib, name, SURF_STORAGE_LEVEL, 0); + + delete cpu; + delete vm; + delete routing; } void surf_vm_workstation_suspend(surf_resource_t resource){ @@ -469,8 +515,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){ @@ -541,14 +595,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; } - -xbt_dict_t surf_storage_action_get_ls_dict(surf_action_t action){ - return static_cast(action)->p_lsDict; -}