X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3b4740f2c34e232bcf203b9407af5637acaecaec..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 7840806932..83b24b3dfb 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -1,11 +1,12 @@ -/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2018. 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/instr/instr_private.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" +#include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); @@ -18,9 +19,9 @@ extern double NOW; void surf_presolve() { double next_event_date = -1.0; - tmgr_trace_iterator_t event = nullptr; + tmgr_trace_event_t event = nullptr; double value = -1.0; - simgrid::surf::Resource *resource = nullptr; + simgrid::kernel::resource::Resource* resource = nullptr; XBT_DEBUG ("Consume all trace events occurring before the starting time."); while ((next_event_date = future_evt_set->next_date()) != -1.0) { @@ -28,25 +29,23 @@ void surf_presolve() break; while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) { - if (value >= 0){ + if (value >= 0) resource->apply_event(event, value); - } } } 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); + for (auto const& model : *all_existing_models) + model->update_actions_state(NOW, 0.0); } double surf_solve(double max_date) { 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 = nullptr; - tmgr_trace_iterator_t event = nullptr; + simgrid::kernel::resource::Resource* resource = nullptr; + tmgr_trace_event_t event = nullptr; 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); @@ -56,53 +55,60 @@ double surf_solve(double max_date) /* Physical models MUST be resolved first */ XBT_DEBUG("Looking for next event in physical models"); - double next_event_phy = surf_host_model->nextOccuringEvent(NOW); + 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 != nullptr) { XBT_DEBUG("Looking for next event in virtual models"); - double next_event_virt = surf_vm_model->nextOccuringEvent(NOW); + 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; } + for (auto const& model : *all_existing_models) { + if (model != surf_host_model && model != surf_vm_model && model != surf_network_model && + model != surf_storage_model) { + double next_event_model = model->next_occuring_event(NOW); + if ((time_delta < 0.0 || next_event_model < time_delta) && next_event_model >= 0.0) + time_delta = next_event_model; + } + } + XBT_DEBUG("Min for resources (remember that NS3 don't update that value): %f", time_delta); XBT_DEBUG("Looking for next trace event"); while (1) { // Handle next occurring events until none remains - next_event_date = future_evt_set->next_date(); + double next_event_date = future_evt_set->next_date(); XBT_DEBUG("Next TRACE event: %f", next_event_date); - 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); + if (not surf_network_model->next_occuring_event_is_idempotent()) { // NS3, I see you + if (next_event_date != -1.0) { + time_delta = std::min(next_event_date - NOW, time_delta); } else { - time_delta = MAX(next_event_date - NOW, time_delta); // Get the positive component + time_delta = std::max(next_event_date - NOW, time_delta); // Get the positive component } XBT_DEBUG("Run the NS3 network at most %fs", time_delta); // run until min or next flow - model_next_action_end = surf_network_model->nextOccuringEvent(time_delta); + 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) + if (model_next_action_end >= 0.0) time_delta = model_next_action_end; } - if (next_event_date < 0.0) { - XBT_DEBUG("no next TRACE event. Stop searching for it"); + if (next_event_date < 0.0 || (next_event_date > NOW + time_delta)) { + // next event may have already occurred or will after the next resource change, then bail out + XBT_DEBUG("no next usable TRACE event. Stop searching for it"); 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); 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())) { + if (resource->is_used() || (watched_hosts.find(resource->get_cname()) != watched_hosts.end())) { 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); } @@ -111,7 +117,7 @@ double surf_solve(double max_date) 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", resource->cname()); + XBT_DEBUG("Calling update_resource_state for resource %s", resource->get_cname()); resource->apply_event(event, value); NOW = round_start; } @@ -131,12 +137,12 @@ double surf_solve(double max_date) 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); + for (auto const& model : *all_existing_models) + model->update_actions_state(NOW, time_delta); + + simgrid::s4u::on_time_advance(time_delta); - TRACE_paje_dump_buffer (0); + TRACE_paje_dump_buffer(false); return time_delta; } @@ -144,97 +150,31 @@ double surf_solve(double max_date) /********* * MODEL * *********/ -static surf_action_t ActionListExtract(simgrid::surf::ActionList* list) +static simgrid::kernel::resource::Action* ActionListExtract(simgrid::kernel::resource::Action::StateSet* list) { if (list->empty()) return nullptr; - surf_action_t res = &list->front(); + simgrid::kernel::resource::Action* res = &list->front(); list->pop_front(); return res; } -surf_action_t surf_model_extract_done_action_set(surf_model_t model) +simgrid::kernel::resource::Action* surf_model_extract_done_action_set(simgrid::kernel::resource::Model* model) { - return ActionListExtract(model->getDoneActionSet()); -} - -surf_action_t surf_model_extract_failed_action_set(surf_model_t model){ - return ActionListExtract(model->getFailedActionSet()); -} - -int surf_model_running_action_set_size(surf_model_t model){ - return model->getRunningActionSet()->size(); + return ActionListExtract(model->get_finished_action_set()); } -surf_action_t surf_host_open(sg_host_t host, const char* fullpath){ - return host->pimpl_->open(fullpath); -} - -surf_action_t surf_host_close(sg_host_t host, surf_file_t fd){ - return host->pimpl_->close(fd); -} - -int surf_host_unlink(sg_host_t host, surf_file_t fd){ - return host->pimpl_->unlink(fd); -} - -size_t surf_host_get_size(sg_host_t host, surf_file_t fd){ - return host->pimpl_->getSize(fd); -} - -surf_action_t surf_host_read(sg_host_t host, surf_file_t fd, sg_size_t size){ - return host->pimpl_->read(fd, size); -} - -surf_action_t surf_host_write(sg_host_t host, surf_file_t fd, sg_size_t size){ - return host->pimpl_->write(fd, size); -} - -xbt_dynar_t surf_host_get_info(sg_host_t host, surf_file_t fd){ - return host->pimpl_->getInfo(fd); -} - -size_t surf_host_file_tell(sg_host_t host, surf_file_t fd){ - return host->pimpl_->fileTell(fd); -} - -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); -} - -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 static_cast(surf_storage_resource_priv(resource))->size_; -} - -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(); -} - -xbt_dict_t surf_storage_get_properties(surf_resource_t resource){ - return static_cast(surf_storage_resource_priv(resource))->getProperties(); -} - -const char* surf_storage_get_host(surf_resource_t resource){ - return static_cast(surf_storage_resource_priv(resource))->attach_; -} - -const char* surf_storage_get_name(surf_resource_t resource){ - return static_cast(surf_storage_resource_priv(resource))->cname(); +simgrid::kernel::resource::Action* surf_model_extract_failed_action_set(simgrid::kernel::resource::Model* model) +{ + return ActionListExtract(model->get_failed_action_set()); } -void surf_cpu_action_set_bound(surf_action_t action, double bound) { - static_cast(action)->setBound(bound); +int surf_model_running_action_set_size(simgrid::kernel::resource::Model* model) +{ + return model->get_started_action_set()->size(); } -surf_file_t surf_storage_action_get_file(surf_action_t action){ - return static_cast(action)->file_; +void surf_cpu_action_set_bound(simgrid::kernel::resource::Action* action, double bound) +{ + static_cast(action)->set_bound(bound); }