X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8f0008b377d7e1c7e7cb3bce1f57c97606d8054..d735a547f3200668329feb310844a6839ea21ac3:/src/kernel/EngineImpl.cpp diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index 3a96a578de..0635354b61 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -1,14 +1,17 @@ -/* Copyright (c) 2016-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2021. 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 "src/kernel/EngineImpl.hpp" +#include "simgrid/Exception.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/kernel/routing/NetZoneImpl.hpp" #include "simgrid/s4u/Host.hpp" -#include "src/surf/StorageImpl.hpp" +#include "src/kernel/resource/DiskImpl.hpp" +#include "src/simix/smx_private.hpp" #include "src/surf/network_interface.hpp" +#include "src/surf/xml/platf.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here namespace simgrid { namespace kernel { @@ -26,13 +29,43 @@ EngineImpl::~EngineImpl() for (auto const& kv : netpoints_) delete kv.second; - for (auto const& kv : storages_) - if (kv.second) - kv.second->get_impl()->destroy(); - for (auto const& kv : links_) if (kv.second) - kv.second->get_impl()->destroy(); + kv.second->destroy(); +} + +void EngineImpl::load_deployment(const std::string& file) const +{ + sg_platf_exit(); + sg_platf_init(); + + surf_parse_open(file); + surf_parse(); + surf_parse_close(); +} + +void EngineImpl::register_function(const std::string& name, const actor::ActorCodeFactory& code) +{ + registered_functions[name] = code; } +void EngineImpl::register_default(const actor::ActorCodeFactory& code) +{ + default_function = code; } + +void EngineImpl::add_model(std::shared_ptr model, const std::vector& dependencies) +{ + auto model_name = model->get_name(); + xbt_assert(models_prio_.find(model_name) == models_prio_.end(), + "Model %s already exists, use model.set_name() to change its name", model_name.c_str()); + + for (const auto dep : dependencies) { + xbt_assert(models_prio_.find(dep->get_name()) != models_prio_.end(), + "Model %s doesn't exists. Impossible to use it as dependency.", dep->get_name().c_str()); + } + models_.push_back(model.get()); + models_prio_[model_name] = std::move(model); } + +} // namespace kernel +} // namespace simgrid