X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18d23a87c23647366cfffbc61d3f7c632301159c..5b52e25dc0e3d17cdbe0323f922d7bb4fc238af3:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index cff5c44f62..7840806932 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -1,9 +1,11 @@ -#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" +/* Copyright (c) 2013-2017. 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 "simgrid/s4u/Engine.hpp" +#include "src/instr/instr_private.h" +#include "src/plugins/vm/VirtualMachineImpl.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); @@ -11,137 +13,82 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); * TOOLS * *********/ -static CpuPtr get_casted_cpu(surf_resource_t resource){ - return dynamic_cast(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))); -} - -static WorkstationVMPtr get_casted_vm_workstation(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_workstation_resource_priv(resource))); -} - -char *surf_routing_edge_name(sg_routing_edge_t edge){ - return edge->p_name; -} - -#ifdef CONTEXT_THREADS -//FIXME:keeporremove static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ -#endif - extern double NOW; -extern double *surf_mins; /* return value of share_resources for each model */ -extern int surf_min_index; /* current index in surf_mins */ -extern double surf_min; /* duration determined by surf_solve */ -void surf_presolve(void) +void surf_presolve() { double next_event_date = -1.0; - tmgr_trace_event_t event = NULL; + tmgr_trace_iterator_t event = nullptr; double value = -1.0; - ResourcePtr resource = NULL; - ModelPtr model = NULL; - unsigned int iter; + simgrid::surf::Resource *resource = nullptr; - XBT_DEBUG - ("First Run! Let's \"purge\" events and put models in the right state"); - while ((next_event_date = tmgr_history_next_date(history)) != -1.0) { + XBT_DEBUG ("Consume all trace events occurring before the starting time."); + while ((next_event_date = future_evt_set->next_date()) != -1.0) { if (next_event_date > NOW) break; - while ((event = - tmgr_history_get_next_event_leq(history, next_event_date, - &value, - (void **) &resource))) { + + while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) { if (value >= 0){ - resource->updateState(event, value, NOW); + resource->apply_event(event, value); } } } - xbt_dynar_foreach(model_list, iter, model) - model->updateActionsState(NOW, 0.0); -} -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->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->getName(), next_action_end); - } - surf_mins[i] = next_action_end; -} - -static void surf_update_actions_state(surf_model_t model) -{ - model->updateActionsState(NOW, surf_min); + XBT_DEBUG ("Set every models in the right state by updating them to 0."); + for (auto model : *all_existing_models) + model->updateActionsState(NOW, 0.0); } double surf_solve(double max_date) { - surf_min = -1.0; /* duration */ + double time_delta = -1.0; /* duration */ double next_event_date = -1.0; double model_next_action_end = -1.0; double value = -1.0; - ResourcePtr resource = NULL; - ModelPtr model = NULL; - tmgr_trace_event_t event = NULL; - unsigned int iter; + simgrid::surf::Resource *resource = nullptr; + tmgr_trace_iterator_t event = nullptr; - if(!host_that_restart) - host_that_restart = xbt_dynar_new(sizeof(char*), NULL); + if (max_date > 0.0) { + xbt_assert(max_date > NOW,"You asked to simulate up to %f, but that's in the past already", max_date); - if (max_date != -1.0 && max_date != NOW) { - surf_min = max_date - NOW; + time_delta = max_date - NOW; } - XBT_DEBUG("Looking for next action end for all models except NS3"); - - if (surf_mins == NULL) { - surf_mins = xbt_new(double, xbt_dynar_length(model_list_invoke)); + /* Physical models MUST be resolved first */ + XBT_DEBUG("Looking for next event in physical models"); + double next_event_phy = surf_host_model->nextOccuringEvent(NOW); + if ((time_delta < 0.0 || next_event_phy < time_delta) && next_event_phy >= 0.0) { + time_delta = next_event_phy; } - surf_min_index = 0; - - /* sequential version */ - xbt_dynar_foreach(model_list_invoke, iter, model) { - surf_share_resources(static_cast(model)); - } - - unsigned i; - for (i = 0; i < xbt_dynar_length(model_list_invoke); i++) { - if ((surf_min < 0.0 || surf_mins[i] < surf_min) - && surf_mins[i] >= 0.0) { - surf_min = surf_mins[i]; - } + if (surf_vm_model != nullptr) { + XBT_DEBUG("Looking for next event in virtual models"); + double next_event_virt = surf_vm_model->nextOccuringEvent(NOW); + if ((time_delta < 0.0 || next_event_virt < time_delta) && next_event_virt >= 0.0) + time_delta = next_event_virt; } - XBT_DEBUG("Min for resources (remember that NS3 don't update that value) : %f", surf_min); + XBT_DEBUG("Min for resources (remember that NS3 don't update that value): %f", time_delta); XBT_DEBUG("Looking for next trace event"); - do { - XBT_DEBUG("Next TRACE event : %f", next_event_date); - - next_event_date = tmgr_history_next_date(history); + while (1) { // Handle next occurring events until none remains + next_event_date = future_evt_set->next_date(); + XBT_DEBUG("Next TRACE event: %f", next_event_date); - if(!strcmp(surf_network_model->getName(), "network NS3")){//FIXME: add surf_network_model->m_name && - if(next_event_date!=-1.0 && surf_min!=-1.0) { - surf_min = MIN(next_event_date - NOW, surf_min); - } else{ - surf_min = MAX(next_event_date - NOW, surf_min); + if(! surf_network_model->nextOccuringEventIsIdempotent()){ // NS3, I see you + if (next_event_date!=-1.0 && time_delta!=-1.0) { + time_delta = MIN(next_event_date - NOW, time_delta); + } else { + time_delta = MAX(next_event_date - NOW, time_delta); // Get the positive component } - XBT_DEBUG("Run for network at most %f", surf_min); + XBT_DEBUG("Run the NS3 network at most %fs", time_delta); // run until min or next flow - model_next_action_end = surf_network_model->shareResources(surf_min); + model_next_action_end = surf_network_model->nextOccuringEvent(time_delta); XBT_DEBUG("Min for network : %f", model_next_action_end); if(model_next_action_end>=0.0) - surf_min = model_next_action_end; + time_delta = model_next_action_end; } if (next_event_date < 0.0) { @@ -149,380 +96,145 @@ double surf_solve(double max_date) break; } - if ((surf_min == -1.0) || (next_event_date > NOW + surf_min)) break; - - XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", surf_min, NOW, next_event_date); - while ((event = - 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->getName())) { - surf_min = next_event_date - NOW; - XBT_DEBUG - ("This event will modify model state. Next event set to %f", - surf_min); + if ((time_delta == -1.0) || (next_event_date > NOW + time_delta)) + break; // next event occurs after the next resource change, bail out + + XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", time_delta, NOW, next_event_date); + + while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) { + if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->cname())) { + time_delta = next_event_date - NOW; + XBT_DEBUG("This event invalidates the next_occuring_event() computation of models. Next event set to %f", time_delta); } - /* update state of model_obj according to new value. Does not touch lmm. + // FIXME: I'm too lame to update NOW live, so I change it and restore it so that the real update with surf_min will work + double round_start = NOW; + NOW = next_event_date; + /* update state of the corresponding resource to the 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->getName(), surf_min); - resource->updateState(event, value, next_event_date); + XBT_DEBUG("Calling update_resource_state for resource %s", resource->cname()); + resource->apply_event(event, value); + NOW = round_start; } - } while (1); + } /* FIXME: Moved this test to here to avoid stopping simulation if there are actions running on cpus and all cpus are with availability = 0. * This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0. * The options are: all traces with same periodicity(0 or >0) or we need to change the way how the events are managed */ - if (surf_min == -1.0) { - XBT_DEBUG("No next event at all. Bail out now."); + if (time_delta < 0) { + XBT_DEBUG("No next event at all. Bail out now."); return -1.0; } - XBT_DEBUG("Duration set to %f", surf_min); + XBT_DEBUG("Duration set to %f", time_delta); - NOW = NOW + surf_min; - /* FIXME: model_list or model_list_invoke? revisit here later */ - /* sequential version */ - xbt_dynar_foreach(model_list, iter, model) { - surf_update_actions_state(model); + // Bump the time: jump into the future + NOW = NOW + time_delta; + + // Inform the models of the date change + for (auto model : *all_existing_models) { + model->updateActionsState(NOW, time_delta); } + simgrid::s4u::onTimeAdvance(time_delta); -#ifdef HAVE_TRACING TRACE_paje_dump_buffer (0); -#endif - 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); + return time_delta; } /********* * MODEL * *********/ - -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->getModel(); -} - -void *surf_as_cluster_get_backbone(AS_t as){ - return static_cast(as)->p_backbone; -} - -void surf_as_cluster_set_backbone(AS_t as, void* backbone){ - static_cast(as)->p_backbone = dynamic_cast(static_cast(backbone)); -} - -const char *surf_model_name(surf_model_t model){ - return model->getName(); -} - -xbt_swag_t surf_model_done_action_set(surf_model_t model){ - return model->getDoneActionSet(); -} - -xbt_swag_t surf_model_failed_action_set(surf_model_t model){ - return model->getFailedActionSet(); -} - -xbt_swag_t surf_model_ready_action_set(surf_model_t model){ - return model->getReadyActionSet(); -} - -xbt_swag_t surf_model_running_action_set(surf_model_t model){ - return model->getRunningActionSet(); -} - -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 rate){ - return static_cast(model->executeParallelTask(workstation_nb, workstation_list, computation_amount, communication_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)); -} - -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_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){ - return model->communicate(src, dst, size, rate); -} - -const char *surf_resource_name(surf_cpp_resource_t resource){ - return resource->getName(); -} - -xbt_dict_t surf_resource_get_properties(surf_cpp_resource_t resource){ - return resource->getProperties(); -} - -e_surf_resource_state_t surf_resource_get_state(surf_cpp_resource_t resource){ - return resource->getState(); -} - -void surf_resource_set_state(surf_cpp_resource_t resource, e_surf_resource_state_t state){ - resource->setState(state); -} - -surf_action_t surf_workstation_sleep(surf_resource_t resource, double duration){ - return get_casted_workstation(resource)->sleep(duration); -} - -double surf_workstation_get_speed(surf_resource_t resource, double load){ - return get_casted_workstation(resource)->getSpeed(load); -} - -double surf_workstation_get_available_speed(surf_resource_t resource){ - return get_casted_workstation(resource)->getAvailableSpeed(); -} - -int surf_workstation_get_core(surf_resource_t resource){ - return get_casted_workstation(resource)->getCore(); -} - -surf_action_t surf_workstation_execute(surf_resource_t resource, double size){ - return get_casted_workstation(resource)->execute(size); -} - -double surf_workstation_get_current_power_peak(surf_resource_t resource){ - return get_casted_workstation(resource)->getCurrentPowerPeak(); -} - -double surf_workstation_get_power_peak_at(surf_resource_t resource, int pstate_index){ - return get_casted_workstation(resource)->getPowerPeakAt(pstate_index); -} - -int surf_workstation_get_nb_pstates(surf_resource_t resource){ - return get_casted_workstation(resource)->getNbPstates(); -} - -void surf_workstation_set_power_peak_at(surf_resource_t resource, int pstate_index){ - return get_casted_workstation(resource)->setPowerPeakAt(pstate_index); -} - -double surf_workstation_get_consumed_energy(surf_resource_t resource){ - return get_casted_workstation(resource)->getConsumedEnergy(); -} - -xbt_dict_t surf_workstation_get_storage_list(surf_resource_t workstation){ - return get_casted_workstation(workstation)->getStorageList(); -} - -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_close(surf_resource_t workstation, surf_file_t fd){ - return get_casted_workstation(workstation)->close(fd); -} - -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); -} - -surf_action_t surf_workstation_read(surf_resource_t resource, surf_file_t fd, sg_size_t size){ - return get_casted_workstation(resource)->read(fd, size); -} - -surf_action_t surf_workstation_write(surf_resource_t resource, surf_file_t fd, sg_size_t size){ - return get_casted_workstation(resource)->write(fd, size); -} - -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){ - return get_casted_workstation(workstation)->fileSeek(fd, offset, origin); -} - -xbt_dynar_t surf_workstation_get_vms(surf_resource_t resource){ - return get_casted_workstation(resource)->getVms(); -} - -void surf_workstation_get_params(surf_resource_t resource, ws_params_t params){ - get_casted_workstation(resource)->getParams(params); -} - -void surf_workstation_set_params(surf_resource_t resource, ws_params_t params){ - get_casted_workstation(resource)->setParams(params); +static surf_action_t ActionListExtract(simgrid::surf::ActionList* list) +{ + if (list->empty()) + return nullptr; + surf_action_t res = &list->front(); + list->pop_front(); + return res; } -void surf_vm_workstation_destroy(surf_resource_t resource){ - delete get_casted_vm_workstation(resource); +surf_action_t surf_model_extract_done_action_set(surf_model_t model) +{ + return ActionListExtract(model->getDoneActionSet()); } -void surf_vm_workstation_suspend(surf_resource_t resource){ - get_casted_vm_workstation(resource)->suspend(); +surf_action_t surf_model_extract_failed_action_set(surf_model_t model){ + return ActionListExtract(model->getFailedActionSet()); } -void surf_vm_workstation_resume(surf_resource_t resource){ - get_casted_vm_workstation(resource)->resume(); +int surf_model_running_action_set_size(surf_model_t model){ + return model->getRunningActionSet()->size(); } -void surf_vm_workstation_save(surf_resource_t resource){ - get_casted_vm_workstation(resource)->save(); +surf_action_t surf_host_open(sg_host_t host, const char* fullpath){ + return host->pimpl_->open(fullpath); } -void surf_vm_workstation_restore(surf_resource_t resource){ - get_casted_vm_workstation(resource)->restore(); +surf_action_t surf_host_close(sg_host_t host, surf_file_t fd){ + return host->pimpl_->close(fd); } -void surf_vm_workstation_migrate(surf_resource_t resource, surf_resource_t ind_vm_ws_dest){ - get_casted_vm_workstation(resource)->migrate(ind_vm_ws_dest); +int surf_host_unlink(sg_host_t host, surf_file_t fd){ + return host->pimpl_->unlink(fd); } -surf_resource_t surf_vm_workstation_get_pm(surf_resource_t resource){ - return get_casted_vm_workstation(resource)->getPm(); +size_t surf_host_get_size(sg_host_t host, surf_file_t fd){ + return host->pimpl_->getSize(fd); } -void surf_vm_workstation_set_bound(surf_resource_t resource, double bound){ - return get_casted_vm_workstation(resource)->setBound(bound); +surf_action_t surf_host_read(sg_host_t host, surf_file_t fd, sg_size_t size){ + return host->pimpl_->read(fd, size); } -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); +surf_action_t surf_host_write(sg_host_t host, surf_file_t fd, sg_size_t size){ + return host->pimpl_->write(fd, size); } -int surf_network_link_is_shared(surf_cpp_resource_t link){ - return dynamic_cast(link)->isShared(); +xbt_dynar_t surf_host_get_info(sg_host_t host, surf_file_t fd){ + return host->pimpl_->getInfo(fd); } -double surf_network_link_get_bandwidth(surf_cpp_resource_t link){ - return dynamic_cast(link)->getBandwidth(); +size_t surf_host_file_tell(sg_host_t host, surf_file_t fd){ + return host->pimpl_->fileTell(fd); } -double surf_network_link_get_latency(surf_cpp_resource_t link){ - return dynamic_cast(link)->getLatency(); +int surf_host_file_seek(sg_host_t host, surf_file_t fd, + sg_offset_t offset, int origin){ + return host->pimpl_->fileSeek(fd, offset, origin); } -xbt_dict_t surf_storage_get_content(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_storage_resource_priv(resource)))->getContent(); +int surf_host_file_move(sg_host_t host, surf_file_t fd, const char* fullpath){ + return host->pimpl_->fileMove(fd, fullpath); } sg_size_t surf_storage_get_size(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_storage_resource_priv(resource)))->getSize(); -} - -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); -} - -surf_action_t surf_cpu_execute(surf_resource_t cpu, double size){ - return get_casted_cpu(cpu)->execute(size); -} - -surf_action_t surf_cpu_sleep(surf_resource_t cpu, double duration){ - return get_casted_cpu(cpu)->sleep(duration); -} - -double surf_action_get_start_time(surf_action_t action){ - return action->getStartTime(); -} - -double surf_action_get_finish_time(surf_action_t action){ - return action->getFinishTime(); + return static_cast(surf_storage_resource_priv(resource))->size_; } -double surf_action_get_remains(surf_action_t action){ - return action->getRemains(); +sg_size_t surf_storage_get_free_size(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->getFreeSize(); } -void surf_action_unref(surf_action_t action){ - action->unref(); +sg_size_t surf_storage_get_used_size(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->getUsedSize(); } -void surf_action_suspend(surf_action_t action){ - action->suspend(); +xbt_dict_t surf_storage_get_properties(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->getProperties(); } -void surf_action_resume(surf_action_t action){ - action->resume(); +const char* surf_storage_get_host(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->attach_; } -void surf_action_cancel(surf_action_t action){ - action->cancel(); -} - -void surf_action_set_priority(surf_action_t action, double priority){ - action->setPriority(priority); -} - -void surf_action_set_category(surf_action_t action, const char *category){ - action->setCategory(category); -} - -void *surf_action_get_data(surf_action_t action){ - return action->getData(); -} - -void surf_action_set_data(surf_action_t action, void *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->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); +const char* surf_storage_get_name(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->cname(); } 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; + return static_cast(action)->file_; } - -xbt_dict_t surf_storage_action_get_ls_dict(surf_action_t action){ - return dynamic_cast(action)->p_lsDict; -} - -