A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove useless check for null before free.
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
2ed96e5
..
c85eba3
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-4,7
+4,6
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf_interface.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf_interface.hpp"
-#include "instr/instr_interface.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
#include "mc/mc.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/sg_config.hpp"
#include "mc/mc.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/sg_config.hpp"
@@
-12,6
+11,7
@@
#include "src/surf/HostImpl.hpp"
#include "src/surf/xml/platf.hpp"
#include "surf/surf.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/xml/platf.hpp"
#include "surf/surf.hpp"
+#include "xbt/module.h"
#include <fstream>
#include <string>
#include <fstream>
#include <string>
@@
-36,13
+36,6
@@
std::vector<simgrid::s4u::Host*> host_that_restart;
std::set<std::string> watched_hosts;
extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
std::set<std::string> watched_hosts;
extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
-namespace simgrid {
-namespace surf {
-
-simgrid::xbt::signal<void()> surfExitCallbacks;
-}
-}
-
#include <simgrid/plugins/energy.h> // FIXME: this plug-in should not be linked to the core
#include <simgrid/plugins/load.h> // FIXME: this plug-in should not be linked to the core
#include <simgrid/plugins/energy.h> // FIXME: this plug-in should not be linked to the core
#include <simgrid/plugins/load.h> // FIXME: this plug-in should not be linked to the core
@@
-311,8
+304,6
@@
void surf_init(int *argc, char **argv)
void surf_exit()
{
void surf_exit()
{
- TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */
-
simgrid::s4u::Engine::shutdown();
sg_link_exit();
for (auto const& e : storage_types) {
simgrid::s4u::Engine::shutdown();
sg_link_exit();
for (auto const& e : storage_types) {
@@
-326,11
+317,8
@@
void surf_exit()
delete model;
delete all_existing_models;
delete model;
delete all_existing_models;
-
- if (future_evt_set) {
- delete future_evt_set;
- future_evt_set = nullptr;
- }
+ delete future_evt_set;
+ future_evt_set = nullptr;
tmgr_finalize();
sg_platf_exit();
tmgr_finalize();
sg_platf_exit();