X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6badbbf58554a35b03f58509b0b18cf606c38f5e..90a471de6cd70b41223dd16a09fafe6ac3e18269:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 372bedc777..561b457718 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -4,10 +4,9 @@ /* 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 "host_interface.hpp" +#include "src/surf/HostImpl.hpp" #include "surf_interface.hpp" #include "network_interface.hpp" -#include "surf_routing_cluster.hpp" #include "src/instr/instr_private.h" #include "plugins/energy.hpp" #include "virtual_machine.hpp" @@ -18,98 +17,90 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); * TOOLS * *********/ -static simgrid::surf::Host *get_casted_host(sg_host_t host){ - return static_cast(surf_host_resource_priv(host)); +static simgrid::surf::HostImpl *get_casted_host(sg_host_t host){ //FIXME: killme + return host->extension(); } static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){ - return static_cast(surf_host_resource_priv(host)); + return static_cast(host->extension()); } extern double NOW; -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; - simgrid::surf::Resource *resource = NULL; - simgrid::surf::Model *model = NULL; - unsigned int iter; + simgrid::surf::Resource *resource = nullptr; XBT_DEBUG ("Consume all trace events occurring before the starting time."); - while ((next_event_date = tmgr_history_next_date(history)) != -1.0) { + 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_DEBUG ("Set every models in the right state by updating them to 0."); - xbt_dynar_foreach(all_existing_models, iter, model) + for (auto model : *all_existing_models) model->updateActionsState(NOW, 0.0); } double surf_solve(double max_date) { - double 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; - simgrid::surf::Resource *resource = NULL; - simgrid::surf::Model *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; } /* Physical models MUST be resolved first */ XBT_DEBUG("Looking for next event in physical models"); - double next_event_phy = surf_host_model->shareResources(NOW); - if ((surf_min < 0.0 || next_event_phy < surf_min) && next_event_phy >= 0.0) { - surf_min = next_event_phy; + double next_event_phy = surf_host_model->next_occuring_event(NOW); + if ((time_delta < 0.0 || next_event_phy < time_delta) && next_event_phy >= 0.0) { + time_delta = next_event_phy; } - if (surf_vm_model != NULL) { - XBT_DEBUG("Looking for next event in virtual models"); - double next_event_virt = surf_vm_model->shareResources(NOW); - if ((surf_min < 0.0 || next_event_virt < surf_min) && next_event_virt >= 0.0) - surf_min = next_event_virt; + if (surf_vm_model != nullptr) { + XBT_DEBUG("Looking for next event in virtual models"); + double next_event_virt = surf_vm_model->next_occuring_event(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(! surf_network_model->shareResourcesIsIdempotent()){ // NS3, I see you - 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->next_occuring_event_isIdempotent()){ // 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->next_occuring_event(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) { @@ -117,68 +108,57 @@ double surf_solve(double max_date) break; } - if ((surf_min == -1.0) || (next_event_date > NOW + surf_min)) break; + 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); - 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))) { + while ((event = future_evt_set->pop_leq(next_event_date, &value, &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); + 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 %f", - resource->getName(), surf_min); - resource->updateState(event, value, next_event_date); + XBT_DEBUG("Calling update_resource_state for resource %s", resource->getName()); + 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 == -1.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); + + // Bump the time: jump into the future + NOW = NOW + time_delta; - NOW = NOW + surf_min; - /* FIXME: model_list or model_list_invoke? revisit here later */ - /* sequential version */ - xbt_dynar_foreach(all_existing_models, iter, model) { - model->updateActionsState(NOW, surf_min); + // Inform the models of the date change + for (auto model : *all_existing_models) { + model->updateActionsState(NOW, time_delta); } TRACE_paje_dump_buffer (0); - return surf_min; -} - -void routing_get_route_and_latency(sg_netcard_t src, sg_netcard_t dst, - xbt_dynar_t * route, double *latency){ - routing_platf->getRouteAndLatency(src, dst, route, latency); + return time_delta; } /********* * MODEL * *********/ -surf_host_model_t surf_host_get_model(sg_host_t host) -{ - simgrid::surf::Host* surf_host = - (simgrid::surf::Host*) host->extension(); - return (surf_host_model_t) surf_host->getModel(); -} - surf_action_t surf_model_extract_done_action_set(surf_model_t model){ if (model->getDoneActionSet()->empty()) - return NULL; + return nullptr; surf_action_t res = &model->getDoneActionSet()->front(); model->getDoneActionSet()->pop_front(); return res; @@ -186,137 +166,26 @@ surf_action_t surf_model_extract_done_action_set(surf_model_t model){ surf_action_t surf_model_extract_failed_action_set(surf_model_t model){ if (model->getFailedActionSet()->empty()) - return NULL; + return nullptr; surf_action_t res = &model->getFailedActionSet()->front(); 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; - surf_action_t res = &model->getReadyActionSet()->front(); - 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; - surf_action_t res = &model->getRunningActionSet()->front(); - model->getRunningActionSet()->pop_front(); - return res; -} - int surf_model_running_action_set_size(surf_model_t model){ return model->getRunningActionSet()->size(); } -surf_action_t surf_host_model_execute_parallel_task(surf_host_model_t model, - int host_nb, - sg_host_t *host_list, - double *flops_amount, - double *bytes_amount, - double rate){ - return static_cast( - model->executeParallelTask(host_nb, host_list, flops_amount, bytes_amount, rate)); -} - -xbt_dynar_t surf_host_model_get_route(surf_host_model_t /*model*/, - sg_host_t src, sg_host_t dst){ - xbt_dynar_t route = NULL; - routing_platf->getRouteAndLatency( - get_casted_host(src)->p_netElm, - get_casted_host(dst)->p_netElm, &route, NULL); - return route; -} - void surf_vm_model_create(const char *name, sg_host_t ind_phys_host){ surf_vm_model->createVM(name, ind_phys_host); } surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_host_t src, sg_host_t dst, double size, double rate){ - return model->communicate(src->p_netcard, dst->p_netcard, size, rate); -} - -const char *surf_resource_name(surf_cpp_resource_t resource){ - return resource->getName(); -} - -int surf_resource_is_on(surf_cpp_resource_t resource){ - return resource->isOn(); -} -int surf_resource_is_off(surf_cpp_resource_t resource){ - return resource->isOff(); -} -void surf_resource_turn_on(surf_cpp_resource_t resource){ - resource->turnOn(); -} -void surf_resource_turn_off(surf_cpp_resource_t resource){ - resource->turnOff(); + return model->communicate(src->pimpl_netcard, dst->pimpl_netcard, size, rate); } surf_action_t surf_host_sleep(sg_host_t host, double duration){ - return host->p_cpu->sleep(duration); -} - -xbt_dict_t sg_host_get_properties(sg_host_t host) { - return get_casted_host(host)->getProperties(); -} - -double surf_host_get_available_speed(sg_host_t host){ - return host->p_cpu->getAvailableSpeed(); -} - -surf_action_t surf_host_execute(sg_host_t host, double size){ - return host->p_cpu->execute(size); -} - -double surf_host_get_current_power_peak(sg_host_t host){ - return host->p_cpu->getCurrentPowerPeak(); -} - -double surf_host_get_power_peak_at(sg_host_t host, int pstate_index){ - return host->p_cpu->getPowerPeakAt(pstate_index); -} - -int surf_host_get_nb_pstates(sg_host_t host){ - return host->p_cpu->getNbPStates(); -} - -void surf_host_set_pstate(sg_host_t host, int pstate_index){ - host->p_cpu->setPState(pstate_index); -} -int surf_host_get_pstate(sg_host_t host){ - return host->p_cpu->getPState(); -} - -using simgrid::energy::HostEnergy; -using simgrid::energy::surf_energy; - -double surf_host_get_wattmin_at(sg_host_t resource, int pstate){ - xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); - return hostIt->second->getWattMinAt(pstate); -} -double surf_host_get_wattmax_at(sg_host_t resource, int pstate){ - xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); - return hostIt->second->getWattMaxAt(pstate); -} - -double surf_host_get_consumed_energy(sg_host_t resource){ - xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); - return hostIt->second->getConsumedEnergy(); -} - -xbt_dict_t surf_host_get_mounted_storage_list(sg_host_t host){ - return get_casted_host(host)->getMountedStorageList(); -} - -xbt_dynar_t surf_host_get_attached_storage_list(sg_host_t host){ - return get_casted_host(host)->getAttachedStorageList(); + return host->pimpl_cpu->sleep(duration); } surf_action_t surf_host_open(sg_host_t host, const char* fullpath){ @@ -360,31 +229,9 @@ int surf_host_file_move(sg_host_t host, surf_file_t fd, const char* fullpath){ return get_casted_host(host)->fileMove(fd, fullpath); } -xbt_dynar_t surf_host_get_vms(sg_host_t host){ - xbt_dynar_t vms = get_casted_host(host)->getVms(); - xbt_dynar_t vms_ = xbt_dynar_new(sizeof(sg_host_t), NULL); - unsigned int cpt; - simgrid::surf::VirtualMachine *vm; - xbt_dynar_foreach(vms, cpt, vm) { - // TODO, use a backlink from simgrid::surf::Host to simgrid::Host - sg_host_t vm_ = (sg_host_t) xbt_dict_get_elm_or_null(host_list, vm->getName()); - xbt_dynar_push(vms_, &vm_); - } - xbt_dynar_free(&vms); - return vms_; -} - -void surf_host_get_params(sg_host_t host, vm_params_t params){ - get_casted_host(host)->getParams(params); -} - -void surf_host_set_params(sg_host_t host, vm_params_t params){ - get_casted_host(host)->setParams(params); -} - -void surf_vm_destroy(sg_host_t vm){ - vm->p_cpu = nullptr; - delete vm->p_netcard; +void surf_vm_destroy(sg_host_t vm){ // FIXME:DEADCODE + vm->pimpl_cpu = nullptr; + vm->pimpl_netcard = nullptr; } void surf_vm_suspend(sg_host_t vm){ @@ -412,11 +259,11 @@ sg_host_t surf_vm_get_pm(sg_host_t vm){ } void surf_vm_set_bound(sg_host_t vm, double bound){ - return get_casted_vm(vm)->setBound(bound); + get_casted_vm(vm)->setBound(bound); } void surf_vm_set_affinity(sg_host_t vm, sg_host_t host, unsigned long mask){ - return get_casted_vm(vm)->setAffinity(host->p_cpu, mask); + get_casted_vm(vm)->setAffinity(host->pimpl_cpu, mask); } xbt_dict_t surf_storage_get_content(surf_resource_t resource){ @@ -443,76 +290,10 @@ const char* surf_storage_get_host(surf_resource_t resource){ return static_cast(surf_storage_resource_priv(resource))->p_attach; } -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(); -} - -double surf_action_get_remains(surf_action_t action){ - return action->getRemains(); -} - -void surf_action_unref(surf_action_t action){ - action->unref(); -} - -void surf_action_suspend(surf_action_t action){ - action->suspend(); -} - -void surf_action_resume(surf_action_t action){ - action->resume(); -} - -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(); -} - -double surf_action_get_cost(surf_action_t action){ - return action->getCost(); -} - -void surf_cpu_action_set_affinity(surf_action_t action, sg_host_t host, unsigned long mask) { - static_cast(action)->setAffinity(host->p_cpu, mask); -} - 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; } - -surf_host_t surf_host_resource_priv(sg_host_t host) { - return host->extension(simgrid::surf::Host::EXTENSION_ID); -}