#include <simgrid/s4u/forward.hpp>
namespace simgrid {
+namespace kernel {
+class EngineImpl;
+}
namespace s4u {
/** @brief Simulation engine
*
});
}
+ simgrid::kernel::EngineImpl* pimpl;
+
private:
static s4u::Engine *instance_;
};
--- /dev/null
+/* Copyright (c) 2016. 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 "src/kernel/routing/AsImpl.hpp"
+#include <simgrid/s4u/host.hpp>
+
+namespace simgrid {
+namespace kernel {
+
+EngineImpl::EngineImpl()
+{
+}
+EngineImpl::~EngineImpl()
+{
+ delete rootAs_;
+}
+}
+}
--- /dev/null
+/* Copyright (c) 2016. 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/forward.hpp>
+#include <xbt/dict.h>
+
+namespace simgrid {
+namespace kernel {
+namespace routing {
+class AsImpl;
+}
+
+class EngineImpl {
+public:
+ EngineImpl();
+ virtual ~EngineImpl();
+ kernel::routing::AsImpl* rootAs_ = nullptr;
+
+protected:
+ friend simgrid::s4u::Engine;
+};
+}
+}
#include "simgrid/s4u/engine.hpp"
#include "simgrid/s4u/Mailbox.hpp"
#include "simgrid/s4u/storage.hpp"
+#include "simgrid/simix.h"
+#include "src/kernel/EngineImpl.hpp"
#include "surf/surf.h" // routing_platf. FIXME:KILLME. SOON
#include "src/surf/surf_routing.hpp" // routing_platf. FIXME:KILLME. SOON
Engine::Engine(int *argc, char **argv) {
xbt_assert(s4u::Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine");
s4u::Engine::instance_ = this;
+ // pimpl = new kernel::EngineImpl();
TRACE_global_init(argc, argv);
SIMIX_global_init(argc, argv);
s4u::As *Engine::rootAs()
{
return routing_platf->root_; // FIXME: get the root into the Engine directly (and kill the platf)
+ // return pimpl->rootAs_;
}
static s4u::As *asByNameRecursive(s4u::As *current, const char *name)
src/kernel/routing/AsFull.hpp
src/kernel/routing/AsRoutedGraph.hpp
src/kernel/routing/AsNone.hpp
- src/kernel/routing/AsVivaldi.hpp
+ src/kernel/routing/AsVivaldi.hpp
src/surf/storage_interface.hpp
src/surf/storage_n11.hpp
src/kernel/routing/AsRoutedGraph.cpp
src/kernel/routing/AsNone.cpp
src/kernel/routing/AsVivaldi.cpp
-
+
+ src/kernel/EngineImpl.cpp
+ src/kernel/EngineImpl.hpp
+
src/surf/cpu_cas01.cpp
src/surf/cpu_interface.cpp
src/surf/cpu_ti.cpp