X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ca0df6f5bb17b5708c11a19846c0e90e25b7889..c773c39f8623155553cfba2919317250e003adb4:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 99354ad0c9..f818a6ba72 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -1,11 +1,13 @@ -/* 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/include/surf/surf.hpp" #include "src/instr/instr_private.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" + #include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); @@ -24,19 +26,19 @@ void surf_presolve() 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) { + while ((next_event_date = future_evt_set.next_date()) != -1.0) { if (next_event_date > NOW) break; - while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) { + while ((event = future_evt_set.pop_leq(next_event_date, &value, &resource))) { if (value >= 0) resource->apply_event(event, value); } } XBT_DEBUG ("Set every models in the right state by updating them to 0."); - for (auto const& 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) @@ -55,21 +57,21 @@ 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) { + 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->nextOccuringEvent(NOW); + 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; } @@ -80,10 +82,10 @@ double surf_solve(double max_date) XBT_DEBUG("Looking for next trace event"); while (1) { // Handle next occurring events until none remains - double 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 (not surf_network_model->nextOccuringEventIsIdempotent()) { // NS3, I see you + 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 { @@ -92,7 +94,7 @@ double surf_solve(double max_date) 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) @@ -107,8 +109,8 @@ double surf_solve(double max_date) 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() || (watched_hosts.find(resource->getCname()) != watched_hosts.end())) { + while ((event = future_evt_set.pop_leq(next_event_date, &value, &resource))) { + 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); } @@ -117,7 +119,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->getCname()); + XBT_DEBUG("Calling update_resource_state for resource %s", resource->get_cname()); resource->apply_event(event, value); NOW = round_start; } @@ -137,44 +139,12 @@ double surf_solve(double max_date) NOW = NOW + time_delta; // Inform the models of the date change - for (auto const& model : *all_existing_models) - model->updateActionsState(NOW, time_delta); + for (auto const& model : all_existing_models) + model->update_actions_state(NOW, time_delta); - simgrid::s4u::onTimeAdvance(time_delta); + simgrid::s4u::on_time_advance(time_delta); TRACE_paje_dump_buffer(false); return time_delta; } - -/********* - * MODEL * - *********/ -static simgrid::kernel::resource::Action* ActionListExtract(simgrid::kernel::resource::Action::StateSet* list) -{ - if (list->empty()) - return nullptr; - simgrid::kernel::resource::Action* res = &list->front(); - list->pop_front(); - return res; -} - -simgrid::kernel::resource::Action* surf_model_extract_done_action_set(simgrid::kernel::resource::Model* model) -{ - return ActionListExtract(model->getDoneActionSet()); -} - -simgrid::kernel::resource::Action* surf_model_extract_failed_action_set(simgrid::kernel::resource::Model* model) -{ - return ActionListExtract(model->getFailedActionSet()); -} - -int surf_model_running_action_set_size(simgrid::kernel::resource::Model* model) -{ - return model->getRunningActionSet()->size(); -} - -void surf_cpu_action_set_bound(simgrid::kernel::resource::Action* action, double bound) -{ - static_cast(action)->set_bound(bound); -}