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
dynar--
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
6c607d5
..
e9b9cf2
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-28,7
+28,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke
std::vector<surf_model_t> * all_existing_models = nullptr; /* to destroy models correctly */
simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
std::vector<surf_model_t> * all_existing_models = nullptr; /* to destroy models correctly */
simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
-
xbt_dynar_t surf_path = nullptr
;
+
std::vector<std::string> surf_path
;
std::vector<simgrid::s4u::Host*> host_that_restart;
xbt_dict_t watched_hosts_lib;
std::vector<simgrid::s4u::Host*> host_that_restart;
xbt_dict_t watched_hosts_lib;
@@
-127,8
+127,6
@@
double surf_get_clock()
FILE *surf_fopen(const char *name, const char *mode)
{
FILE *surf_fopen(const char *name, const char *mode)
{
- unsigned int cpt;
- char *path_elm = nullptr;
char *buff;
FILE *file = nullptr;
char *buff;
FILE *file = nullptr;
@@
-138,8
+136,8
@@
FILE *surf_fopen(const char *name, const char *mode)
return fopen(name, mode);
/* search relative files in the path */
return fopen(name, mode);
/* search relative files in the path */
-
xbt_dynar_foreach(surf_path, cpt, path_elm
) {
- buff = bprintf("%s" FILE_DELIM "%s", path_elm, name);
+
for (auto path_elm : surf_path
) {
+ buff = bprintf("%s" FILE_DELIM "%s", path_elm
.c_str()
, name);
file = fopen(buff, mode);
free(buff);
file = fopen(buff, mode);
free(buff);
@@
-356,8
+354,6
@@
void surf_exit()
{
TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */
{
TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */
- xbt_dynar_free(&surf_path);
-
sg_host_exit();
xbt_lib_free(&storage_lib);
sg_link_exit();
sg_host_exit();
xbt_lib_free(&storage_lib);
sg_link_exit();