/* s4u::Engine Simulation Engine and global functions. */
-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2019. 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/NetZone.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/simix.h"
-#include "src/simix/smx_private.hpp" // For access to simix_global->process_list
#include "src/instr/instr_private.hpp"
#include "src/kernel/EngineImpl.hpp"
+#include "src/simix/smx_private.hpp" // For access to simix_global->process_list
#include "src/surf/network_interface.hpp"
#include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON
+#include <simgrid/Exception.hpp>
#include <string>
XBT_LOG_NEW_CATEGORY(s4u, "Log channels of the S4U (Simgrid for you) interface");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_engine, s4u, "Logging specific to S4U (engine)");
namespace simgrid {
namespace s4u {
Engine* Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
-Engine::Engine(int* argc, char** argv)
+Engine::Engine(int* argc, char** argv) : pimpl(new kernel::EngineImpl())
{
xbt_assert(s4u::Engine::instance_ == nullptr,
"It is currently forbidden to create more than one instance of s4u::Engine");
TRACE_global_init();
SIMIX_global_init(argc, argv);
- pimpl = new kernel::EngineImpl();
s4u::Engine::instance_ = this;
}
/** @brief Retrieve the engine singleton */
Engine* Engine::get_instance()
{
- if (s4u::Engine::instance_ == nullptr)
- return new Engine(0, nullptr);
- else
- return s4u::Engine::instance_;
+ if (s4u::Engine::instance_ == nullptr) {
+ auto e = new Engine(0, nullptr);
+ xbt_assert(s4u::Engine::instance_ == e);
+ }
+ return s4u::Engine::instance_;
}
void Engine::shutdown()
return SIMIX_get_clock();
}
+/**
+ * @brief A platform loader.
+ *
+ * Creates a new platform, including hosts, links, and the routing_table.
+ * @param platf a filename of the XML description of a platform. This file follows this DTD :
+ *
+ * @include src/surf/xml/simgrid.dtd
+ *
+ * Here is a small example of such a platform
+ *
+ * @include examples/platforms/small_platform.xml
+ */
void Engine::load_platform(std::string platf)
{
- SIMIX_create_environment(platf);
+ double start = xbt_os_time();
+ try {
+ parse_platform_file(platf);
+ } catch (xbt_ex& e) {
+ xbt_die("Error while loading %s: %s", platf.c_str(), e.what());
+ }
+
+ double end = xbt_os_time();
+ XBT_DEBUG("PARSE TIME: %g", (end - start));
}
void Engine::register_function(std::string name, int (*code)(int, char**))
pimpl->hosts_.erase(name);
}
-/** @brief Find an host from its name.
+/** @brief Find a host from its name.
*
* @throw std::invalid_argument if the searched host does not exist.
*/
return pimpl->hosts_.at(name);
}
-/** @brief Find an host from its name (or nullptr if that host does not exist) */
+/** @brief Find a 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);