X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/beaf98d147d698475be5ffc547c2e3935e7f42a3..29d98d1ceb682fbc4c734a92353be4b0bcd5d17b:/src/s4u/s4u_engine.cpp diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp index 5734a1f680..d895beb099 100644 --- a/src/s4u/s4u_engine.cpp +++ b/src/s4u/s4u_engine.cpp @@ -1,23 +1,23 @@ /* s4u::Engine Simulation Engine and global functions. */ -/* Copyright (c) 2006-2015. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2017. 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 "instr/instr_interface.h" #include "mc/mc.h" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Mailbox.hpp" #include "simgrid/s4u/NetZone.hpp" -#include "simgrid/s4u/engine.hpp" -#include "simgrid/s4u/host.hpp" -#include "simgrid/s4u/storage.hpp" +#include "simgrid/s4u/Storage.hpp" #include "simgrid/simix.h" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/routing/NetPoint.hpp" #include "src/kernel/routing/NetZoneImpl.hpp" #include "src/surf/network_interface.hpp" -#include "surf/surf.h" // routing_platf. FIXME:KILLME. SOON +#include "surf/surf.h" // routing_platf. FIXME:KILLME. SOON XBT_LOG_NEW_CATEGORY(s4u,"Log channels of the S4U (Simgrid for you) interface"); @@ -107,7 +107,7 @@ s4u::NetZone* Engine::netRoot() static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* name) { - if(!strcmp(current->name(), name)) + if (not strcmp(current->name(), name)) return current; for (auto elem : *(current->children())) { @@ -153,5 +153,10 @@ void Engine::netpointUnregister(simgrid::kernel::routing::NetPoint* point) delete point; }); } + +bool Engine::isInitialized() +{ + return Engine::instance_ != nullptr; } } +} // namespace