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
enum class values should be UPPER_CASE
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
54f61e8
..
c85eba3
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-6,17
+6,15
@@
#include "surf_interface.hpp"
#include "mc/mc.h"
#include "simgrid/s4u/Engine.hpp"
#include "surf_interface.hpp"
#include "mc/mc.h"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/sg_config.h"
-#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
-#include "src/kernel/lmm/maxmin.hpp" // Constraint
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/sg_config.hpp"
+#include "src/internal_config.h"
#include "src/surf/HostImpl.hpp"
#include "src/surf/HostImpl.hpp"
-#include "xbt/utility.hpp"
+#include "src/surf/xml/platf.hpp"
+#include "surf/surf.hpp"
+#include "xbt/module.h"
#include <fstream>
#include <fstream>
-#include <set>
#include <string>
#include <string>
-#include <vector>
#ifdef _WIN32
#include <windows.h>
#ifdef _WIN32
#include <windows.h>
@@
-38,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
@@
-128,12
+119,6
@@
double surf_get_clock()
return NOW;
}
return NOW;
}
-#ifdef _WIN32
-# define FILE_DELIM "\\"
-#else
-# define FILE_DELIM "/" /* FIXME: move to better location */
-#endif
-
std::ifstream* surf_ifsopen(std::string name)
{
std::ifstream* fs = new std::ifstream();
std::ifstream* surf_ifsopen(std::string name)
{
std::ifstream* fs = new std::ifstream();
@@
-144,7
+129,7
@@
std::ifstream* surf_ifsopen(std::string name)
/* search relative files in the path */
for (auto const& path_elm : surf_path) {
/* search relative files in the path */
for (auto const& path_elm : surf_path) {
- std::string buff = path_elm +
FILE_DELIM
+ name;
+ std::string buff = path_elm +
"/"
+ name;
fs->open(buff.c_str(), std::ifstream::in);
if (not fs->fail()) {
fs->open(buff.c_str(), std::ifstream::in);
if (not fs->fail()) {
@@
-167,7
+152,7
@@
FILE *surf_fopen(const char *name, const char *mode)
/* search relative files in the path */
for (auto const& path_elm : surf_path) {
/* search relative files in the path */
for (auto const& path_elm : surf_path) {
- std::string buff = path_elm +
FILE_DELIM
+ name;
+ std::string buff = path_elm +
"/"
+ name;
file = fopen(buff.c_str(), mode);
if (file)
file = fopen(buff.c_str(), mode);
if (file)
@@
-319,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) {
@@
-334,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();