X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4871b54f42ce85370d6acdbcb7e42bf75a63b389..0445b0862c323d8285fba620d5137a0891527914:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index bd1e7fa7fe..61cc24ecb4 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -1,9 +1,16 @@ +/* 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" #include "network_interface.hpp" #include "surf_routing_cluster.hpp" #include "instr/instr_private.h" +#include "plugins/energy.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); @@ -12,19 +19,19 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); *********/ static CpuPtr get_casted_cpu(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_cpu_resource_priv(resource))); + return static_cast(surf_cpu_resource_priv(resource)); } static WorkstationPtr get_casted_workstation(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_workstation_resource_priv(resource))); + return static_cast(surf_workstation_resource_priv(resource)); } static WorkstationVMPtr get_casted_vm_workstation(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_workstation_resource_priv(resource))); + return static_cast(surf_workstation_resource_priv(resource)); } char *surf_routing_edge_name(sg_routing_edge_t edge){ - return edge->p_name; + return edge->getName(); } #ifdef CONTEXT_THREADS @@ -67,11 +74,11 @@ static void surf_share_resources(surf_model_t model) { double next_action_end = -1.0; int i = __sync_fetch_and_add(&surf_min_index, 1); - if (strcmp(model->m_name.c_str(), "network NS3")) { - XBT_DEBUG("Running for Resource [%s]", model->m_name.c_str()); + if (strcmp(model->getName(), "network NS3")) { + XBT_DEBUG("Running for Resource [%s]", model->getName()); next_action_end = model->shareResources(NOW); XBT_DEBUG("Resource [%s] : next action end = %f", - model->m_name.c_str(), next_action_end); + model->getName(), next_action_end); } surf_mins[i] = next_action_end; } @@ -128,7 +135,7 @@ double surf_solve(double max_date) next_event_date = tmgr_history_next_date(history); - if(!strcmp(surf_network_model->m_name.c_str(), "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{ @@ -156,7 +163,7 @@ double surf_solve(double max_date) tmgr_history_get_next_event_leq(history, next_event_date, &value, (void **) &resource))) { - if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->m_name)) { + if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->getName())) { surf_min = next_event_date - NOW; XBT_DEBUG ("This event will modify model state. Next event set to %f", @@ -164,8 +171,8 @@ 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", - resource->m_name, surf_min); + XBT_DEBUG("Calling update_resource_state for resource %s with min %f", + resource->getName(), surf_min); resource->updateState(event, value, next_event_date); } } while (1); @@ -194,11 +201,6 @@ double surf_solve(double max_date) return surf_min; } -XBT_INLINE double surf_get_clock(void) -{ - return NOW; -} - void routing_get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst, xbt_dynar_t * route, double *latency){ routing_platf->getRouteAndLatency(src, dst, route, latency); @@ -212,7 +214,7 @@ surf_model_t surf_resource_model(const void *host, int level) { /* If level is SURF_WKS_LEVEL, ws is a workstation_CLM03 object. It has * surf_resource at the generic_resource field. */ ResourcePtr ws = static_cast(xbt_lib_get_level((xbt_dictelm_t) host, level)); - return ws->p_model; + return ws->getModel(); } void *surf_as_cluster_get_backbone(AS_t as){ @@ -220,27 +222,47 @@ void *surf_as_cluster_get_backbone(AS_t as){ } void surf_as_cluster_set_backbone(AS_t as, void* backbone){ - static_cast(as)->p_backbone = dynamic_cast(static_cast(backbone)); + static_cast(as)->p_backbone = static_cast(backbone); } const char *surf_model_name(surf_model_t model){ - return model->m_name.c_str(); + return model->getName(); +} + +surf_action_t surf_model_extract_done_action_set(surf_model_t model){ + if (model->getDoneActionSet()->empty()) + return NULL; + surf_action_t res = &model->getDoneActionSet()->front(); + model->getDoneActionSet()->pop_front(); + return res; } -xbt_swag_t surf_model_done_action_set(surf_model_t model){ - return model->p_doneActionSet; +surf_action_t surf_model_extract_failed_action_set(surf_model_t model){ + if (model->getFailedActionSet()->empty()) + return NULL; + surf_action_t res = &model->getFailedActionSet()->front(); + model->getFailedActionSet()->pop_front(); + return res; } -xbt_swag_t surf_model_failed_action_set(surf_model_t model){ - return model->p_failedActionSet; +surf_action_t surf_model_extract_ready_action_set(surf_model_t model){ + if (model->getReadyActionSet()->empty()) + return NULL; + surf_action_t res = &model->getReadyActionSet()->front(); + model->getReadyActionSet()->pop_front(); + return res; } -xbt_swag_t surf_model_ready_action_set(surf_model_t model){ - return model->p_readyActionSet; +surf_action_t surf_model_extract_running_action_set(surf_model_t model){ + if (model->getRunningActionSet()->empty()) + return NULL; + surf_action_t res = &model->getRunningActionSet()->front(); + model->getRunningActionSet()->pop_front(); + return res; } -xbt_swag_t surf_model_running_action_set(surf_model_t model){ - return model->p_runningActionSet; +int surf_model_running_action_set_size(surf_model_t model){ + return model->getRunningActionSet()->size(); } surf_action_t surf_workstation_model_execute_parallel_task(surf_workstation_model_t model, @@ -256,13 +278,16 @@ 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){ - 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){ @@ -270,7 +295,7 @@ surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_rout } const char *surf_resource_name(surf_cpp_resource_t resource){ - return resource->m_name; + return resource->getName(); } xbt_dict_t surf_resource_get_properties(surf_cpp_resource_t resource){ @@ -322,15 +347,21 @@ void surf_workstation_set_power_peak_at(surf_resource_t resource, int pstate_ind } double surf_workstation_get_consumed_energy(surf_resource_t resource){ - return get_casted_workstation(resource)->getConsumedEnergy(); + xbt_assert(surf_energy!=NULL, "The Energy plugin is not active."); + std::map::iterator cpuIt = surf_energy->find(get_casted_workstation(resource)->p_cpu); + 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){ @@ -341,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); } @@ -361,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); } @@ -377,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(); } @@ -422,31 +445,39 @@ void surf_vm_workstation_set_bound(surf_resource_t resource, double bound){ } void surf_vm_workstation_set_affinity(surf_resource_t resource, surf_resource_t cpu, unsigned long mask){ - return get_casted_vm_workstation(resource)->setAffinity(dynamic_cast(get_casted_cpu(cpu)), mask); + return get_casted_vm_workstation(resource)->setAffinity(get_casted_cpu(cpu), mask); } int surf_network_link_is_shared(surf_cpp_resource_t link){ - return dynamic_cast(link)->isShared(); + return static_cast(link)->isShared(); } double surf_network_link_get_bandwidth(surf_cpp_resource_t link){ - return dynamic_cast(link)->getBandwidth(); + return static_cast(link)->getBandwidth(); } double surf_network_link_get_latency(surf_cpp_resource_t link){ - return dynamic_cast(link)->getLatency(); + return static_cast(link)->getLatency(); } xbt_dict_t surf_storage_get_content(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_storage_resource_priv(resource)))->getContent(); + return static_cast(surf_storage_resource_priv(resource))->getContent(); } sg_size_t surf_storage_get_size(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_storage_resource_priv(resource)))->getSize(); + return static_cast(surf_storage_resource_priv(resource))->getSize(); +} + +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(); } -void surf_storage_rename(surf_resource_t resource, const char* src, const char* dest){ - dynamic_cast(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){ @@ -458,11 +489,11 @@ surf_action_t surf_cpu_sleep(surf_resource_t cpu, double duration){ } double surf_action_get_start_time(surf_action_t action){ - return action->m_start; + return action->getStartTime(); } double surf_action_get_finish_time(surf_action_t action){ - return action->m_finish; + return action->getFinishTime(); } double surf_action_get_remains(surf_action_t action){ @@ -489,40 +520,42 @@ 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->p_data; + return action->getData(); } void surf_action_set_data(surf_action_t action, void *data){ - action->p_data = data; + action->setData(data); } 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){ - return action->m_cost; +double surf_action_get_cost(surf_action_t action){ + return action->getCost(); } void surf_cpu_action_set_affinity(surf_action_t action, surf_resource_t cpu, unsigned long mask) { - dynamic_cast(action)->setAffinity(get_casted_cpu(cpu), mask); + static_cast(action)->setAffinity(get_casted_cpu(cpu), mask); } void surf_cpu_action_set_bound(surf_action_t action, double bound) { - dynamic_cast(action)->setBound(bound); + static_cast(action)->setBound(bound); } -surf_file_t surf_storage_action_get_file(surf_action_t action){ - return dynamic_cast(action)->p_file; +#ifdef HAVE_LATENCY_BOUND_TRACKING +double surf_network_action_get_latency_limited(surf_action_t action) { + return static_cast(action)->getLatencyLimited(); } +#endif -xbt_dict_t surf_storage_action_get_ls_dict(surf_action_t action){ - return dynamic_cast(action)->p_lsDict; +surf_file_t surf_storage_action_get_file(surf_action_t action){ + return static_cast(action)->p_file; } - -