#include "src/surf/network_interface.hpp"
#include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON
+#include <string>
+
XBT_LOG_NEW_CATEGORY(s4u, "Log channels of the S4U (Simgrid for you) interface");
namespace simgrid {
return SIMIX_get_clock();
}
-void Engine::load_platform(const char* platf)
+void Engine::load_platform(std::string platf)
{
SIMIX_create_environment(platf);
}
-void Engine::register_function(const char* name, int (*code)(int, char**))
+void Engine::register_function(std::string name, int (*code)(int, char**))
+{
+ SIMIX_function_register(name, code);
+}
+void Engine::register_function(std::string name, void (*code)(std::vector<std::string>))
{
SIMIX_function_register(name, code);
}
{
SIMIX_function_register_default(code);
}
-void Engine::load_deployment(const char* deploy)
+void Engine::load_deployment(std::string deploy)
{
SIMIX_launch_application(deploy);
}
pimpl->hosts_.erase(name);
}
+/** @brief Find an host from its name.
+ *
+ * @throw std::invalid_argument if the searched host does not exist.
+ */
simgrid::s4u::Host* Engine::host_by_name(std::string name)
{
- return pimpl->hosts_.at(name); // Will raise a std::out_of_range if the host does not exist
+ if (pimpl->hosts_.find(name) == pimpl->hosts_.end())
+ throw std::invalid_argument(std::string("Host not found: '") + name + std::string("'"));
+ return pimpl->hosts_.at(name);
}
+/** @brief Find an host from its name (or nullptr if that host does not exist) */
simgrid::s4u::Host* Engine::host_by_name_or_null(std::string name)
{
auto host = pimpl->hosts_.find(name);
return host == pimpl->hosts_.end() ? nullptr : host->second;
}
+/** @brief Find a link from its name.
+ *
+ * @throw std::invalid_argument if the searched link does not exist.
+ */
+simgrid::s4u::Link* Engine::link_by_name(std::string name)
+{
+ if (pimpl->links_.find(name) == pimpl->links_.end())
+ throw std::invalid_argument(std::string("Link not found: ") + name);
+
+ return pimpl->links_.at(name);
+}
+
+/** @brief Find an link from its name (or nullptr if that link does not exist) */
+simgrid::s4u::Link* Engine::link_by_name_or_null(std::string name)
+{
+ auto link = pimpl->links_.find(name);
+ return link == pimpl->links_.end() ? nullptr : link->second;
+}
+
+void Engine::link_register(std::string name, simgrid::s4u::Link* link)
+{
+ pimpl->links_[name] = link;
+}
+
+void Engine::link_unregister(std::string name)
+{
+ pimpl->links_.erase(name);
+}
+
/** @brief Returns the amount of storages in the platform */
size_t Engine::get_storage_count()
{
return res;
}
+/** @brief Find a storage from its name.
+ *
+ * @throw std::invalid_argument if the searched storage does not exist.
+ */
simgrid::s4u::Storage* Engine::storage_by_name(std::string name)
{
- return pimpl->storages_.at(name); // Will raise a std::out_of_range if the host does not exist
+ if (pimpl->storages_.find(name) == pimpl->storages_.end())
+ throw std::invalid_argument(std::string("Storage not found: ") + name);
+
+ return pimpl->storages_.at(name);
}
+/** @brief Find a storage from its name (or nullptr if that storage does not exist) */
simgrid::s4u::Storage* Engine::storage_by_name_or_null(std::string name)
{
auto storage = pimpl->storages_.find(name);
/** @brief Returns the amount of links in the platform */
size_t Engine::get_link_count()
{
- return kernel::resource::LinkImpl::linksCount();
+ return pimpl->links_.size();
}
/** @brief Returns the list of all links found in the platform */
std::vector<Link*> Engine::get_all_links()
{
std::vector<Link*> res;
- kernel::resource::LinkImpl::linksList(&res);
+ for (auto const& kv : pimpl->links_)
+ res.push_back(kv.second);
return res;
}
std::vector<Link*> Engine::get_filtered_links(std::function<bool(Link*)> filter)
{
- // FIXME: This is a terrible implementation and should be done
- // without getting all links first.
- std::vector<Link*> res;
- kernel::resource::LinkImpl::linksList(&res);
std::vector<Link*> filtered_list;
- for (auto& link : res) {
- if (filter(link))
- filtered_list.push_back(link);
- }
+ for (auto const& kv : pimpl->links_)
+ if (filter(kv.second))
+ filtered_list.push_back(kv.second);
return filtered_list;
}
void Engine::run()
{
+ /* Clean IO before the run */
+ fflush(stdout);
+ fflush(stderr);
+
if (MC_is_active()) {
MC_run();
} else {
/** @brief Retrieve the root netzone, containing all others */
s4u::NetZone* Engine::get_netzone_root()
{
- return pimpl->netzone_root_;
+ return pimpl->netzone_root_->get_iface();
}
/** @brief Set the root netzone, containing all others. Once set, it cannot be changed. */
void Engine::set_netzone_root(s4u::NetZone* netzone)
{
xbt_assert(pimpl->netzone_root_ == nullptr, "The root NetZone cannot be changed once set");
- pimpl->netzone_root_ = static_cast<kernel::routing::NetZoneImpl*>(netzone);
+ pimpl->netzone_root_ = netzone->get_impl();
}
-static s4u::NetZone* netzone_by_name_recursive(s4u::NetZone* current, const char* name)
+static s4u::NetZone* netzone_by_name_recursive(s4u::NetZone* current, std::string name)
{
- if (not strcmp(current->get_cname(), name))
+ if (current->get_name() == name)
return current;
- for (auto const& elem : *(current->getChildren())) {
+ for (auto const& elem : current->get_children()) {
simgrid::s4u::NetZone* tmp = netzone_by_name_recursive(elem, name);
if (tmp != nullptr) {
return tmp;
}
/** @brief Retrieve the NetZone of the given name (or nullptr if not found) */
-NetZone* Engine::netzone_by_name_or_null(const char* name)
+NetZone* Engine::netzone_by_name_or_null(std::string name)
{
return netzone_by_name_recursive(get_netzone_root(), name);
}
} // namespace simgrid
/* **************************** Public C interface *************************** */
-void sg_engine_load_platform(const char* file)
+void simgrid_init(int* argc, char** argv)
+{
+ simgrid::s4u::Engine e(argc, argv);
+}
+void simgrid_load_platform(const char* file)
{
simgrid::s4u::Engine::get_instance()->load_platform(file);
}
-void sg_engine_load_deployment(const char* file)
+void simgrid_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**))
+void simgrid_run()
+{
+ simgrid::s4u::Engine::get_instance()->run();
+}
+void simgrid_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**))
+void simgrid_register_default(int (*code)(int, char**))
{
simgrid::s4u::Engine::get_instance()->register_default(code);
}
-double sg_engine_get_clock()
+double simgrid_get_clock()
{
return simgrid::s4u::Engine::get_clock();
}