X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c416e92254512408c1d0ce729e8d3cf82ec9938..8cfd4f9b786027431b78a9b74db0843634ab7397:/src/s4u/s4u_Engine.cpp diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index 8d1a71ed6e..ab520f2f59 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -5,7 +5,6 @@ /* 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 "instr/instr_interface.hpp" #include "mc/mc.h" #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/kernel/routing/NetZoneImpl.hpp" @@ -15,6 +14,7 @@ #include "simgrid/s4u/NetZone.hpp" #include "simgrid/s4u/Storage.hpp" #include "simgrid/simix.h" +#include "src/instr/instr_private.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/surf/network_interface.hpp" #include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON @@ -23,10 +23,11 @@ XBT_LOG_NEW_CATEGORY(s4u, "Log channels of the S4U (Simgrid for you) interface") namespace simgrid { namespace s4u { -xbt::signal onPlatformCreated; -xbt::signal onSimulationEnd; -xbt::signal onTimeAdvance; -xbt::signal onDeadlock; +xbt::signal on_platform_creation; +xbt::signal on_platform_created; +xbt::signal on_simulation_end; +xbt::signal on_time_advance; +xbt::signal on_deadlock; Engine* Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */ @@ -47,7 +48,8 @@ Engine::~Engine() s4u::Engine::instance_ = nullptr; } -Engine* Engine::getInstance() +/** @brief Retrieve the engine singleton */ +Engine* Engine::get_instance() { if (s4u::Engine::instance_ == nullptr) return new Engine(0, nullptr); @@ -61,7 +63,7 @@ void Engine::shutdown() s4u::Engine::instance_ = nullptr; } -double Engine::getClock() +double Engine::get_clock() { return SIMIX_get_clock(); } @@ -91,9 +93,7 @@ size_t Engine::get_host_count() /** @brief Fills the passed list with all hosts found in the platform * @deprecated Please prefer Engine::getAllHosts() */ -void XBT_ATTRIB_DEPRECATED_v322( - "Engine::getHostList() is deprecated in favor of Engine::get_all_hosts(). Please switch before v3.22") - Engine::get_host_list(std::vector* list) +void Engine::getHostList(std::vector* list) { for (auto const& kv : pimpl->hosts_) list->push_back(kv.second); @@ -108,12 +108,12 @@ std::vector Engine::get_all_hosts() return res; } -void Engine::add_host(std::string name, simgrid::s4u::Host* host) +void Engine::host_register(std::string name, simgrid::s4u::Host* host) { pimpl->hosts_[name] = host; } -void Engine::del_host(std::string name) +void Engine::host_unregister(std::string name) { pimpl->hosts_.erase(name); } @@ -129,8 +129,14 @@ simgrid::s4u::Host* Engine::host_by_name_or_null(std::string name) return host == pimpl->hosts_.end() ? nullptr : host->second; } +/** @brief Returns the amount of storages in the platform */ +size_t Engine::get_storage_count() +{ + return pimpl->storages_.size(); +} + /** @brief Returns the list of all storages found in the platform */ -std::vector Engine::getAllStorages() +std::vector Engine::get_all_storages() { std::vector res; for (auto const& kv : pimpl->storages_) @@ -149,34 +155,24 @@ simgrid::s4u::Storage* Engine::storage_by_name_or_null(std::string name) return storage == pimpl->storages_.end() ? nullptr : storage->second; } -void Engine::add_storage(std::string name, simgrid::s4u::Storage* storage) +void Engine::storage_register(std::string name, simgrid::s4u::Storage* storage) { pimpl->storages_[name] = storage; } -void Engine::del_storage(std::string name) +void Engine::storage_unregister(std::string name) { pimpl->storages_.erase(name); } /** @brief Returns the amount of links in the platform */ -size_t Engine::getLinkCount() +size_t Engine::get_link_count() { return kernel::resource::LinkImpl::linksCount(); } -/** @brief Fills the passed list with all links found in the platform - * - * @deprecated. Prefer Engine::getAllLinks() */ -void XBT_ATTRIB_DEPRECATED_v322( - "Engine::getLinkList() is deprecated in favor of Engine::getAllLinks(). Please switch before v3.22") - Engine::getLinkList(std::vector* list) -{ - kernel::resource::LinkImpl::linksList(list); -} - /** @brief Returns the list of all links found in the platform */ -std::vector Engine::getAllLinks() +std::vector Engine::get_all_links() { std::vector res; kernel::resource::LinkImpl::linksList(&res); @@ -192,18 +188,25 @@ void Engine::run() } } -s4u::NetZone* Engine::getNetRoot() +/** @brief Retrieve the root netzone, containing all others */ +s4u::NetZone* Engine::get_netzone_root() +{ + return pimpl->netzone_root_; +} +/** @brief Set the root netzone, containing all others. Once set, it cannot be changed. */ +void Engine::set_netzone_root(s4u::NetZone* netzone) { - return pimpl->netRoot_; + xbt_assert(pimpl->netzone_root_ == nullptr, "The root NetZone cannot be changed once set"); + pimpl->netzone_root_ = static_cast(netzone); } -static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* name) +static s4u::NetZone* netzone_by_name_recursive(s4u::NetZone* current, const char* name) { if (not strcmp(current->get_cname(), name)) return current; for (auto const& elem : *(current->getChildren())) { - simgrid::s4u::NetZone* tmp = netzoneByNameRecursive(elem, name); + simgrid::s4u::NetZone* tmp = netzone_by_name_recursive(elem, name); if (tmp != nullptr) { return tmp; } @@ -212,13 +215,13 @@ static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* n } /** @brief Retrieve the NetZone of the given name (or nullptr if not found) */ -NetZone* Engine::getNetzoneByNameOrNull(const char* name) +NetZone* Engine::netzone_by_name_or_null(const char* name) { - return netzoneByNameRecursive(getNetRoot(), name); + return netzone_by_name_recursive(get_netzone_root(), name); } /** @brief Retrieve the netpoint of the given name (or nullptr if not found) */ -simgrid::kernel::routing::NetPoint* Engine::getNetpointByNameOrNull(std::string name) +simgrid::kernel::routing::NetPoint* Engine::netpoint_by_name_or_null(std::string name) { auto netp = pimpl->netpoints_.find(name); return netp == pimpl->netpoints_.end() ? nullptr : netp->second; @@ -230,29 +233,61 @@ void Engine::getNetpointList(std::vector* l for (auto const& kv : pimpl->netpoints_) list->push_back(kv.second); } +std::vector Engine::get_all_netpoints() +{ + std::vector res; + for (auto const& kv : pimpl->netpoints_) + res.push_back(kv.second); + return res; +} + /** @brief Register a new netpoint to the system */ -void Engine::netpointRegister(simgrid::kernel::routing::NetPoint* point) +void Engine::netpoint_register(simgrid::kernel::routing::NetPoint* point) { - // simgrid::simix::kernelImmediate([&]{ FIXME: this segfaults in set_thread + // simgrid::simix::simcall([&]{ FIXME: this segfaults in set_thread pimpl->netpoints_[point->get_name()] = point; // }); } /** @brief Unregister a given netpoint */ -void Engine::netpointUnregister(simgrid::kernel::routing::NetPoint* point) +void Engine::netpoint_unregister(simgrid::kernel::routing::NetPoint* point) { - simgrid::simix::kernelImmediate([this, point] { + simgrid::simix::simcall([this, point] { pimpl->netpoints_.erase(point->get_name()); delete point; }); } -bool Engine::isInitialized() +bool Engine::is_initialized() { return Engine::instance_ != nullptr; } -void Engine::setConfig(std::string str) +void Engine::set_config(std::string str) { simgrid::config::set_parse(std::move(str)); } } // namespace s4u } // namespace simgrid + +/* **************************** Public C interface *************************** */ +void sg_engine_load_platform(const char* file) +{ + simgrid::s4u::Engine::get_instance()->load_platform(file); +} + +void sg_engine_load_deployment(const char* file) +{ + simgrid::s4u::Engine::get_instance()->load_deployment(file); +} + +void sg_engine_register_function(const char* name, int (*code)(int, char**)) +{ + simgrid::s4u::Engine::get_instance()->register_function(name, code); +} +void sg_engine_register_default(int (*code)(int, char**)) +{ + simgrid::s4u::Engine::get_instance()->register_default(code); +} +double sg_engine_get_clock() +{ + return simgrid::s4u::Engine::get_clock(); +}