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
Move xbt_modinter.h to src/include/xbt/.
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
05ea270
..
4eec01a
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-20
21
. 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. */
/* 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. */
@@
-11,9
+11,9
@@
#include "src/kernel/resource/profile/Profile.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/xml/platf.hpp"
#include "src/kernel/resource/profile/Profile.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/xml/platf.hpp"
-#include "src/xbt_modinter.h" /* whether initialization was already done */
#include "surf/surf.hpp"
#include "xbt/module.h"
#include "surf/surf.hpp"
#include "xbt/module.h"
+#include "xbt/xbt_modinter.h" /* whether initialization was already done */
#include <fstream>
#include <string>
#include <fstream>
#include <string>
@@
-29,13
+29,8
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke
* Utils *
*********/
* Utils *
*********/
-std::vector<simgrid::kernel::resource::Model*> all_existing_models; /* to destroy models correctly */
-
simgrid::kernel::profile::FutureEvtSet future_evt_set;
std::vector<std::string> surf_path;
simgrid::kernel::profile::FutureEvtSet future_evt_set;
std::vector<std::string> surf_path;
-/** set of hosts for which one want to be notified if they ever restart. */
-std::set<std::string> watched_hosts;
-extern std::map<std::string, simgrid::kernel::resource::StorageType*> storage_types;
std::vector<surf_model_description_t>* surf_plugin_description = nullptr;
std::vector<surf_model_description_t>* surf_plugin_description = nullptr;
@@
-48,7
+43,7
@@
static void XBT_ATTRIB_DESTRUCTOR(800) simgrid_free_plugin_description()
XBT_PUBLIC void simgrid_add_plugin_description(const char* name, const char* description, void_f_void_t init_fun)
{
if (not surf_plugin_description)
XBT_PUBLIC void simgrid_add_plugin_description(const char* name, const char* description, void_f_void_t init_fun)
{
if (not surf_plugin_description)
- surf_plugin_description = new std::vector<surf_model_description_t>;
+ surf_plugin_description = new std::vector<surf_model_description_t>
()
;
surf_plugin_description->emplace_back(surf_model_description_t{name, description, init_fun});
}
surf_plugin_description->emplace_back(surf_model_description_t{name, description, init_fun});
}
@@
-76,16
+71,19
@@
const std::vector<surf_model_description_t> surf_network_model_description = {
&surf_network_model_init_NS3},
};
&surf_network_model_init_NS3},
};
-#if ! HAVE_SMPI
-void surf_network_model_init_SMPI() {
+#if !HAVE_SMPI
+void surf_network_model_init_SMPI()
+{
xbt_die("Please activate SMPI support in cmake to use the SMPI network model.");
}
xbt_die("Please activate SMPI support in cmake to use the SMPI network model.");
}
-void surf_network_model_init_IB() {
+void surf_network_model_init_IB()
+{
xbt_die("Please activate SMPI support in cmake to use the IB network model.");
}
#endif
#if !SIMGRID_HAVE_NS3
xbt_die("Please activate SMPI support in cmake to use the IB network model.");
}
#endif
#if !SIMGRID_HAVE_NS3
-void surf_network_model_init_NS3() {
+void surf_network_model_init_NS3()
+{
xbt_die("Please activate ns-3 support in cmake and install the dependencies to use the NS3 network model.");
}
#endif
xbt_die("Please activate ns-3 support in cmake and install the dependencies to use the NS3 network model.");
}
#endif
@@
-105,8
+103,9
@@
const std::vector<surf_model_description_t> surf_host_model_description = {
const std::vector<surf_model_description_t> surf_optimization_mode_description = {
{"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", nullptr},
const std::vector<surf_model_description_t> surf_optimization_mode_description = {
{"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", nullptr},
- {"TI", "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU "
- "model for now).",
+ {"TI",
+ "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU "
+ "model for now).",
nullptr},
{"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr},
};
nullptr},
{"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr},
};
@@
-115,10
+114,6
@@
const std::vector<surf_model_description_t> surf_disk_model_description = {
{"default", "Simplistic disk model.", &surf_disk_model_init_default},
};
{"default", "Simplistic disk model.", &surf_disk_model_init_default},
};
-const std::vector<surf_model_description_t> surf_storage_model_description = {
- {"default", "Simplistic storage model.", &surf_storage_model_init_default},
-};
-
double NOW = 0;
double surf_get_clock()
double NOW = 0;
double surf_get_clock()
@@
-126,7
+121,7
@@
double surf_get_clock()
return NOW;
}
return NOW;
}
-/* returns whether #file_path is a absolute file path. Surprising, isn't it ? */
+/* returns whether #file_path is a
n
absolute file path. Surprising, isn't it ? */
static bool is_absolute_file_path(const std::string& file_path)
{
#ifdef _WIN32
static bool is_absolute_file_path(const std::string& file_path)
{
#ifdef _WIN32
@@
-147,7
+142,7
@@
std::ifstream* surf_ifsopen(const std::string& name)
{
xbt_assert(not name.empty());
{
xbt_assert(not name.empty());
-
std::ifstream
* fs = new std::ifstream();
+
auto
* fs = new std::ifstream();
if (is_absolute_file_path(name)) { /* don't mess with absolute file names */
fs->open(name.c_str(), std::ifstream::in);
}
if (is_absolute_file_path(name)) { /* don't mess with absolute file names */
fs->open(name.c_str(), std::ifstream::in);
}
@@
-168,7
+163,7
@@
std::ifstream* surf_ifsopen(const std::string& name)
FILE* surf_fopen(const std::string& name, const char* mode)
{
FILE* surf_fopen(const std::string& name, const char* mode)
{
- FILE
*
file = nullptr;
+ FILE
*
file = nullptr;
if (is_absolute_file_path(name)) /* don't mess with absolute file names */
return fopen(name.c_str(), mode);
if (is_absolute_file_path(name)) /* don't mess with absolute file names */
return fopen(name.c_str(), mode);
@@
-197,7
+192,7
@@
int find_model_description(const std::vector<surf_model_description_t>& table, c
auto pos = std::find_if(table.begin(), table.end(),
[&name](const surf_model_description_t& item) { return item.name == name; });
if (pos != table.end())
auto pos = std::find_if(table.begin(), table.end(),
[&name](const surf_model_description_t& item) { return item.name == name; });
if (pos != table.end())
- return st
d::distance(table.begin(), pos
);
+ return st
atic_cast<int>(std::distance(table.begin(), pos)
);
if (table.empty())
xbt_die("No model is valid! This is a bug.");
if (table.empty())
xbt_die("No model is valid! This is a bug.");
@@
-213,8
+208,7
@@
int find_model_description(const std::vector<surf_model_description_t>& table, c
return -1;
}
return -1;
}
-
-void surf_init(int *argc, char **argv)
+void surf_init(int* argc, char** argv)
{
if (xbt_initialized > 0)
return;
{
if (xbt_initialized > 0)
return;
@@
-222,26
+216,14
@@
void surf_init(int *argc, char **argv)
xbt_init(argc, argv);
sg_config_init(argc, argv);
xbt_init(argc, argv);
sg_config_init(argc, argv);
-
- if (MC_is_active())
- MC_memory_init();
}
void surf_exit()
{
simgrid::s4u::Engine::shutdown();
}
void surf_exit()
{
simgrid::s4u::Engine::shutdown();
- for (auto const& e : storage_types) {
- simgrid::kernel::resource::StorageType* stype = e.second;
- delete stype->properties;
- delete stype->model_properties;
- delete stype;
- }
-
- for (auto const& model : all_existing_models)
- delete model;
tmgr_finalize();
sg_platf_exit();
tmgr_finalize();
sg_platf_exit();
- NOW = 0;
/* Just in case the user plans to restart the simulation afterward */
+ NOW = 0; /* Just in case the user plans to restart the simulation afterward */
}
}